Merge pull request #45 from software-mansion-labs/@cdOut/ideal-nav-fi…

…xes-3
allroundexperts · Jan 30, 2024 · 6966b00 · 6966b00
2 parents 51fa161 + e471bff
commit 6966b00
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 33 deletions.
diff --git 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
         >
             <ScreenWrapper
                 style={[styles.pb0]}

diff --git 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}
                     />
                 ) : (
                     <WorkspaceCardCreateAWorkspace />

diff --git 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) {
@@ -303,33 +298,28 @@ function InitialSettingsPage(props) {
                 <CurrentUserPersonalDetailsSkeletonView avatarSize={CONST.AVATAR_SIZE.XLARGE} />
             ) : (
                 <>
-                    <PressableWithoutFeedback
+                    <OfflineWithFeedback
+                        pendingAction={lodashGet(props.currentUserPersonalDetails, 'pendingFields.avatar', null)}
                         style={styles.mb3}
-                        disabled={isExecuting}
-                        onPress={singleExecution(openProfileSettings)}
-                        accessibilityLabel={translate('common.profile')}
-                        role={CONST.ROLE.BUTTON}
                     >
-                        <OfflineWithFeedback pendingAction={lodashGet(props.currentUserPersonalDetails, 'pendingFields.avatar', null)}>
-                            <AvatarWithImagePicker
-                                isUsingDefaultAvatar={UserUtils.isDefaultAvatar(lodashGet(currentUserDetails, 'avatar', ''))}
-                                source={UserUtils.getAvatar(avatarURL, accountID)}
-                                onImageSelected={PersonalDetails.updateAvatar}
-                                onImageRemoved={PersonalDetails.deleteAvatar}
-                                size={CONST.AVATAR_SIZE.XLARGE}
-                                avatarStyle={styles.avatarXLarge}
-                                pendingAction={lodashGet(props.currentUserPersonalDetails, 'pendingFields.avatar', null)}
-                                errors={lodashGet(props.currentUserPersonalDetails, 'errorFields.avatar', null)}
-                                errorRowStyles={[styles.mt6]}
-                                onErrorClose={PersonalDetails.clearAvatarErrors}
-                                previewSource={UserUtils.getFullSizeAvatar(avatarURL, accountID)}
-                                originalFileName={currentUserDetails.originalFileName}
-                                headerTitle={props.translate('profilePage.profileAvatar')}
-                                style={[styles.mh5]}
-                                fallbackIcon={lodashGet(currentUserDetails, 'fallbackIcon')}
-                            />
-                        </OfflineWithFeedback>
-                    </PressableWithoutFeedback>
+                        <AvatarWithImagePicker
+                            isUsingDefaultAvatar={UserUtils.isDefaultAvatar(lodashGet(currentUserDetails, 'avatar', ''))}
+                            source={UserUtils.getAvatar(avatarURL, accountID)}
+                            onImageSelected={PersonalDetails.updateAvatar}
+                            onImageRemoved={PersonalDetails.deleteAvatar}
+                            size={CONST.AVATAR_SIZE.XLARGE}
+                            avatarStyle={styles.avatarXLarge}
+                            pendingAction={lodashGet(props.currentUserPersonalDetails, 'pendingFields.avatar', null)}
+                            errors={lodashGet(props.currentUserPersonalDetails, 'errorFields.avatar', null)}
+                            errorRowStyles={[styles.mt6]}
+                            onErrorClose={PersonalDetails.clearAvatarErrors}
+                            previewSource={UserUtils.getFullSizeAvatar(avatarURL, accountID)}
+                            originalFileName={currentUserDetails.originalFileName}
+                            headerTitle={props.translate('profilePage.profileAvatar')}
+                            style={[styles.mh5]}
+                            fallbackIcon={lodashGet(currentUserDetails, 'fallbackIcon')}
+                        />
+                    </OfflineWithFeedback>
                     <Text
                         style={[styles.textHeadline, styles.pre, styles.textAlignCenter]}
                         numberOfLines={1}

diff --git 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
                                 />
                             ))}

diff --git 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}
                         />
                     </OfflineWithFeedback>

diff --git 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,
         },

diff --git 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,
     },