From 5995a19b0bdf7eee1950e1f978ee3679c0ff0cd8 Mon Sep 17 00:00:00 2001 From: Virgile Date: Mon, 2 Dec 2024 11:28:56 +0100 Subject: [PATCH 01/19] chore: Revert "chore: revert core to 46.8.0 (#18410)" This reverts commit bad9962099d1ce7abb346e389e2552c5a936c46d. --- package.json | 2 +- yarn.lock | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index bc2396f16b4..f543f9728c1 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "@mediapipe/tasks-vision": "0.10.18", "@wireapp/avs": "9.10.16", "@wireapp/commons": "5.4.0", - "@wireapp/core": "46.8.0", + "@wireapp/core": "46.11.1", "@wireapp/react-ui-kit": "9.28.0", "@wireapp/store-engine-dexie": "2.1.15", "@wireapp/telemetry": "0.1.3", diff --git a/yarn.lock b/yarn.lock index af65d82069c..4d497bb22bb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5941,7 +5941,7 @@ __metadata: languageName: node linkType: hard -"@wireapp/api-client@npm:^27.10.1": +"@wireapp/api-client@npm:^27.11.0": version: 27.11.0 resolution: "@wireapp/api-client@npm:27.11.0" dependencies: @@ -5976,7 +5976,7 @@ __metadata: languageName: node linkType: hard -"@wireapp/commons@npm:5.4.0, @wireapp/commons@npm:^5.3.0, @wireapp/commons@npm:^5.4.0": +"@wireapp/commons@npm:5.4.0, @wireapp/commons@npm:^5.4.0": version: 5.4.0 resolution: "@wireapp/commons@npm:5.4.0" dependencies: @@ -6005,23 +6005,23 @@ __metadata: languageName: node linkType: hard -"@wireapp/core-crypto@npm:1.0.2": - version: 1.0.2 - resolution: "@wireapp/core-crypto@npm:1.0.2" - checksum: 10/99d47fd88657abcfe7fa702fcf9bdc0b815010a2b7b62bffd7779bf8e56bdaee23ebdf306192653ecfa076fc13a749d59c089219e64966b3c74327998c14bdd7 +"@wireapp/core-crypto@npm:1.1.2": + version: 1.1.2 + resolution: "@wireapp/core-crypto@npm:1.1.2" + checksum: 10/7f0a3fc87f1f58ff0a2067053bfd7669ad4073584e31fe450d9a5528964f65600f20521b092704b8dce699c31b8b478eaadb23d26b4f1d2f224134ba63f1d7fa languageName: node linkType: hard -"@wireapp/core@npm:46.8.0": - version: 46.8.0 - resolution: "@wireapp/core@npm:46.8.0" +"@wireapp/core@npm:46.11.1": + version: 46.11.1 + resolution: "@wireapp/core@npm:46.11.1" dependencies: - "@wireapp/api-client": "npm:^27.10.1" - "@wireapp/commons": "npm:^5.3.0" - "@wireapp/core-crypto": "npm:1.0.2" + "@wireapp/api-client": "npm:^27.11.0" + "@wireapp/commons": "npm:^5.4.0" + "@wireapp/core-crypto": "npm:1.1.2" "@wireapp/cryptobox": "npm:12.8.0" "@wireapp/priority-queue": "npm:^2.1.11" - "@wireapp/promise-queue": "npm:^2.3.9" + "@wireapp/promise-queue": "npm:^2.3.10" "@wireapp/protocol-messaging": "npm:1.51.0" "@wireapp/store-engine": "npm:5.1.11" axios: "npm:1.7.7" @@ -6034,7 +6034,7 @@ __metadata: long: "npm:^5.2.0" uuid: "npm:9.0.1" zod: "npm:3.23.8" - checksum: 10/3179e039689d5fa8c52e2487ca580f7e49734e36e162995582ee17b9feed0553323db705b84751f3d3741640992844328a49c8b4acaf3bd6dcadae2856747245 + checksum: 10/7225563ea1ea0e9bf1fb1afef01ffefe046f1fc5d9d43872901f6fea45f3a177a7ad574b08b525b0794390c2896cb4cb8d1328adf217f2b32fdc2dbeb47ed944 languageName: node linkType: hard @@ -6117,7 +6117,7 @@ __metadata: languageName: node linkType: hard -"@wireapp/promise-queue@npm:^2.3.9": +"@wireapp/promise-queue@npm:^2.3.10": version: 2.3.10 resolution: "@wireapp/promise-queue@npm:2.3.10" checksum: 10/22f141ee3fae3592ef4b423297ab955471f0a3965e84f9e259361cdfdd4dde73697085a4fe552aeda819113bbe5264bb2d537fab157a9f49a82bbefc809c7b1c @@ -18672,7 +18672,7 @@ __metadata: "@wireapp/avs": "npm:9.10.16" "@wireapp/commons": "npm:5.4.0" "@wireapp/copy-config": "npm:2.2.10" - "@wireapp/core": "npm:46.8.0" + "@wireapp/core": "npm:46.11.1" "@wireapp/eslint-config": "npm:3.0.7" "@wireapp/prettier-config": "npm:0.6.4" "@wireapp/react-ui-kit": "npm:9.28.0" From d24083c9ea56acd8968910dcd2cec808fff1c6b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20J=C3=B3=C5=BAwik?= Date: Tue, 3 Dec 2024 11:50:11 +0100 Subject: [PATCH 02/19] fix: flicker on hover effect in emoji selector (#18416) --- src/style/common/common.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/style/common/common.less b/src/style/common/common.less index a2457d0b894..9baa6fd71dc 100644 --- a/src/style/common/common.less +++ b/src/style/common/common.less @@ -32,3 +32,7 @@ font-size: var(--font-size-xsmall); line-height: var(--line-height-sm); } + +.epr-emoji-category-content > button:hover { + background: transparent; +} From cd1fa57f2db718971281cadcc4120cd69f05d0b7 Mon Sep 17 00:00:00 2001 From: Immad Abdul Jabbar Date: Tue, 3 Dec 2024 17:02:07 +0100 Subject: [PATCH 03/19] fix: team creation flow play test feedback fix [WPB-14765] (#18417) * fix: team creation flow play test feedback fix [WPB-14765] * add lineHeight variable --- .../components/TextInput/TextInput.styles.ts | 2 +- .../page/AccentColorPicker/AccentColorPicker.tsx | 2 +- .../TeamCreation/TeamCreation.styles.ts | 12 ++++++++++-- .../TeamCreation/TeamCreationAccountHeader.tsx | 13 ++++++++----- .../TeamCreation/TeamCreationBanner.tsx | 11 +++++++---- .../TeamCreationSteps/Confirmation.tsx | 12 ++++++------ .../TeamCreationSteps/Introduction.tsx | 16 ++++++++-------- .../accountPreferences/AccountInput.tsx | 2 +- .../accountPreferences/AvailabilityButtons.tsx | 2 +- src/style/common/variables.less | 1 + 10 files changed, 44 insertions(+), 29 deletions(-) diff --git a/src/script/components/TextInput/TextInput.styles.ts b/src/script/components/TextInput/TextInput.styles.ts index 72453aa653c..e01aba0308d 100644 --- a/src/script/components/TextInput/TextInput.styles.ts +++ b/src/script/components/TextInput/TextInput.styles.ts @@ -43,7 +43,7 @@ export const errorMessageCSS: CSSObject = { bottom: 4, color: 'var(--text-input-alert)', left: 0, - lineHeight: '0.875rem', + lineHeight: 'var(--line-height-small-plus)', position: 'absolute', textTransform: 'unset', }; diff --git a/src/script/page/AccentColorPicker/AccentColorPicker.tsx b/src/script/page/AccentColorPicker/AccentColorPicker.tsx index a76d1d8c9f7..7eab85b2290 100644 --- a/src/script/page/AccentColorPicker/AccentColorPicker.tsx +++ b/src/script/page/AccentColorPicker/AccentColorPicker.tsx @@ -33,7 +33,7 @@ export interface AccentColorPickerProps { } const headerStyles: CSSObject = { - lineHeight: '0.875rem', + lineHeight: 'var(--line-height-small-plus)', margin: '20px 0 6px', padding: 0, textAlign: 'center', diff --git a/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/TeamCreation/TeamCreation.styles.ts b/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/TeamCreation/TeamCreation.styles.ts index c2393a0657c..ce4b372339f 100644 --- a/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/TeamCreation/TeamCreation.styles.ts +++ b/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/TeamCreation/TeamCreation.styles.ts @@ -22,9 +22,10 @@ import {CSSObject} from '@emotion/react'; import {media} from '@wireapp/react-ui-kit'; export const teamUpgradeBannerHeaderCss: CSSObject = { - lineHeight: 'var(--line-height-sm)', + lineHeight: 'var(--line-height-small-plus)', marginLeft: '0.5rem', verticalAlign: 'text-top', + fontWeight: 'var(--font-weight-semibold)', }; export const teamUpgradeBannerContentCss: CSSObject = { @@ -121,8 +122,9 @@ export const teamUpgradeAccountBannerContainerCss: CSSObject = { justifyContent: 'space-between', alignItems: 'center', padding: '0.5rem', + gap: '0.5rem', marginBottom: '2rem', - [media.tabletSMDown]: { + [media.tabletDown]: { flexDirection: 'column', alignItems: 'baseline', gap: '0.5rem', @@ -143,3 +145,9 @@ export const bannerWrapperCss: CSSObject = { boxShadow: '0px 0px 12px 0px var(--background-fade-32)', borderRadius: '0.5rem', }; + +export const bannerHeaderContainerCss: CSSObject = { + display: 'flex', + alignItems: 'center', + marginBottom: '0.5rem', +}; diff --git a/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/TeamCreation/TeamCreationAccountHeader.tsx b/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/TeamCreation/TeamCreationAccountHeader.tsx index 5f9e72bcf62..23e787caaaa 100644 --- a/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/TeamCreation/TeamCreationAccountHeader.tsx +++ b/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/TeamCreation/TeamCreationAccountHeader.tsx @@ -23,6 +23,7 @@ import * as Icon from 'Components/Icon'; import {t} from 'Util/LocalizerUtil'; import { + bannerHeaderContainerCss, teamUpgradeAccountBannerContainerCss, teamUpgradeBannerButtonCss, teamUpgradeBannerHeaderCss, @@ -35,11 +36,13 @@ interface Props { export const TeamCreationAccountHeader = ({onClick}: Props) => { return (
-
- - - {t('teamUpgradeBannerHeader')} - +
+
+ + + {t('teamUpgradeBannerHeader')} + +
{t('teamUpgradeBannerContent')}