From 3a50e2e7fe075c46da72558f3722446fec7ac943 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Tue, 15 Oct 2024 01:45:01 +0000 Subject: [PATCH 1/3] Update version to 9.0.48-2 (cherry picked from commit e0735fcabb6b4c489ea27cb1f9cacea9de42427e) --- 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 66853c2e8227..65a14d5d53d9 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -110,8 +110,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1009004801 - versionName "9.0.48-1" + versionCode 1009004802 + versionName "9.0.48-2" // 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 6286bc3a5130..53bf914d10c2 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -40,7 +40,7 @@ CFBundleVersion - 9.0.48.1 + 9.0.48.2 FullStory OrgId diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 099cba886e76..631b3262e6f4 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 9.0.48.1 + 9.0.48.2 diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index 933c4a480296..d255190910d6 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 9.0.48 CFBundleVersion - 9.0.48.1 + 9.0.48.2 NSExtension NSExtensionPointIdentifier diff --git a/package-lock.json b/package-lock.json index bfb32e6a15ec..a7662f4451e4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "9.0.48-1", + "version": "9.0.48-2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "9.0.48-1", + "version": "9.0.48-2", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 8af5c85de56f..fad1b4ac6921 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "9.0.48-1", + "version": "9.0.48-2", "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 cc76ed4dc2ada23c5874280f906ea6e1bc37846d Mon Sep 17 00:00:00 2001 From: Srikar Parsi <48188732+srikarparsi@users.noreply.github.com> Date: Mon, 14 Oct 2024 21:33:51 -0400 Subject: [PATCH 2/3] Merge pull request #50759 from Expensify/marcaaron-createWorkspaceOnOldDotRedirect [CP Staging] Create workspace when new user signs up, selects the "Manage my team's expenses" option and completes the "employee" step (cherry picked from commit 0167316a43ec58d219173389faf56a332f269cb3) (CP triggered by marcaaron) --- .../OnboardingEmployees/BaseOnboardingEmployees.tsx | 9 +++++++++ src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx | 7 ++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx b/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx index 480ad51f6810..0fcccd723543 100644 --- a/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx +++ b/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx @@ -12,6 +12,7 @@ import useLocalize from '@hooks/useLocalize'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useThemeStyles from '@hooks/useThemeStyles'; import Navigation from '@libs/Navigation/Navigation'; +import * as Policy from '@userActions/Policy/Policy'; import * as Welcome from '@userActions/Welcome'; import * as OnboardingFlow from '@userActions/Welcome/OnboardingFlow'; import CONST from '@src/CONST'; @@ -28,6 +29,7 @@ function BaseOnboardingEmployees({shouldUseNativeStyles, route}: BaseOnboardingE const {translate} = useLocalize(); const [onboardingCompanySize] = useOnyx(ONYXKEYS.ONBOARDING_COMPANY_SIZE); const [onboardingPurposeSelected] = useOnyx(ONYXKEYS.ONBOARDING_PURPOSE_SELECTED); + const [onboardingPolicyID] = useOnyx(ONYXKEYS.ONBOARDING_POLICY_ID); const {onboardingIsMediumOrLargerScreenWidth} = useResponsiveLayout(); const [selectedCompanySize, setSelectedCompanySize] = useState(onboardingCompanySize); const [error, setError] = useState(''); @@ -61,6 +63,13 @@ function BaseOnboardingEmployees({shouldUseNativeStyles, route}: BaseOnboardingE return; } Welcome.setOnboardingCompanySize(selectedCompanySize); + + if (!onboardingPolicyID) { + const {adminsChatReportID, policyID} = Policy.createWorkspace(undefined, true, '', Policy.generatePolicyID(), CONST.ONBOARDING_CHOICES.MANAGE_TEAM); + Welcome.setOnboardingAdminsChatReportID(adminsChatReportID); + Welcome.setOnboardingPolicyID(policyID); + } + Navigation.navigate(ROUTES.ONBOARDING_ACCOUNTING.getRoute(route.params?.backTo)); }} pressOnEnter diff --git a/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx b/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx index 2dad1e6afab0..aa369cc1e11e 100644 --- a/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx +++ b/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx @@ -20,7 +20,10 @@ import Navigation from '@libs/Navigation/Navigation'; import OnboardingRefManager from '@libs/OnboardingRefManager'; import type {TOnboardingRef} from '@libs/OnboardingRefManager'; import variables from '@styles/variables'; +<<<<<<< HEAD import * as Policy from '@userActions/Policy/Policy'; +======= +>>>>>>> 0167316 (Merge pull request #50759 from Expensify/marcaaron-createWorkspaceOnOldDotRedirect) import * as Welcome from '@userActions/Welcome'; import CONST from '@src/CONST'; import type {OnboardingPurposeType} from '@src/CONST'; @@ -50,7 +53,6 @@ const menuIcons = { function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, route}: BaseOnboardingPurposeProps) { const styles = useThemeStyles(); const {translate} = useLocalize(); - const [onboardingPolicyID] = useOnyx(ONYXKEYS.ONBOARDING_POLICY_ID); const {onboardingIsMediumOrLargerScreenWidth} = useResponsiveLayout(); const {windowHeight} = useWindowDimensions(); // We need to use isSmallScreenWidth instead of shouldUseNarrowLayout to show offline indicator on small screen only @@ -83,11 +85,14 @@ function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, ro Welcome.setOnboardingErrorMessage(''); if (choice === CONST.ONBOARDING_CHOICES.MANAGE_TEAM) { +<<<<<<< HEAD if (!onboardingPolicyID) { const {adminsChatReportID, policyID} = Policy.createWorkspace(undefined, true); Welcome.setOnboardingAdminsChatReportID(adminsChatReportID); Welcome.setOnboardingPolicyID(policyID); } +======= +>>>>>>> 0167316 (Merge pull request #50759 from Expensify/marcaaron-createWorkspaceOnOldDotRedirect) Navigation.navigate(ROUTES.ONBOARDING_EMPLOYEES.getRoute(route.params?.backTo)); return; } From c01baed06726bb69f63b69c0a394f71304d02e49 Mon Sep 17 00:00:00 2001 From: Marc Glasser Date: Mon, 14 Oct 2024 15:56:20 -1000 Subject: [PATCH 3/3] Fix conflicts --- .../OnboardingPurpose/BaseOnboardingPurpose.tsx | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx b/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx index aa369cc1e11e..a59042c572a1 100644 --- a/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx +++ b/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx @@ -20,10 +20,6 @@ import Navigation from '@libs/Navigation/Navigation'; import OnboardingRefManager from '@libs/OnboardingRefManager'; import type {TOnboardingRef} from '@libs/OnboardingRefManager'; import variables from '@styles/variables'; -<<<<<<< HEAD -import * as Policy from '@userActions/Policy/Policy'; -======= ->>>>>>> 0167316 (Merge pull request #50759 from Expensify/marcaaron-createWorkspaceOnOldDotRedirect) import * as Welcome from '@userActions/Welcome'; import CONST from '@src/CONST'; import type {OnboardingPurposeType} from '@src/CONST'; @@ -85,14 +81,6 @@ function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, ro Welcome.setOnboardingErrorMessage(''); if (choice === CONST.ONBOARDING_CHOICES.MANAGE_TEAM) { -<<<<<<< HEAD - if (!onboardingPolicyID) { - const {adminsChatReportID, policyID} = Policy.createWorkspace(undefined, true); - Welcome.setOnboardingAdminsChatReportID(adminsChatReportID); - Welcome.setOnboardingPolicyID(policyID); - } -======= ->>>>>>> 0167316 (Merge pull request #50759 from Expensify/marcaaron-createWorkspaceOnOldDotRedirect) Navigation.navigate(ROUTES.ONBOARDING_EMPLOYEES.getRoute(route.params?.backTo)); return; }