From 362f94bcea7850012102261a387ce3ddc8d13895 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Fri, 5 Apr 2024 19:08:38 +0000 Subject: [PATCH 1/4] Update version to 1.4.60-13 (cherry picked from commit c82ec7e953d64e2c01e22af2bdc06870618058f6) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- ios/NotificationServiceExtension/Info.plist | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index f178a17e863d5..bc08cbbeed21f 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -98,8 +98,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001046012 - versionName "1.4.60-12" + versionCode 1001046013 + versionName "1.4.60-13" } flavorDimensions "default" diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index c7b36f67d83c4..0db15a68744fb 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -40,7 +40,7 @@ CFBundleVersion - 1.4.60.12 + 1.4.60.13 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index e254e49e9a404..e133f93aa1250 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.4.60.12 + 1.4.60.13 diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index 5d58cf3ec7cb5..12e153cd1f3bb 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 1.4.60 CFBundleVersion - 1.4.60.12 + 1.4.60.13 NSExtension NSExtensionPointIdentifier diff --git a/package-lock.json b/package-lock.json index ff4f34eaa11a2..4fcdaadbaaa05 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.4.60-12", + "version": "1.4.60-13", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.4.60-12", + "version": "1.4.60-13", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 0551aaf4148d8..b0865b737caaf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.4.60-12", + "version": "1.4.60-13", "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.", From 41daeef176c1ca2d5aec3f318c9cac6dffe15c1d Mon Sep 17 00:00:00 2001 From: Jasper Huang Date: Fri, 5 Apr 2024 12:00:01 -0700 Subject: [PATCH 2/4] Merge pull request #39753 from bernhardoj/fix/39710-options-data-cache-is-persisted-after-log-out Fix report and personal detail options are persisted after switching account (cherry picked from commit 4e11f41cb72766b3e9585f0d023d072d45ecf244) --- src/App.tsx | 2 - .../Navigation/AppNavigator/AuthScreens.tsx | 134 ++++++++++++++++++ 2 files changed, 134 insertions(+), 2 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 61874dc72fb08..a3a9f7a3f3b69 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -16,7 +16,6 @@ import HTMLEngineProvider from './components/HTMLEngineProvider'; import InitialURLContextProvider from './components/InitialURLContextProvider'; import {LocaleContextProvider} from './components/LocaleContextProvider'; import OnyxProvider from './components/OnyxProvider'; -import OptionsListContextProvider from './components/OptionListContextProvider'; import PopoverContextProvider from './components/PopoverProvider'; import SafeArea from './components/SafeArea'; import ScrollOffsetContextProvider from './components/ScrollOffsetContextProvider'; @@ -83,7 +82,6 @@ function App({url}: AppProps) { FullScreenContextProvider, VolumeContextProvider, VideoPopoverMenuContextProvider, - OptionsListContextProvider, ]} > diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.tsx b/src/libs/Navigation/AppNavigator/AuthScreens.tsx index 463dcfcd9e999..6fd851ba61f00 100644 --- a/src/libs/Navigation/AppNavigator/AuthScreens.tsx +++ b/src/libs/Navigation/AppNavigator/AuthScreens.tsx @@ -2,6 +2,11 @@ import React, {memo, useEffect, useRef} from 'react'; import {View} from 'react-native'; import type {OnyxEntry} from 'react-native-onyx'; import Onyx, {withOnyx} from 'react-native-onyx'; +<<<<<<< HEAD +======= +import OptionsListContextProvider from '@components/OptionListContextProvider'; +import useOnboardingLayout from '@hooks/useOnboardingLayout'; +>>>>>>> 4e11f41 (Merge pull request #39753 from bernhardoj/fix/39710-options-data-cache-is-persisted-after-log-out) import useStyleUtils from '@hooks/useStyleUtils'; import useThemeStyles from '@hooks/useThemeStyles'; import useWindowDimensions from '@hooks/useWindowDimensions'; @@ -261,6 +266,7 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie }, []); return ( +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4e11f41 (Merge pull request #39753 from bernhardoj/fix/39710-options-data-cache-is-persisted-after-log-out) ); } From 173cabc9fd4088ba0e6b17219c88678dcef610d0 Mon Sep 17 00:00:00 2001 From: Jasper Huang Date: Fri, 5 Apr 2024 13:20:26 -0700 Subject: [PATCH 3/4] fix merge conflicts --- .../Navigation/AppNavigator/AuthScreens.tsx | 130 ------------------ 1 file changed, 130 deletions(-) diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.tsx b/src/libs/Navigation/AppNavigator/AuthScreens.tsx index 6fd851ba61f00..bd5fb428cae15 100644 --- a/src/libs/Navigation/AppNavigator/AuthScreens.tsx +++ b/src/libs/Navigation/AppNavigator/AuthScreens.tsx @@ -2,11 +2,8 @@ import React, {memo, useEffect, useRef} from 'react'; import {View} from 'react-native'; import type {OnyxEntry} from 'react-native-onyx'; import Onyx, {withOnyx} from 'react-native-onyx'; -<<<<<<< HEAD -======= import OptionsListContextProvider from '@components/OptionListContextProvider'; import useOnboardingLayout from '@hooks/useOnboardingLayout'; ->>>>>>> 4e11f41 (Merge pull request #39753 from bernhardoj/fix/39710-options-data-cache-is-persisted-after-log-out) import useStyleUtils from '@hooks/useStyleUtils'; import useThemeStyles from '@hooks/useThemeStyles'; import useWindowDimensions from '@hooks/useWindowDimensions'; @@ -266,122 +263,6 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie }, []); return ( -<<<<<<< HEAD - - - - - - - - - - - - - - - - - - - - -======= @@ -477,16 +358,6 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie options={screenOptions.fullScreen} component={DesktopSignInRedirectPage} /> - - ->>>>>>> 4e11f41 (Merge pull request #39753 from bernhardoj/fix/39710-options-data-cache-is-persisted-after-log-out) ); } From 176b47eeeb6a413d05ff9ab2dc64f3df4c4e317e Mon Sep 17 00:00:00 2001 From: Jasper Huang Date: Fri, 5 Apr 2024 13:25:05 -0700 Subject: [PATCH 4/4] remove unused --- src/libs/Navigation/AppNavigator/AuthScreens.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.tsx b/src/libs/Navigation/AppNavigator/AuthScreens.tsx index bd5fb428cae15..8325685e4e6e3 100644 --- a/src/libs/Navigation/AppNavigator/AuthScreens.tsx +++ b/src/libs/Navigation/AppNavigator/AuthScreens.tsx @@ -3,7 +3,6 @@ import {View} from 'react-native'; import type {OnyxEntry} from 'react-native-onyx'; import Onyx, {withOnyx} from 'react-native-onyx'; import OptionsListContextProvider from '@components/OptionListContextProvider'; -import useOnboardingLayout from '@hooks/useOnboardingLayout'; import useStyleUtils from '@hooks/useStyleUtils'; import useThemeStyles from '@hooks/useThemeStyles'; import useWindowDimensions from '@hooks/useWindowDimensions';