Release/14.44

android/app/build.gradle

@@ -104,8 +104,8 @@ android {
         applicationId "com.bitpay.wallet"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 91212420
-        versionName "14.43.3"
+        versionCode 91212431
+        versionName "14.44.2"
         missingDimensionStrategy 'react-native-camera', 'mlkit'
         ndk {
             abiFilters "armeabi-v7a", "x86", "x86_64", "arm64-v8a"

android/app/src/main/java/com/bitpay/wallet/MainActivity.kt

@@ -7,6 +7,7 @@ import android.os.Build
 import android.os.Bundle
 import android.view.View
 import android.view.WindowManager
+import com.braze.reactbridge.BrazeReactUtils
 import com.braze.ui.inappmessage.BrazeInAppMessageManager
 import com.facebook.react.ReactActivity
 import com.facebook.react.ReactActivityDelegate
@@ -40,6 +41,7 @@ class MainActivity : ReactActivity() {
             return
         }
 
+        BrazeReactUtils.populateInitialPushPayloadFromIntent(intent)
         RNBootSplash.init(this, R.style.BootTheme)
         supportFragmentManager.fragmentFactory = RNScreensFragmentFactory()
         super.onCreate(savedInstanceState)

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="com_braze_api_key">BRAZE_API_KEY_REPLACE_ME</string>
-  <string translatable="false" name="com_braze_custom_endpoint">sdk.iad-05.braze.com</string>
+  <bool name="com_braze_enable_delayed_initialization">true</bool>
   <bool translatable="false" name="com_braze_firebase_cloud_messaging_registration_enabled">true</bool>
   <string translatable="false" name="com_braze_firebase_cloud_messaging_sender_id">BRAZE_SENDER_ID_REPLACE_ME</string>
   <bool name="com_braze_handle_push_deep_links_automatically">false</bool>

declarations.d.ts

@@ -7,6 +7,9 @@ declare module '*.svg' {
 declare module '@env' {
   export const PAYPRO_TRUSTED_KEYS: string;
   export const BASE_FIATRATES_MARKETSTATS_URL_DEVELOPMENT: string;
+  export const BRAZE_API_ENDPOINT: string;
+  export const BRAZE_API_KEY_ANDROID: string;
+  export const BRAZE_API_KEY_IOS: string;
   export const BRAZE_EXPORT_API_KEY: string;
   export const BRAZE_MERGE_AND_DELETE_API_KEY: string;
   export const BRAZE_REST_API_ENDPOINT: string;

index.js

@@ -166,7 +166,8 @@ const ReduxProvider = () => {
       setStore({store, persistor});
       setStoreReady(true);
       setJSExceptionHandler(makeErrorHandler(store), true);
-      setNativeExceptionHandler(makeNativeExceptionHandler(store));
+      // executeDefaultHandler=true chains to Sentry's UncaughtExceptionHandler so native crashes are captured
+      setNativeExceptionHandler(makeNativeExceptionHandler(store), true, true);
     });
 
     return () => {
@@ -206,7 +207,7 @@ const AppWrapper = () => {
 
     const subscription = Appearance.addChangeListener(
       ({colorScheme: newScheme}) => {
-        if (colorScheme === null) {
+        if (!colorScheme || colorScheme === 'unspecified') {
           setIsDark(newScheme === 'dark');
         }
       },

ios/BitPayApp/AppDelegate.swift

@@ -6,6 +6,7 @@ import AppsFlyerLib
 import RNBootSplash
 import BrazeKit
 import BrazeUI
+import braze_react_native_sdk
 import UserNotifications
 import CryptoKit
 
@@ -172,17 +173,15 @@ class AppDelegate: UIResponder, UIApplicationDelegate, BrazeInAppMessageUIDelega
         window?.makeKeyAndVisible()
 
         // MARK: Braze SDK setup
-        let config = Braze.Configuration(apiKey: "BRAZE_API_KEY_REPLACE_ME", endpoint: "sdk.iad-05.braze.com")
-        config.logger.level = .info
-        config.triggerMinimumTimeInterval = 1
-
-        // `BrazeReactBridge.initBraze(_:)` is an Objective-C selector; we call it dynamically
-        if let brazeObj = BrazeReactBridge.perform(#selector(BrazeReactBridge.initBraze(_:)), with: config)?.takeUnretainedValue() as? Braze {
-            self.braze = brazeObj
+        BrazeReactInitializer.configure({ config in
+            config.logger.level = .info
+            config.triggerMinimumTimeInterval = 1
+        }, postInitialization: { [weak self] braze in
+            self?.braze = braze
             let inAppUI = BrazeInAppMessageUI()
             inAppUI.delegate = self
-            brazeObj.inAppMessagePresenter = inAppUI
-        }
+            braze.inAppMessagePresenter = inAppUI
+        })
 
         // Disable URL caching globally to prevent sensitive data disclosure
         URLCache.shared.removeAllCachedResponses()

ios/BitPayApp/Info.plist

@@ -26,7 +26,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>14.43.3</string>
+	<string>14.44.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

ios/BitPayApp/PrivacyInfo.xcprivacy

@@ -10,6 +10,7 @@
 			<key>NSPrivacyAccessedAPITypeReasons</key>
 			<array>
 				<string>CA92.1</string>
+				<string>1C8F.1</string>
 			</array>
 		</dict>
 		<dict>

ios/Podfile.lock

@@ -3,11 +3,11 @@ PODS:
     - AppsFlyerFramework/Main (= 6.17.9)
   - AppsFlyerFramework/Main (6.17.9)
   - boost (1.84.0)
-  - braze-react-native-sdk (16.1.0):
+  - braze-react-native-sdk (20.1.0):
     - boost
-    - BrazeKit (~> 13.2.0)
-    - BrazeLocation (~> 13.2.0)
-    - BrazeUI (~> 13.2.0)
+    - BrazeKit (~> 14.0.4)
+    - BrazeLocation (~> 14.0.4)
+    - BrazeUI (~> 14.0.4)
     - DoubleConversion
     - fast_float
     - fmt
@@ -34,11 +34,11 @@ PODS:
     - ReactCommon/turbomodule/core
     - SocketRocket
     - Yoga
-  - BrazeKit (13.2.1)
-  - BrazeLocation (13.2.1):
-    - BrazeKit (= 13.2.1)
-  - BrazeUI (13.2.1):
-    - BrazeKit (= 13.2.1)
+  - BrazeKit (14.0.4)
+  - BrazeLocation (14.0.4):
+    - BrazeKit (= 14.0.4)
+  - BrazeUI (14.0.4):
+    - BrazeKit (= 14.0.4)
   - BVLinearGradient (2.6.2):
     - React-Core
   - CookieManager (6.3.0):
@@ -3955,10 +3955,10 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   AppsFlyerFramework: 4f9a8237d40e9093941aef760cd77d606238aedd
   boost: 7e761d76ca2ce687f7cc98e698152abd03a18f90
-  braze-react-native-sdk: b3bd4594310a390c12beb06b02bf0fbbfcbca7e0
-  BrazeKit: dc74d3969d42e3f890461fe842e9422480269774
-  BrazeLocation: 1919682502f70d3f215215b9ef2b56836dde4a9e
-  BrazeUI: b49f51ff3eb88657d6a97e6b3688e03a7255cbe1
+  braze-react-native-sdk: 12e813e4a989839c912c87acc4a2ab72c5652df5
+  BrazeKit: ba951d2299c1d16b541cf35cdd7250d03e28a0fb
+  BrazeLocation: d6938a737f123bb9e6632246d1abea40eeb12768
+  BrazeUI: 1d733e1dea4d81f95f261b52cc6e4b91a0eccca8
   BVLinearGradient: 34a999fda29036898a09c6a6b728b0b4189e1a44
   CookieManager: ae06e97a79ea66832add0c8aa501a7986bdbb72d
   DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
@@ -4101,4 +4101,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 91e915b372fe50cffa909299965ad28bb54bc3f7
 
-COCOAPODS: 1.16.2
+COCOAPODS: 1.15.2

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bitpay",
-  "version": "14.43.3",
+  "version": "14.44.2",
   "private": true,
   "engines": {
     "node": ">=20"
@@ -23,7 +23,7 @@
     "build:android:release": "export NODE_OPTIONS=--openssl-legacy-provider && ./scripts/android-release.sh",
     "postbuild:android:release": "yarn reset:prod",
     "lint": "eslint --fix . --ext .js,.jsx,.ts,.tsx",
-    "validate": "tsc --noEmit --skipLibCheck 2>&1 | grep -v node_modules | grep -E 'TS(2304|2693|2349|2351|2448|2554|2307|2454|2305|2774)' && exit 1 || exit 0",
+    "validate": "tsc --noEmit --skipLibCheck 2>&1 | grep -v node_modules | grep -E 'TS(2304|2693|2349|2351|2448|2554|2307|2454|2305|2774|2532|18048)' && exit 1 || exit 0",
     "prettier": "prettier --write \"src/**/*.{js,jsx,ts,tsx}\"",
     "prettier:check": "prettier --check \"src/**/*.{js,jsx,ts,tsx}\"",
     "postinstall": "./scripts/postinstall.sh",
@@ -49,7 +49,7 @@
   },
   "dependencies": {
     "@bitpay-labs/bitcore-wallet-client": "11.10.0",
-    "@braze/react-native-sdk": "16.1.0",
+    "@braze/react-native-sdk": "20.1.0",
     "@ethersproject/shims": "5.7.0",
     "@freakycoder/react-native-bounceable": "0.2.5",
     "@gorhom/bottom-sheet": "5.2.6",

patches/react-native-webassembly+0.3.3.patch

@@ -1,29 +1,27 @@
 diff --git a/node_modules/react-native-webassembly/android/CMakeLists.txt b/node_modules/react-native-webassembly/android/CMakeLists.txt
-index 0f879e0..e5992c2 100644
+index 0f879e0..75b0cdc 100644
 --- a/node_modules/react-native-webassembly/android/CMakeLists.txt
 +++ b/node_modules/react-native-webassembly/android/CMakeLists.txt
-@@ -64,6 +64,7 @@ find_package(ReactAndroid REQUIRED CONFIG)
+@@ -64,7 +64,9 @@ find_package(ReactAndroid REQUIRED CONFIG)
 
  target_link_libraries(
          cpp
 +        "-Wl,-z,max-page-size=16384"
          ${log-lib}
++        c++_shared
          ReactAndroid::jsi
          android
-diff --git a/node_modules/react-native-webassembly/android/build.gradle b/node_modules/react-native-webassembly/android/build.gradle
-index 5643083..9185c73 100644
---- a/node_modules/react-native-webassembly/android/build.gradle
-+++ b/node_modules/react-native-webassembly/android/build.gradle
-@@ -42,9 +42,11 @@ android {
-       cmake {
-         cppFlags "-O2 -frtti -fexceptions -Wall -fstack-protector-all"
-         arguments "-DANDROID_STL=c++_shared"
--        abiFilters "x86", "x86_64", "armeabi-v7a", "arm64-v8a"
-       }
-     }
-+    ndk {
-+        abiFilters "arm64-v8a", "x86_64"
-+    }
-   }
-   externalNativeBuild {
-     cmake {
+ )
+diff --git a/node_modules/react-native-webassembly/cpp/m3_config_platforms.h b/node_modules/react-native-webassembly/cpp/m3_config_platforms.h
+index 50b86ac..8deaf8d 100644
+--- a/node_modules/react-native-webassembly/cpp/m3_config_platforms.h
++++ b/node_modules/react-native-webassembly/cpp/m3_config_platforms.h
+@@ -82,7 +82,7 @@
+ #  endif
+ # endif
+
+-# if M3_COMPILER_HAS_ATTRIBUTE(musttail)
++# if M3_COMPILER_HAS_ATTRIBUTE(musttail) && !defined(__arm__)
+ #   define M3_MUSTTAIL __attribute__((musttail))
+ # else
+ #   define M3_MUSTTAIL

scripts/braze-config.js

@@ -15,28 +15,10 @@ const dotenv = require('dotenv');
     throw result.error;
   }
 
-  // Configure Braze for iOS
-  if (process.env.BRAZE_API_KEY_IOS) {
-    const brazeConfigFileIOS = `${__dirname}/../ios/BitPayApp/AppDelegate.swift`;
-    let contentiOS = fs.readFileSync(brazeConfigFileIOS, 'utf8');
-    contentiOS = contentiOS.replace(
-      'BRAZE_API_KEY_REPLACE_ME',
-      process.env.BRAZE_API_KEY_IOS,
-    );
-    fs.writeFileSync(brazeConfigFileIOS, contentiOS);
-  }
-
   // Configure Braze for Android
   const brazeConfigFileAndroid = `${__dirname}/../android/app/src/main/res/values/braze.xml`;
   let contentAndroid = fs.readFileSync(brazeConfigFileAndroid, 'utf8');
 
-  if (process.env.BRAZE_API_KEY_ANDROID) {
-    contentAndroid = contentAndroid.replace(
-      'BRAZE_API_KEY_REPLACE_ME',
-      process.env.BRAZE_API_KEY_ANDROID,
-    );
-  }
-
   if (process.env.BRAZE_SENDER_ID) {
     contentAndroid = contentAndroid.replace(
       'BRAZE_SENDER_ID_REPLACE_ME',

src/Root.tsx

@@ -299,7 +299,10 @@ const StartupGate = () => {
   const appColorScheme = useAppSelector(({APP}) => APP.colorScheme);
   const hasRoutedRef = useRef(false);
 
-  const scheme = appColorScheme || Appearance.getColorScheme();
+  const scheme =
+    !appColorScheme || appColorScheme === 'unspecified'
+      ? Appearance.getColorScheme()
+      : appColorScheme;
   const theme = scheme === 'dark' ? BitPayDarkTheme : BitPayLightTheme;
 
   useEffect(() => {
@@ -694,7 +697,10 @@ export default () => {
     patchLogger(Logger);
   }, []);
 
-  const scheme = appColorScheme || Appearance.getColorScheme();
+  const scheme =
+    !appColorScheme || appColorScheme === 'unspecified'
+      ? Appearance.getColorScheme()
+      : appColorScheme;
   const theme = scheme === 'dark' ? BitPayDarkTheme : BitPayLightTheme;
 
   return (