Fix android

helium · Sep 9, 2024 · 1a685a8 · 1a685a8
1 parent 780ceb6
commit 1a685a8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/android/app/src/main/java/com/helium/wallet/app/MainActivity.kt b/android/app/src/main/java/com/helium/wallet/app/MainActivity.kt
@@ -4,6 +4,7 @@ import com.facebook.react.ReactActivity
 import com.facebook.react.ReactActivityDelegate
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
 import com.facebook.react.defaults.DefaultReactActivityDelegate
+import expo.modules.ReactActivityDelegateWrapper
 
 class MainActivity : ReactActivity() {
 
@@ -18,5 +19,5 @@ class MainActivity : ReactActivity() {
    * which allows you to enable New Architecture with a single boolean flags [fabricEnabled]
    */
   override fun createReactActivityDelegate(): ReactActivityDelegate =
-      DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled)
+      ReactActivityDelegateWrapper(this, BuildConfig.IS_NEW_ARCHITECTURE_ENABLED, DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled))
 }
diff --git a/android/build.gradle b/android/build.gradle
@@ -3,7 +3,7 @@
 buildscript {
     ext {
         buildToolsVersion = "34.0.0"
-        minSdkVersion = 23
+        minSdkVersion = 24
         compileSdkVersion = 34
         targetSdkVersion = 34
         ndkVersion = "26.1.10909125"

diff --git a/src/features/account/ConnectedWallets.tsx b/src/features/account/ConnectedWallets.tsx
@@ -314,8 +314,11 @@ const ConnectedWallets = forwardRef(
             onLayout={(height) => {
               setSectionFooterHeights((prev) => {
                 const newHeight = { ...prev }
-                newHeight[data[0].mnemonicHash || 'none'] =
-                  height.nativeEvent.layout.height
+                if (height.nativeEvent) {
+                  newHeight[data[0].mnemonicHash || 'none'] =
+                    height.nativeEvent.layout.height
+                }
+
                 return newHeight
               })
             }}