chore: fix some tests

android/app/build.gradle

@@ -149,7 +149,6 @@ dependencies {
     implementation("com.facebook.react:react-android")
     implementation("com.facebook.react:flipper-integration")
 
-    implementation("androidx.core:core-splashscreen:1.0.0")
     implementation("com.google.mlkit:barcode-scanning:17.2.0")
 
     if (hermesEnabled.toBoolean()) {
@@ -168,4 +167,4 @@ project.ext.vectoricons = [
     iconFontNames: [ 'Ionicons.ttf' ]
 ]
 
-apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"
+apply from: file("../../node_modules/react-native-vector-icons/fonts.gradle")

android/app/src/main/AndroidManifest.xml

@@ -33,15 +33,16 @@
       android:allowBackup="false"
       android:usesCleartextTraffic="true"
       android:networkSecurityConfig="@xml/network_security_config"
-      android:theme="@style/BootTheme"> <!-- Replace @style/AppTheme with @style/BootTheme -->
+      android:theme="@style/AppTheme"> <!-- Apply @style/AppTheme on .MainApplication -->
       <activity
         android:name=".MainActivity"
         android:label="@string/app_name"
         android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
         android:launchMode="singleTask"
         android:screenOrientation = "portrait"
         android:windowSoftInputMode="adjustResize"
-        android:exported="true">
+        android:exported="true"
+        android:theme="@style/BootTheme"> <!-- Apply @style/BootTheme on .MainActivity -->
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />
             <category android:name="android.intent.category.LAUNCHER" />

android/app/src/main/java/com/galoyapp/MainActivity.kt

@@ -5,6 +5,9 @@ import com.facebook.react.ReactActivityDelegate
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
 import com.facebook.react.defaults.DefaultReactActivityDelegate
 
+import android.os.Bundle
+import com.zoontek.rnbootsplash.RNBootSplash
+
 class MainActivity : ReactActivity() {
 
   /**
@@ -19,4 +22,9 @@ class MainActivity : ReactActivity() {
    */
   override fun createReactActivityDelegate(): ReactActivityDelegate =
       DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled)
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    RNBootSplash.init(this, R.style.BootTheme) // ⬅️ initialize the splash screen
+    super.onCreate(savedInstanceState) // super.onCreate(null) with react-native-screens
+  }
 }

android/app/src/main/res/values/styles.xml

@@ -6,11 +6,11 @@
         <item name="android:windowBackground">@color/windowBackgroundColor</item>
     </style>
 
-    <!-- BootTheme should inherit from Theme.SplashScreen -->
-    <style name="BootTheme" parent="Theme.SplashScreen">
-        <item name="windowSplashScreenBackground">@color/bootsplash_background</item>
-        <item name="windowSplashScreenAnimatedIcon">@mipmap/bootsplash_logo</item>
-        <item name="postSplashScreenTheme">@style/AppTheme</item>
+    <!-- BootTheme should inherit from Theme.BootSplash or Theme.BootSplash.EdgeToEdge -->
+    <style name="BootTheme" parent="Theme.BootSplash">
+        <item name="bootSplashBackground">@color/bootsplash_background</item>
+        <item name="bootSplashLogo">@drawable/bootsplash_logo</item>
+        <item name="postBootSplashTheme">@style/AppTheme</item>
     </style>
 
 </resources>

app/navigation/navigation-container-wrapper.tsx

@@ -138,7 +138,7 @@ export const NavigationContainerWrapper: React.FC<React.PropsWithChildren> = ({
         {...(mode === "dark" ? { theme: DarkTheme } : {})}
         linking={linking}
         onReady={() => {
-          RNBootSplash.hide({ fade: true, duration: 220 })
+          RNBootSplash.hide({ fade: true })
           console.log("NavigationContainer onReady")
         }}
         onStateChange={(state) => {

app/screens/webview/webview.tsx

@@ -1,7 +1,7 @@
 import * as React from "react"
 import { Alert, TouchableOpacity } from "react-native"
 import { injectJs, onMessageHandler } from "react-native-webln"
-import { WebView, WebViewNavigation } from "react-native-webview"
+import { WebView, WebViewNavigation, WebViewMessageEvent } from "react-native-webview"
 
 import { GaloyIcon } from "@app/components/atomic/galoy-icon"
 import { useI18nContext } from "@app/i18n/i18n-react"
@@ -76,7 +76,7 @@ export const WebViewScreen: React.FC<Props> = ({ route }) => {
         ref={webview}
         source={{ uri: url }}
         onLoadStart={() => setJsInjected(false)}
-        onLoadProgress={(e) => {
+        onLoadProgress={(e: WebViewMessageEvent) => {
           if (!jsInjected && e.nativeEvent.progress > 0.75) {
             if (webview.current) {
               webview.current.injectJavaScript(injectThemeJs())

e2e/story-book/open-all-screens.e2e.spec.ts

@@ -28,7 +28,7 @@ const openAndCloseStory = async (story: WebdriverIO.Element) => {
 
 const openAllStoriesOnScreen = async (lastSeenStory: string | null) => {
   const visibleStories = await $$(`//*[contains(@content-desc,"Storybook.ListItem")]`)
-  const lastSeenStoryIndex = visibleStories.findIndex(
+  const lastSeenStoryIndex = await visibleStories.findIndex(
     (story) => story.elementId === lastSeenStory,
   )
   const newStories = visibleStories.slice(lastSeenStoryIndex + 1)

ios/GaloyApp/BootSplash.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -12,22 +12,19 @@
         <scene sceneID="EHf-IW-A2E">
             <objects>
                 <viewController modalTransitionStyle="crossDissolve" id="01J-lp-oVM" sceneMemberID="viewController">
-                    <view key="view" autoresizesSubviews="NO" userInteractionEnabled="NO" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                    <view key="view" autoresizesSubviews="NO" contentMode="scaleToFill" id="Ze5-6b-2t3">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView autoresizesSubviews="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" image="BootSplashLogo" translatesAutoresizingMaskIntoConstraints="NO" id="3lX-Ut-9ad">
-                                <rect key="frame" x="37.5" y="271" width="300" height="125"/>
+                                <rect key="frame" x="43.5" y="273.5" width="288" height="120"/>
                                 <accessibility key="accessibilityConfiguration">
                                     <accessibilityTraits key="traits" image="YES" notEnabled="YES"/>
                                 </accessibility>
                             </imageView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
                         <color key="backgroundColor" red="0.00000000000000" green="0.00000000000000" blue="0.00000000000000" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <accessibility key="accessibilityConfiguration">
-                            <accessibilityTraits key="traits" notEnabled="YES"/>
-                        </accessibility>
                         <constraints>
                             <constraint firstItem="3lX-Ut-9ad" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="Fh9-Fy-1nT"/>
                             <constraint firstItem="3lX-Ut-9ad" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="nvB-Ic-PnI"/>
@@ -40,6 +37,6 @@
         </scene>
     </scenes>
     <resources>
-        <image name="BootSplashLogo" width="300" height="125"/>
+        <image name="BootSplashLogo" width="288" height="120"/>
     </resources>
 </document>

ios/GaloyApp/Images.xcassets/BootSplashLogo.imageset/Contents.json

@@ -2,22 +2,22 @@
   "images": [
     {
       "idiom": "universal",
-      "filename": "bootsplash_logo.png",
+      "filename": "bootsplash_logo-ldf3jg.png",
       "scale": "1x"
     },
     {
       "idiom": "universal",
-      "filename": "[email protected]",
+      "filename": "bootsplash_logo-ldf3jg@2x.png",
       "scale": "2x"
     },
     {
       "idiom": "universal",
-      "filename": "[email protected]",
+      "filename": "bootsplash_logo-ldf3jg@3x.png",
       "scale": "3x"
     }
   ],
   "info": {
-    "version": 1,
-    "author": "xcode"
+    "author": "xcode",
+    "version": 1
   }
 }

ios/GaloyApp/Info.plist

@@ -73,7 +73,6 @@
 	<true/>
 	<key>NSAppTransportSecurity</key>
 	<dict>
-	  <!-- Do not change NSAllowsArbitraryLoads to true, or you will risk app rejection! -->
 		<key>NSAllowsArbitraryLoads</key>
 		<false/>
 		<key>NSAllowsLocalNetworking</key>
@@ -86,13 +85,11 @@
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>Find merchants who accept bitcoin near you</string>
 	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-	<string>Find merchants who accept bitcoin near you</string>
+	<string>This app includes a component that requires background location access, but your location is only used while in app to find merchants near you.</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>Import a screenshot with a QR code</string>
 	<key>NFCReaderUsageDescription</key>
 	<string>Receive payments over NFC</string>
-	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-	<string>This app includes a component that requires background location access, but your location is only used while in app to find merchants near you.</string>
 	<key>UIAppFonts</key>
 	<array>
 		<string>Ionicons.ttf</string>
@@ -109,7 +106,7 @@
 		<string>remote-notification</string>
 	</array>
 	<key>UILaunchStoryboardName</key>
-	<string>BootSplash.storyboard</string>
+	<string>BootSplash</string>
 	<key>UIMainStoryboardFile</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>

ios/Podfile.lock

@@ -1729,9 +1729,9 @@ SPEC CHECKSUMS:
   RNVectorIcons: 73ab573085f65a572d3b6233e68996d4707fd505
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   VisionCamera: 36c460338692788a0d377dce7d32f8ba049fb4f2
-  Yoga: d17d2cc8105eed528474683b42e2ea310e1daf61
+  Yoga: 805bf71192903b20fc14babe48080582fee65a80
   ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5
 
 PODFILE CHECKSUM: dea6f2263b546dfc336d48f971be793dc6af27b9
 
-COCOAPODS: 1.14.3
+COCOAPODS: 1.13.0

package.json

@@ -52,7 +52,7 @@
     "android:buildDebug": "yarn android:prepareAssets && ./android/gradlew -b ./android/build.gradle assembleDebug -Dorg.gradle.jvmargs='-Xmx4g -XX:MaxPermSize=512m'",
     "ios:prepareAssets": "react-native bundle --entry-file index.js --bundle-output ./ios/main.jsbundle --assets-dest ./ios/ --platform ios --dev false",
     "bundle-visualizer": "yarn run react-native-bundle-visualizer",
-    "splash": "yarn react-native generate-bootsplash --background-color \"#000\" --logo-width 300 app/assets/logo/app-logo-dark.svg",
+    "splash": "yarn react-native generate-bootsplash --background \"#000\" --logo-width 288 app/assets/logo/app-logo-dark.svg",
     "e2e:build": "detox build --configuration",
     "e2e:test": "detox test --configuration",
     "find-unused-ll-keys": "yarn node utils/find-unused-ll-keys.js"
@@ -150,7 +150,7 @@
     "use-count-up": "^3.0.1",
     "uuid": "^9.0.0",
     "validator": "^13.9.0",
-    "victory-native": "^40.1.0",
+    "victory-native": "36",
     "webln": "^0.3.2"
   },
   "devDependencies": {

patches/react-native-vector-icons+10.0.3.patch

@@ -0,0 +1,14 @@
+--- a/node_modules/react-native-vector-icons/fonts.gradle
++++ b/node_modules/react-native-vector-icons/fonts.gradle
+@@ -32,6 +32,11 @@ afterEvaluate {
+         lintVitalAnalyzeTask.dependsOn(fontCopyTask)
+         }
+
++        def generateReportTask = tasks.findByName("generate${targetName}LintVitalReportModel")
++        if (generateReportTask) {
++            generateReportTask.dependsOn(fontCopyTask)
++        }
++      
+         def generateAssetsTask = tasks.findByName("generate${targetName}Assets")
+         generateAssetsTask.dependsOn(fontCopyTask)
+       }

tsconfig.json

@@ -1,6 +1,7 @@
 {
   "extends": "@react-native/typescript-config/tsconfig.json",
   "compilerOptions": {
+    "module": "esnext",
     "allowJs": false,
     "sourceMap": true,
     "baseUrl": "./",