Merge pull request #4914 from bithyve/dev

Release v1.2.10
bithyve · Jul 15, 2024 · d63c179 · d63c179
2 parents f84c2cd + 9c58d17
commit d63c179
Show file tree

Hide file tree

Showing 95 changed files with 7,468 additions and 7,691 deletions.
diff --git a/App.tsx b/App.tsx
@@ -15,6 +15,7 @@ import config from 'src/utils/service-utilities/config';
 import { customTheme } from './src/navigation/themes';
 import Navigator from './src/navigation/Navigator';
 import { persistor, store } from './src/store/store';
+import NotificationHandler from 'src/hooks/useNotificationHandler';
 
 LogBox.ignoreLogs([
   "[react-native-gesture-handler] Seems like you're using an old API with gesture components, check out new Gestures system!",
@@ -47,6 +48,7 @@ function App() {
   return (
     <GestureHandlerRootView style={{ flex: 1 }}>
       <NativeBaseProvider theme={customTheme}>
+        <NotificationHandler />
         <StatusBar translucent backgroundColor="transparent" barStyle="light-content" />
         <LocalizationProvider>
           <AppContextProvider>

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -86,8 +86,8 @@ android {
         applicationId "io.hexawallet.keeper"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 369
-        versionName "1.2.9"
+        versionCode 374
+        versionName "1.2.10"
         missingDimensionStrategy 'react-native-camera', 'general'
         missingDimensionStrategy 'store', 'play'
         multiDexEnabled true
@@ -167,12 +167,12 @@ dependencies {
             strictly '1.3.1'
         }
     }
-    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
+    // debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
 
-    debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
-        exclude group:'com.squareup.okhttp3', module:'okhttp'
-    }
-    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
+    // debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
+    //     exclude group:'com.squareup.okhttp3', module:'okhttp'
+    // }
+    // debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
 
     if (hermesEnabled.toBoolean()) {
         implementation("com.facebook.react:hermes-android")

diff --git a/android/app/src/debug/java/com/hexa_keeper/ReactNativeFlipper.java b/android/app/src/debug/java/com/hexa_keeper/ReactNativeFlipper.java
diff --git a/android/app/src/main/java/com/hexa_keeper/MainApplication.java b/android/app/src/main/java/com/hexa_keeper/MainApplication.java
@@ -61,6 +61,6 @@ public void onCreate() {
       // If you opted-in for the New Architecture, we load the native entry point for this app.
       DefaultNewArchitectureEntryPoint.load();
     }
-    io.hexawallet.keeper.ReactNativeFlipper.initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
+    // io.hexawallet.keeper.ReactNativeFlipper.initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
   }
 }
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -24,7 +24,7 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.182.0
+# FLIPPER_VERSION=0.182.0
 
 # Use this property to specify which architecture you want to build.
 # You can also override it from the CLI using

diff --git a/ios/Podfile b/ios/Podfile
@@ -39,7 +39,7 @@ def common_pods
     #
     # Note that if you have use_frameworks! enabled, Flipper will not work and
     # you should disable the next line.
-    :flipper_configuration => flipper_config,
+    # :flipper_configuration => flipper_config,
     # An absolute path to your application root.
     :app_path => "#{Pod::Config.instance.installation_root}/.."
   )