From 18740a88c902e740b7f7172d1dee6ebecf3cae54 Mon Sep 17 00:00:00 2001 From: cdOut <88325488+cdOut@users.noreply.github.com> Date: Mon, 29 Jan 2024 10:41:02 +0100 Subject: [PATCH 1/7] fix hover for selected workspace menu (198) --- src/pages/workspace/WorkspaceInitialPage.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/workspace/WorkspaceInitialPage.js b/src/pages/workspace/WorkspaceInitialPage.js index d29958cae209..8141fe92a5d9 100644 --- a/src/pages/workspace/WorkspaceInitialPage.js +++ b/src/pages/workspace/WorkspaceInitialPage.js @@ -212,6 +212,7 @@ function WorkspaceInitialPage(props) { brickRoadIndicator={item.brickRoadIndicator} wrapperStyle={styles.sectionMenuItem} focused={activeRoute && activeRoute.startsWith(item.routeName)} + hoverAndPressStyle={styles.hoveredComponentBG} isPaneMenu /> ))} From 0f1de7e2b47f4ea6db11553ac3fde1fcd32382f1 Mon Sep 17 00:00:00 2001 From: cdOut <88325488+cdOut@users.noreply.github.com> Date: Mon, 29 Jan 2024 11:02:17 +0100 Subject: [PATCH 2/7] add custom backdrop for avatar crop (205) --- src/components/AvatarCropModal/AvatarCropModal.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/AvatarCropModal/AvatarCropModal.tsx b/src/components/AvatarCropModal/AvatarCropModal.tsx index 3ac2e3e3d729..dd6d41f4b227 100644 --- a/src/components/AvatarCropModal/AvatarCropModal.tsx +++ b/src/components/AvatarCropModal/AvatarCropModal.tsx @@ -341,6 +341,7 @@ function AvatarCropModal({imageUri = '', imageName = '', imageType = '', onClose isVisible={isVisible} type={CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED} onModalHide={resetState} + shouldUseCustomBackdrop > Date: Mon, 29 Jan 2024 11:27:42 +0100 Subject: [PATCH 3/7] fix row edge-to-edge for widescreen (199) --- src/pages/workspace/reimburse/WorkspaceReimburseView.js | 2 +- src/styles/utils/spacing.ts | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pages/workspace/reimburse/WorkspaceReimburseView.js b/src/pages/workspace/reimburse/WorkspaceReimburseView.js index 97fc97ab6ddb..039d8e036ef8 100644 --- a/src/pages/workspace/reimburse/WorkspaceReimburseView.js +++ b/src/pages/workspace/reimburse/WorkspaceReimburseView.js @@ -151,7 +151,7 @@ function WorkspaceReimburseView(props) { description={translate('workspace.reimburse.trackDistanceRate')} shouldShowRightIcon onPress={() => Navigation.navigate(ROUTES.WORKSPACE_RATE_AND_UNIT.getRoute(props.policy.id))} - wrapperStyle={[styles.mhn5, styles.wAuto]} + wrapperStyle={[styles.mt3, styles.ph8, styles.mhn8, styles.wAuto]} brickRoadIndicator={(lodashGet(distanceCustomUnit, 'errors') || lodashGet(distanceCustomRate, 'errors')) && CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} /> diff --git a/src/styles/utils/spacing.ts b/src/styles/utils/spacing.ts index f15a23944ee1..5d0365d69381 100644 --- a/src/styles/utils/spacing.ts +++ b/src/styles/utils/spacing.ts @@ -55,6 +55,10 @@ export default { marginHorizontal: -20, }, + mhn8: { + marginHorizontal: -32, + }, + mv0: { marginVertical: 0, }, From e9d316a54817a66342ae1f794232ceb4226eedc2 Mon Sep 17 00:00:00 2001 From: cdOut <88325488+cdOut@users.noreply.github.com> Date: Mon, 29 Jan 2024 12:38:55 +0100 Subject: [PATCH 4/7] fix workspace switcher search bar styling (201) --- src/pages/WorkspaceSwitcherPage.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/WorkspaceSwitcherPage.js b/src/pages/WorkspaceSwitcherPage.js index bf65ca333cd5..05edef8fc2bd 100644 --- a/src/pages/WorkspaceSwitcherPage.js +++ b/src/pages/WorkspaceSwitcherPage.js @@ -263,7 +263,6 @@ function WorkspaceSwitcherPage({policies}) { textIconLeft={MagnifyingGlass} // It has to be set to null or -1 to avoid focus on any element at the beggining initiallyFocusedOptionKey={null} - shouldUseStyleForChildren={false} /> ) : ( From dbcb7fedbdccef943c6c48af936211744b04f520 Mon Sep 17 00:00:00 2001 From: cdOut <88325488+cdOut@users.noreply.github.com> Date: Mon, 29 Jan 2024 13:01:05 +0100 Subject: [PATCH 5/7] remove navigation to profile when pressing the profile picture (204) --- src/pages/settings/InitialSettingsPage.js | 45 ++++++++++------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/src/pages/settings/InitialSettingsPage.js b/src/pages/settings/InitialSettingsPage.js index 52e57e10b024..3a3599d24cae 100755 --- a/src/pages/settings/InitialSettingsPage.js +++ b/src/pages/settings/InitialSettingsPage.js @@ -303,33 +303,28 @@ function InitialSettingsPage(props) { ) : ( <> - - - - - + + Date: Mon, 29 Jan 2024 14:11:57 +0100 Subject: [PATCH 6/7] darken search text color in light mode (197) --- src/styles/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/index.ts b/src/styles/index.ts index b33d600a5d9d..b424c8df50a8 100644 --- a/src/styles/index.ts +++ b/src/styles/index.ts @@ -3191,7 +3191,7 @@ const styles = (theme: ThemeColors) => }, searchInputStyle: { - color: colors.productDark800, + color: theme.textSupporting, fontSize: 13, lineHeight: 16, }, From e471bff2cd9c3d35dac2b6bf1bab21aeadeaa159 Mon Sep 17 00:00:00 2001 From: cdOut <88325488+cdOut@users.noreply.github.com> Date: Mon, 29 Jan 2024 17:15:47 +0100 Subject: [PATCH 7/7] fix lint errors --- src/pages/settings/InitialSettingsPage.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/pages/settings/InitialSettingsPage.js b/src/pages/settings/InitialSettingsPage.js index 3a3599d24cae..dfa4262549fc 100755 --- a/src/pages/settings/InitialSettingsPage.js +++ b/src/pages/settings/InitialSettingsPage.js @@ -15,7 +15,6 @@ import * as Expensicons from '@components/Icon/Expensicons'; import MenuItem from '@components/MenuItem'; import OfflineWithFeedback from '@components/OfflineWithFeedback'; import {withNetwork} from '@components/OnyxProvider'; -import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback'; import Text from '@components/Text'; import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsDefaultProps, withCurrentUserPersonalDetailsPropTypes} from '@components/withCurrentUserPersonalDetails'; import withLocalize, {withLocalizePropTypes} from '@components/withLocalize'; @@ -111,10 +110,6 @@ function InitialSettingsPage(props) { setShouldShowSignoutConfirmModal(value); }; - const openProfileSettings = () => { - Navigation.navigate(ROUTES.SETTINGS_PROFILE); - }; - const signOut = useCallback( (shouldForceSignout = false) => { if (!props.network.isOffline || shouldForceSignout) {