diff --git a/android/app/build.gradle b/android/app/build.gradle index 88ba39417da3..505d9193a587 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -114,8 +114,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1009011005 - versionName "9.1.10-5" + versionCode 1009011006 + versionName "9.1.10-6" // Supported language variants must be declared here to avoid from being removed during the compilation. // This also helps us to not include unnecessary language variants in the APK. resConfigs "en", "es" diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index acf07810cc53..e6612ed1b708 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -44,7 +44,7 @@ CFBundleVersion - 9.1.10.5 + 9.1.10.6 FullStory OrgId diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 40e6c4fc8b9c..945a78dab582 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 9.1.10.5 + 9.1.10.6 diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index 9fbc284120ac..c8b2c47b5e24 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 9.1.10 CFBundleVersion - 9.1.10.5 + 9.1.10.6 NSExtension NSExtensionPointIdentifier diff --git a/package-lock.json b/package-lock.json index 46b15ec388f7..be667fb1392f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "9.1.10-5", + "version": "9.1.10-6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "9.1.10-5", + "version": "9.1.10-6", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 870ed4b42e18..839fc81df5c1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "9.1.10-5", + "version": "9.1.10-6", "author": "Expensify, Inc.", "homepage": "https://new.expensify.com", "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.", diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts index 72cbcee20e34..4433aaabe5b8 100755 --- a/src/ONYXKEYS.ts +++ b/src/ONYXKEYS.ts @@ -480,7 +480,7 @@ const ONYXKEYS = { TRAVEL_PROVISIONING: 'travelProvisioning', /** Stores the information about the state of side panel */ - NVP_SIDE_PANE: 'nvp_sidePaneExpanded', + NVP_SIDE_PANE: 'nvp_sidePanel', /** Collection Keys */ COLLECTION: { diff --git a/src/components/SidePane/index.tsx b/src/components/SidePane/index.tsx index 5caa4925dd54..b638ffcd191d 100644 --- a/src/components/SidePane/index.tsx +++ b/src/components/SidePane/index.tsx @@ -20,19 +20,23 @@ function SidePane({shouldShowOverlay = false}: {shouldShowOverlay?: boolean}) { const {translate} = useLocalize(); const {isExtraLargeScreenWidth, shouldUseNarrowLayout} = useResponsiveLayout(); - const {sidePaneTranslateX, shouldHideSidePane, shouldHideSidePaneBackdrop} = useSidePane(); const {route, isInNarrowPaneModal} = useNavigationState((state) => { const params = (findFocusedRoute(state)?.params as Record) ?? {}; const activeRoute = Navigation.getActiveRouteWithoutParams(); return {route: substituteRouteParameters(activeRoute, params), isInNarrowPaneModal: state.routes.some((r) => r.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR)}; }); + const {sidePaneTranslateX, shouldHideSidePane, shouldHideSidePaneBackdrop, sidePane} = useSidePane(); const onClose = useCallback( (shouldUpdateNarrow = false) => { + if (!sidePane) { + return; + } + triggerSidePane(false, {shouldOnlyUpdateNarrowLayout: !isExtraLargeScreenWidth || shouldUpdateNarrow}); }, - [isExtraLargeScreenWidth], + [isExtraLargeScreenWidth, sidePane], ); const sizeChangedFromLargeToNarrow = useRef(!isExtraLargeScreenWidth);