Merge branch 'Expensify:main' into fix/64253-approver-cannot-move-expense

Author: linhvovan29546

Mobile-Expensify

@@ -6,13 +6,6 @@ enum EventType {
     PushReceived = 'com.airship.push_received',
 }
 
-// eslint-disable-next-line no-restricted-syntax
-enum PermissionStatus {
-    Granted = 'granted',
-    Denied = 'denied',
-    NotDetermined = 'not_determined',
-}
-
 // eslint-disable-next-line @typescript-eslint/no-namespace
 namespace iOS {
     /**
@@ -78,4 +71,4 @@ const Airship: Partial<AirshipRoot> = {
 
 export default Airship;
 
-export {EventType, iOS, PermissionStatus};
+export {EventType, iOS};

__mocks__/@ua/react-native-airship.ts

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009018915
-        versionName "9.1.89-15"
+        versionCode 1009018917
+        versionName "9.1.89-17"
         // 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

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

ios/NewExpensify/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.1.89</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.89.15</string>
+	<string>9.1.89.17</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NotificationServiceExtension/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.1.89</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.89.15</string>
+	<string>9.1.89.17</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

ios/ShareViewController/Info.plist

@@ -51,22 +51,4 @@ class ReactNativeHybridApp(reactContext: ReactApplicationContext) :
   override fun onURLListenerAdded() {
     Log.d(NAME, "`onURLListenerAdded` should never be called in standalone `New Expensify` app")
   }
-
-  override fun signInToOldDot(
-      autoGeneratedLogin: String,
-      autoGeneratedPassword: String,
-      authToken: String,
-      email: String,
-      policyID: String
-    ) {
-      Log.d(NAME, "`signInToOldDot` should never be called in standalone `New Expensify` app")
-    }
-
-    override fun signOutFromOldDot() {
-      Log.d(NAME, "`signOutFromOldDot` should never be called in standalone `New Expensify` app")
-    }
-
-    override fun clearOldDotAfterSignOut() {
-      Log.d(NAME, "`clearOldDotAfterSignOut` should never be called in standalone `New Expensify` app")
-    }
 }

modules/hybrid-app/android/src/main/java/com/expensify/reactnativehybridapp/ReactNativeHybridApp.kt

@@ -43,18 +43,6 @@ - (void)onURLListenerAdded {
     NSLog(@"[ReactNativeHybridApp] `onURLListenerAdded` should never be called in standalone `New Expensify` app");
 }
 
-- (void)signInToOldDot:(NSString *)autoGeneratedLogin autoGeneratedPassword:(NSString *)autoGeneratedPassword authToken:(NSString *)authToken email:(NSString *)email policyID:(NSString *)policyID {
-    NSLog(@"[ReactNativeHybridApp] `signInToOldDot` should never be called in standalone `New Expensify` app");
-}
-
-- (void)signOutFromOldDot {
-    NSLog(@"[ReactNativeHybridApp] `signOutFromOldDot` should never be called in standalone `New Expensify` app");
-}
-
-- (void)clearOldDotAfterSignOut {
-    NSLog(@"[ReactNativeHybridApp] `clearOldDotAfterSignOut` should never be called in standalone `New Expensify` app");
-}
-
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params
 {

modules/hybrid-app/ios/ReactNativeHybridApp.mm

@@ -12,9 +12,6 @@ export interface Spec extends TurboModule {
     getHybridAppSettings: () => Promise<string | null>;
     getInitialURL(): Promise<string | null>;
     onURLListenerAdded: () => void;
-    signInToOldDot: (autoGeneratedLogin: string, autoGeneratedPassword: string, authToken: string, email: string, policyID: string) => void;
-    signOutFromOldDot: () => void;
-    clearOldDotAfterSignOut: () => void;
 }
 
 export default TurboModuleRegistry.getEnforcing<Spec>('ReactNativeHybridApp');

modules/hybrid-app/src/NativeReactNativeHybridApp.ts

@@ -29,15 +29,6 @@ const HybridAppModule: HybridAppModuleType = {
     onURLListenerAdded() {
         ReactNativeHybridApp.onURLListenerAdded();
     },
-    signInToOldDot({autoGeneratedLogin, autoGeneratedPassword, authToken, email, policyID}) {
-        ReactNativeHybridApp.signInToOldDot(autoGeneratedLogin, autoGeneratedPassword, authToken, email, policyID);
-    },
-    signOutFromOldDot() {
-        ReactNativeHybridApp.signOutFromOldDot();
-    },
-    clearOldDotAfterSignOut() {
-        ReactNativeHybridApp.clearOldDotAfterSignOut();
-    },
 };
 
 export default HybridAppModule;