-
Notifications
You must be signed in to change notification settings - Fork 297
feat: toggle apps in conversation creation [WPB-23669] #20501
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
panuschek
wants to merge
7
commits into
dev
Choose a base branch
from
feat/toggle-apps-in-conversation
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+199
−27
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
9b4b9cb
added Note component
panuschek 3c71902
added apps disabled banner
panuschek 2840a61
fixed apps not enabled note formatting
panuschek 490b58e
fixed i18n.d.ts types
panuschek 2075ba2
reintroduced missing i18n.d.ts types
panuschek 6819545
Update apps/webapp/src/script/components/Note/AppsDisabledNote/AppsDi…
panuschek d39247e
Update apps/webapp/src/script/components/Note/Note.tsx
panuschek File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
apps/webapp/src/script/components/Note/AppsDisabledNote/AppsDisabledNote.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2026 Wire Swiss GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses/. | ||
| * | ||
| */ | ||
|
|
||
| import React from 'react'; | ||
|
|
||
| import {Note} from 'Components/Note/Note'; | ||
| import {t} from 'Util/LocalizerUtil'; | ||
|
|
||
| const AppsDisabledNote = () => { | ||
| return ( | ||
| <Note title={t('servicesNotEnabledNoteTitle')}> | ||
| <span className={'subline'}>{t('servicesNotEnabledBody')}</span> | ||
| </Note> | ||
| ); | ||
| }; | ||
|
|
||
| export {AppsDisabledNote}; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2026 Wire Swiss GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses/. | ||
| * | ||
| */ | ||
|
|
||
| import {CSSObject} from '@emotion/react'; | ||
|
|
||
| export const ContainerStyle: CSSObject = { | ||
| display: 'flex', | ||
| flexDirection: 'column', | ||
| gap: '0.3rem', | ||
| padding: '0.75rem', | ||
| background: 'var(--accent-color-50)', | ||
| '.theme-dark &': { | ||
| background: 'var(--accent-color-800)', | ||
| boxShadow: 'none', | ||
| }, | ||
| border: '1px solid var(--accent-color-500)', | ||
| borderRadius: '0.5rem', | ||
| lineHeight: '1.5', | ||
| marginTop: '0.3rem', | ||
| }; | ||
|
|
||
| export const HeaderStyle: CSSObject = { | ||
| display: 'flex', | ||
| alignItems: 'center', | ||
| fontWeight: 'var(--font-weight-semibold)', | ||
| gap: '0.5rem', | ||
| }; | ||
|
|
||
| export const ContentStyle: CSSObject = { | ||
| display: 'flex', | ||
| flexDirection: 'column', | ||
| gap: '4px', | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2026 Wire Swiss GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses/. | ||
| * | ||
| */ | ||
|
|
||
| import React, {ReactNode} from 'react'; | ||
|
|
||
| import {InfoIcon} from 'Components/Icon'; | ||
| import {ContainerStyle, ContentStyle, HeaderStyle} from 'Components/Note/Note.styles'; | ||
|
|
||
| interface NoteProps { | ||
| title: string; | ||
| children?: ReactNode; | ||
| } | ||
|
|
||
| const Note = ({title, children}: NoteProps) => { | ||
| return ( | ||
| <div css={ContainerStyle}> | ||
| <div css={HeaderStyle}> | ||
| <InfoIcon /> | ||
| <span className="heading-h4">{title}</span> | ||
| </div> | ||
|
|
||
| <div css={ContentStyle}> | ||
| <div>{children}</div> | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export {Note}; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We have this logic in two places, it is possible to keep it in a single places? A hook or reusable function?