Merge main into claude-hidePayerRoleOptions to re-trigger CI

Co-authored-by: Abdelrahman Khattab <abzokhattab@users.noreply.github.com>

Author: MelvinBot

Mobile-Expensify

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009044505
-        versionName "9.4.45-5"
+        versionCode 1009044506
+        versionName "9.4.45-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"

android/app/build.gradle

@@ -230,9 +230,6 @@
 "../../src/components/LHNOptionsList/OptionRowLHN/OptionRow/Pressable.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/LocaleContextProvider.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/components/Lottie/index.tsx"	"react-hooks/set-state-in-effect"	1
-"../../src/components/MagicCodeInput.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
-"../../src/components/MagicCodeInput.tsx"	"react-hooks/refs"	1
-"../../src/components/MagicCodeInput.tsx"	"react-hooks/set-state-in-effect"	3
 "../../src/components/MapView/GPSMapView.tsx"	"no-restricted-imports"	1
 "../../src/components/MapView/MapView.tsx"	"no-restricted-imports"	1
 "../../src/components/MapView/MapView.tsx"	"react-hooks/set-state-in-effect"	1
@@ -491,6 +488,9 @@
 "../../src/components/UpdateAppModal.tsx"	"@typescript-eslint/no-deprecated/ConfirmModal"	1
 "../../src/components/UploadFile.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/ValidateCodeActionModal/ValidateCodeForm/BaseValidateCodeForm.tsx"	"no-restricted-imports"	1
+"../../src/components/ValidateCodeInput.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/components/ValidateCodeInput.tsx"	"react-hooks/refs"	1
+"../../src/components/ValidateCodeInput.tsx"	"react-hooks/set-state-in-effect"	3
 "../../src/components/VideoPlayer/BaseVideoPlayer.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	7
 "../../src/components/VideoPlayer/BaseVideoPlayer.tsx"	"no-restricted-syntax"	1
 "../../src/components/VideoPlayer/BaseVideoPlayer.tsx"	"react-hooks/refs"	13
@@ -1041,7 +1041,7 @@
 "../../src/pages/ErrorPage/GenericErrorPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/ErrorPage/UpdateRequiredView.tsx"	"no-restricted-imports"	1
 "../../src/pages/MissingPersonalDetails/MissingPersonalDetailsContent.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
-"../../src/pages/MissingPersonalDetails/MissingPersonalDetailsMagicCodePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/MissingPersonalDetails/MissingPersonalDetailsValidateCodePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/MissingPersonalDetails/subPages/Address.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	5
 "../../src/pages/MissingPersonalDetails/subPages/Address.tsx"	"react-hooks/refs"	4
 "../../src/pages/MissingPersonalDetails/subPages/PIN.tsx"	"no-restricted-imports"	1
@@ -1310,7 +1310,7 @@
 "../../src/pages/settings/Profile/CustomStatus/StatusPage.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/settings/Profile/PersonalDetails/DynamicCountrySelectionPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/settings/Profile/PersonalDetails/PersonalAddressPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
-"../../src/pages/settings/Profile/PersonalDetails/PrivatePersonalDetailsConfirmMagicCodePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/settings/Profile/PersonalDetails/PrivatePersonalDetailsConfirmValidateCodePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/settings/Profile/PersonalDetails/PrivatePersonalDetailsPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	8
 "../../src/pages/settings/Profile/PersonalDetails/StateSelectionPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/pages/settings/Profile/ProfilePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
@@ -1321,9 +1321,10 @@
 "../../src/pages/settings/Report/ReportDetailsColumnsPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	3
 "../../src/pages/settings/Rules/ExpenseRulesPage.tsx"	"@typescript-eslint/no-deprecated/ConfirmModal"	1
 "../../src/pages/settings/Rules/ExpenseRulesPage.tsx"	"no-restricted-imports"	1
-"../../src/pages/settings/Security/AddDelegate/ConfirmDelegateMagicCodePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/settings/Security/AddDelegate/ConfirmDelegatePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
-"../../src/pages/settings/Security/AddDelegate/UpdateDelegateRole/UpdateDelegateMagicCodePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/settings/Security/AddDelegate/ConfirmDelegateValidateCodePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/settings/Security/AddDelegate/UpdateDelegateRole/UpdateDelegateValidateCodePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/settings/Security/LockAccount/LockAccountPageBase.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Security/TwoFactorAuth/VerifyPage.tsx"	"@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions"	1
 "../../src/pages/settings/Subscription/CardAuthenticationModal/index.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/settings/Subscription/CardSection/CardSectionButton/index.tsx"	"no-restricted-imports"	1
@@ -1362,7 +1363,7 @@
 "../../src/pages/settings/Wallet/WalletPage/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/pages/settings/Wallet/WalletPage/index.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Wallet/WalletPage/index.tsx"	"react-hooks/set-state-in-effect"	1
-"../../src/pages/signin/ChooseSSOOrMagicCode.tsx"	"no-restricted-imports"	1
+"../../src/pages/signin/ChooseSSOOrValidateCode.tsx"	"no-restricted-imports"	1
 "../../src/pages/signin/SAMLSignInPage/index.native.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/signin/SMSDeliveryFailurePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/pages/signin/SMSDeliveryFailurePage.tsx"	"no-restricted-imports"	1
@@ -1609,7 +1610,7 @@
 "../../src/types/onyx/UserWallet.ts"	"no-restricted-syntax"	1
 "../../src/types/onyx/VacationDelegate.ts"	"no-restricted-syntax"	1
 "../../src/types/onyx/ValidateDomainTwoFactorCode.ts"	"no-restricted-syntax"	1
-"../../src/types/onyx/ValidateMagicCodeAction.ts"	"no-restricted-syntax"	1
+"../../src/types/onyx/VerifyValidateCodeAction.ts"	"no-restricted-syntax"	1
 "../../src/types/onyx/WalletAdditionalDetails.ts"	"no-restricted-syntax"	1
 "../../src/types/onyx/WalletOnfido.ts"	"no-restricted-syntax"	1
 "../../src/types/onyx/WalletTerms.ts"	"no-restricted-syntax"	1

…ges/product-illustrations/magic-code.svg …/product-illustrations/validate-code.svgassets/images/product-illustrations/magic-code.svg renamed to assets/images/product-illustrations/validate-code.svg assets/images/product-illustrations/magic-code.svg renamed to assets/images/product-illustrations/validate-code.svg

@@ -527,7 +527,7 @@ platform :ios do
         contact_phone: ENV["APPLE_CONTACT_PHONE"],
         demo_account_name: ENV["APPLE_DEMO_EMAIL"],
         demo_account_password: ENV["APPLE_DEMO_PASSWORD"],
-        notes: "1. In the Expensify app, enter the email 'appletest.expensify@proton.me'. This will trigger a sign-in link to be sent to 'appletest.expensify@proton.me'\n                  2. Navigate to https://account.proton.me/login, log into Proton Mail using 'appletest.expensify@proton.me' as email and the password associated with 'appletest.expensify@proton.me', provided above\n                  3. Once logged into Proton Mail, navigate to your inbox and locate the email triggered in step 1. The email subject should be 'Your magic sign-in link for Expensify'\n                  4. Open the email and copy the 6-digit sign-in code provided within\n                  5. Return to the Expensify app and enter the copied 6-digit code in the designated login field"
+        notes: "1. In the Expensify app, enter the email 'appletest.expensify@proton.me'. This will trigger a sign-in link to be sent to 'appletest.expensify@proton.me'\n                  2. Navigate to https://account.proton.me/login, log into Proton Mail using 'appletest.expensify@proton.me' as email and the password associated with 'appletest.expensify@proton.me', provided above\n                  3. Once logged into Proton Mail, navigate to your inbox and locate the email triggered in step 1. The email subject should be 'Your Expensify security code'\n                  4. Open the email and copy the 6-digit sign-in code provided within\n                  5. Return to the Expensify app and enter the copied 6-digit code in the designated login field"
       }
     )
   end

config/eslint/eslint.seatbelt.tsv

@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.4.45.5</string>
+	<string>9.4.45.6</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

fastlane/Fastfile

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.4.45</string>
 	<key>CFBundleVersion</key>
-	<string>9.4.45.5</string>
+	<string>9.4.45.6</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NewExpensify/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.4.45</string>
 	<key>CFBundleVersion</key>
-	<string>9.4.45.5</string>
+	<string>9.4.45.6</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

ios/NotificationServiceExtension/Info.plist

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.4.45-5",
+  "version": "9.4.45-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.",