Feat/ios wishlist

android/app/build.gradle

@@ -137,20 +137,9 @@ def reactNativeArchitectures() {
 }
 
 android {
+    ndkVersion rootProject.ext.ndkVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
-    packagingOptions {
-        pickFirst 'lib/x86/libc++_shared.so'
-        pickFirst 'lib/x86_64/libjsc.so'
-        pickFirst 'lib/arm64-v8a/libjsc.so'
-        pickFirst 'lib/arm64-v8a/libc++_shared.so'
-        pickFirst 'lib/x86_64/libc++_shared.so'
-        pickFirst 'lib/armeabi-v7a/libc++_shared.so'
-
-        // Exclude generated files from APK, to fix 'More than one file was found with path' error
-        exclude 'META-INF/*'
-    }
-
     defaultConfig {
         applicationId "com.expensify.chat"
         minSdkVersion rootProject.ext.minSdkVersion

android/app/src/main/java/com/expensify/chat/MainApplication.java

@@ -6,6 +6,7 @@
 import androidx.multidex.MultiDexApplication;
 
 import com.expensify.chat.bootsplash.BootSplashPackage;
+import com.expensify.chat.newarchitecture.MainApplicationReactNativeHost;
 import com.facebook.react.PackageList;
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactInstanceManager;
@@ -47,10 +48,8 @@ protected String getJSMainModuleName() {
         }
       };
 
-  // TODO: Use this to enable new architecture.
-  // private final ReactNativeHost mNewArchitectureNativeHost =
-  //       new MainApplicationReactNativeHost(this);
-  private final ReactNativeHost mNewArchitectureNativeHost = null;
+  private final ReactNativeHost mNewArchitectureNativeHost =
+        new MainApplicationReactNativeHost(this);
 
   @Override
   public ReactNativeHost getReactNativeHost() {

android/app/src/main/java/com/expensify/chat/newarchitecture/MainApplicationReactNativeHost.java

@@ -2,6 +2,8 @@
 
 import android.app.Application;
 import androidx.annotation.NonNull;
+import com.expensify.chat.bootsplash.BootSplashPackage;
+import com.expensify.chat.ExpensifyAppPackage;
 import com.facebook.react.PackageList;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
@@ -51,6 +53,8 @@ protected List<ReactPackage> getPackages() {
     //     packages.add(new TurboReactPackage() { ... });
     // If you have custom Fabric Components, their ViewManagers should also be loaded here
     // inside a ReactPackage.
+    packages.add(new BootSplashPackage());
+    packages.add(new ExpensifyAppPackage());
     return packages;
   }
 

android/app/src/main/jni/MainApplicationModuleProvider.cpp

@@ -1,29 +1,32 @@
+
 #include "MainApplicationModuleProvider.h"
 
+#include <rncli.h>
 #include <rncore.h>
 
 namespace facebook {
 namespace react {
 
 std::shared_ptr<TurboModule> MainApplicationModuleProvider(
-    const std::string moduleName,
+    const std::string &moduleName,
     const JavaTurboModule::InitParams &params) {
-        // Here you can provide your own module provider for TurboModules coming from
-        // either your application or from external libraries. The approach to follow
-        // is similar to the following (for a library called `samplelibrary`:
-        //
-        // auto module = samplelibrary_ModuleProvider(moduleName, params);
-        // if (module != nullptr) {
-        //    return module;
-        // }
-        // return rncore_ModuleProvider(moduleName, params);
-        return rncore_ModuleProvider(moduleName, params);
+  // Here you can provide your own module provider for TurboModules coming from
+  // either your application or from external libraries. The approach to follow
+  // is similar to the following (for a library called `samplelibrary`:
+  //
+  // auto module = samplelibrary_ModuleProvider(moduleName, params);
+  // if (module != nullptr) {
+  //    return module;
+  // }
+  // return rncore_ModuleProvider(moduleName, params);
+
+  // Module providers autolinked by RN CLI
+  auto rncli_module = rncli_ModuleProvider(moduleName, params);
+  if (rncli_module != nullptr) {
+    return rncli_module;
+  }
 
-        // Module providers autolinked by RN CLI
-        auto rncli_module = rncli_ModuleProvider(moduleName, params);
-        if (rncli_module != nullptr) {
-          return rncli_module;
-        }
+  return rncore_ModuleProvider(moduleName, params);
 }
 
 } // namespace react

android/gradle.properties

@@ -35,12 +35,13 @@ FLIPPER_VERSION=0.125.0
 # You can also override it from the CLI using
 # ./gradlew <task> -PreactNativeArchitectures=x86_64
 reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
+
 # Use this property to enable support to the new architecture.
 # This will allow you to use TurboModules and the Fabric render in
 # your application. You should enable this flag either if you want
 # to write custom TurboModules/Fabric components OR use libraries that
 # are providing them.
-newArchEnabled=false
+newArchEnabled=true
 
 # Key Store Information
 MYAPP_UPLOAD_STORE_FILE=my-upload-key.keystore