Bump React Native to 0.81.0 (#38)

* Remove Expo from library

* Add missing blank lines

* All the required code for bump

* Lint fixes

* Update library RN to 0.81.0

* Update Android Gradle Plugin version to 7.3.1

* Update prettierrc

* Fix WalletModule

* Update deprecated code

* Remove unnecessary dependency

* Run pod install

* Revert prettier changes

* Add review changes

* Add SafeAreaView

---------

Co-authored-by: Michał Skałka <michal.skalka@swmansion.com>

Author: zfurtak

.prettierrc.js

@@ -2,8 +2,8 @@ module.exports = {
   tabWidth: 2,
   singleQuote: true,
   trailingComma: 'all',
-  bracketSpacing: false,
   arrowParens: 'always',
+  bracketSpacing: false,
   printWidth: 190,
   singleAttributePerLine: true,
 };

android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:7.2.1"
+    classpath "com.android.tools.build:gradle:7.3.1"
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }

android/gradle.properties

@@ -1,5 +1,5 @@
-Wallet_kotlinVersion=1.8.0
-Wallet_minSdkVersion=21
-Wallet_targetSdkVersion=34
-Wallet_compileSdkVersion=34
+Wallet_kotlinVersion=2.1.20
+Wallet_minSdkVersion=24
+Wallet_targetSdkVersion=36
+Wallet_compileSdkVersion=36
 Wallet_ndkversion=27.1.12297006

android/gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

android/gradle/wrapper/gradle-wrapper.properties

@@ -43,11 +43,10 @@ class WalletModule internal constructor(context: ReactApplicationContext) :
 
     const val E_SDK_API = "SDK API Error"
     const val E_OPERATION_FAILED = "E_OPERATION_FAILED"
-    const val E_NO_TOKENS_AVAILABLE = "E_NO_TOKENS_AVAILABLE"
     const val E_INVALID_DATA = "E_INVALID_DATA"
   }
 
-  private val activity = currentActivity ?: throw ActivityNotFoundException()
+  private val activity = reactApplicationContext.currentActivity ?: throw ActivityNotFoundException()
   private val tapAndPayClient: TapAndPayClient = TapAndPay.getClient(activity)
   private var pendingCreateWalletPromise: Promise? = null
   private var pendingPushTokenizePromise: Promise? = null
@@ -64,14 +63,14 @@ class WalletModule internal constructor(context: ReactApplicationContext) :
 
   private val cardListener = object : ActivityEventListener {
     override fun onActivityResult(
-      activity: Activity?, requestCode: Int, resultCode: Int, intent: Intent?
+      activity: Activity, requestCode: Int, resultCode: Int, data: Intent?
     ) {
       if (requestCode == REQUEST_CREATE_WALLET) {
         pendingCreateWalletPromise?.resolve(resultCode == RESULT_OK)
         pendingCreateWalletPromise = null
       } else if (requestCode == REQUEST_CODE_PUSH_TOKENIZE) {
         if (resultCode == RESULT_OK) {
-          intent?.let {
+          data?.let {
             val tokenId = it.getStringExtra(TapAndPay.EXTRA_ISSUER_TOKEN_ID).toString()
             sendEvent(
               context,
@@ -91,7 +90,7 @@ class WalletModule internal constructor(context: ReactApplicationContext) :
       }
     }
 
-    override fun onNewIntent(p0: Intent?) {}
+    override fun onNewIntent(intent: Intent) {}
   }
 
   @ReactMethod

android/src/main/java/com/expensify/wallet/WalletModule.kt

@@ -1,6 +1,5 @@
 module.exports = {
   arrowParens: 'avoid',
-  bracketSameLine: true,
   bracketSpacing: false,
   singleQuote: true,
   trailingComma: 'all',

example/.prettierrc.js

@@ -6,11 +6,9 @@ import com.facebook.react.ReactApplication
 import com.facebook.react.ReactHost
 import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactPackage
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
 import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
 import com.facebook.react.defaults.DefaultReactNativeHost
-import com.facebook.react.soloader.OpenSourceMergedSoMapping
-import com.facebook.soloader.SoLoader
+import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
 
 class MainApplication : Application(), ReactApplication {
 
@@ -34,10 +32,6 @@ class MainApplication : Application(), ReactApplication {
 
   override fun onCreate() {
     super.onCreate()
-    SoLoader.init(this, OpenSourceMergedSoMapping)
-    if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-      // If you opted-in for the New Architecture, we load the native entry point for this app.
-      load()
-    }
+    loadReactNative(this)
   }
 }

example/android/app/src/main/java/com/expensify/walletexample/MainApplication.kt

@@ -1,11 +1,11 @@
 buildscript {
     ext {
-        buildToolsVersion = "35.0.0"
+        buildToolsVersion = "36.0.0"
         minSdkVersion = 24
-        compileSdkVersion = 35
-        targetSdkVersion = 35
+        compileSdkVersion = 36
+        targetSdkVersion = 36
         ndkVersion = "27.1.12297006"
-        kotlinVersion = "2.0.21"
+        kotlinVersion = "2.1.20"
     }
     repositories {
         google()

example/android/build.gradle

@@ -37,3 +37,8 @@ newArchEnabled=true
 # Use this property to enable or disable the Hermes JS engine.
 # If set to false, you will be using JSC instead.
 hermesEnabled=true
+ 
+# Use this property to enable edge-to-edge display support.
+# This allows your app to draw behind system bars for an immersive UI.
+# Note: Only works with ReactActivity and should not be used with custom Activity.
+edgeToEdgeEnabled=true