Merge branch 'staging'

Author: swansontec

CHANGELOG.md

@@ -2,7 +2,26 @@
 
 ## Unreleased (develop)
 
-## 4.29.0 (staging)
+## 4.30.0 (staging)
+
+- added: Additional app review prompt triggers
+- added: Additional user information fields for Kado OTC orders
+- added: Apple AdServices integration and reporting
+- added: KeyboardAccessoryView-based `KavButton`
+- changed: Dismissing Password Reminder banner now behaves the same as dismissing the `PasswordReminderModal`
+- changed: Autocomplete `networkLocation` fields returned from `getTokenDetails` in `EditTokenScene`
+- changed: `FiatPluginEnterAmountScene` next button to use `KavButton`
+- changed: `SendScene2` row/card grouping updated
+- changed: Fees are no longer estimated before amounts are entered in `SendScene2`
+- changed: Remove boot logo animation on Android.
+- changed: Recent wallets added to the top of the Wallet List when searching
+- changed: `OSMOSIS_INIT` type updated to accept api keys
+- fixed: Connecting tokens to FIO addresses failing if there was a "." in the currency code
+- fixed: (ETH) Improper Kiln staking balance shown.
+- fixed: Informative insufficient funds error message for Velo staking
+- fixed: Chart price data not updating when `assetId` changes
+
+## 4.29.0 (2025-06-10)
 
 - added: Add eCash.
 - added: Thorchain TCY stake and unstake

android/app/build.gradle

@@ -1,15 +1,11 @@
-plugins {
-    id "com.android.application"
-    id "io.sentry.android.gradle" version "4.6.0"
-}
-
 apply plugin: "com.android.application"
 apply plugin: "com.facebook.react"
 
 // Edge build plugins:
-apply plugin: 'com.google.gms.google-services'
-apply plugin: 'kotlin-android'
-apply plugin: 'tech.formatter-kt.formatter'
+apply plugin: "com.google.gms.google-services"
+apply plugin: "io.sentry.android.gradle"
+apply plugin: "kotlin-android"
+apply plugin: "tech.formatter-kt.formatter"
 
 import com.android.build.OutputFile
 
@@ -87,10 +83,11 @@ def enableProguardInReleaseBuilds = false
  * this variant is about 6MiB larger per architecture than default.
  */
 def jscFlavor = 'org.webkit:android-jsc:+'
-def sentrySlug = "SENTRY_ORGANIZATION_SLUG"
 
+// Edge addition for Sentry:
+def sentrySlug = "SENTRY_ORGANIZATION_SLUG"
 if (!sentrySlug.contains('SENTRY_ORGANIZATION')) {
-  apply from: new File(["node", "--print", "require.resolve('@sentry/react-native/package.json')"].execute().text.trim(), "../sentry.gradle")
+  apply from: "../../node_modules/@sentry/react-native/sentry.gradle"
 }
 
 /**
@@ -190,7 +187,6 @@ dependencies {
     }
 
     // Edge additions:
-    implementation 'androidx.core:core-splashscreen:1.0.0'
     implementation 'androidx.work:work-runtime:2.7.1'
     implementation 'com.google.guava:guava:29.0-android'
 
@@ -336,7 +332,7 @@ if (!sentrySlug.contains('SENTRY_ORGANIZATION')) {
       // Default is enabled.
       // Only available v3.1.0 and above.
       autoInstallation {
-        enabled = true
+        enabled = false
 
         // Specifies a version of the sentry-android SDK and fragment, timber and okhttp integrations.
         //

android/app/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
 
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -36,7 +36,7 @@
     android:roundIcon="@mipmap/ic_launcher_round"
     android:allowBackup="false"
     android:usesCleartextTraffic="true"
-    android:theme="@style/Theme.App.Starting">
+    android:theme="@style/AppTheme">
     <meta-data android:name="io.sentry.auto-init" android:value="false" />
     <meta-data android:name="com.google.firebase.messaging.default_notification_icon"
                android:resource="@mipmap/edge_logo_hollow" />
@@ -46,7 +46,8 @@
       android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
       android:exported="true"
       android:launchMode="singleTask"
-      android:windowSoftInputMode="adjustResize">
+      android:windowSoftInputMode="adjustResize"
+      android:theme="@style/BootTheme">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
         <category android:name="android.intent.category.LAUNCHER" />

android/app/src/main/java/co/edgesecure/app/MainActivity.kt

@@ -43,7 +43,7 @@ class MainActivity : ReactActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         // Keep the splash screen around until we are ready to hide it:
-        RNBootSplash.init(this)
+        RNBootSplash.init(this, R.style.BootTheme);
         super.onCreate(null)
 
         // Hide app contents in the background:

android/app/src/main/res/drawable/avd_splash.xml

@@ -1,3 +1,3 @@
 <resources>
-    <color name="ic_launcher_background">#050a0d</color>
+    <color name="bootsplash_background">#050a0d</color>
 </resources>

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

@@ -5,9 +5,9 @@
         <!-- Customize your theme here. -->
     </style>
 
-    <style name="Theme.App.Starting" parent="Theme.SplashScreen">
-        <item name="postSplashScreenTheme">@style/AppTheme</item>
-        <item name="windowSplashScreenAnimatedIcon">@drawable/vd_splash</item>
-        <item name="windowSplashScreenBackground">@color/ic_launcher_background</item>
+    <style name="BootTheme" parent="Theme.BootSplash">
+        <item name="bootSplashBackground">@color/bootsplash_background</item>
+        <item name="bootSplashLogo">@drawable/vd_splash</item>
+        <item name="postBootSplashTheme">@style/AppTheme</item>
     </style>
 </resources>

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

@@ -28,7 +28,8 @@ buildscript {
 
         // Edge additions:
         classpath 'com.google.gms:google-services:4.3.14'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
         classpath "gradle.plugin.tech.formatter-kt:plugin:0.7.9"
+        classpath "io.sentry:sentry-android-gradle-plugin:5.7.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
     }
 }

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

@@ -17,7 +17,7 @@ PODS:
   - DoubleConversion (1.1.6)
   - edge-core-js (2.31.1):
     - React-Core
-  - edge-currency-accountbased (4.48.3):
+  - edge-currency-accountbased (4.48.5):
     - React-Core
   - edge-currency-plugins (3.8.2):
     - React-Core
@@ -394,6 +394,8 @@ PODS:
   - React-jsinspector (0.71.15)
   - React-logger (0.71.15):
     - glog
+  - react-native-adservices (0.1.3):
+    - React-Core
   - react-native-camera (1.13.1):
     - React
     - react-native-camera/RCT (= 1.13.1)
@@ -533,7 +535,7 @@ PODS:
     - ZIPFoundation (= 0.9.11)
   - rn-id-blurview (1.2.1):
     - React
-  - RNBootSplash (4.7.4):
+  - RNBootSplash (6.3.8):
     - React-Core
   - RNCAsyncStorage (1.19.4):
     - React-Core
@@ -581,13 +583,14 @@ PODS:
     - React-RCTImage
   - RNSecureRandom (1.0.1):
     - React
-  - RNSentry (5.33.1):
+  - RNSentry (6.14.0):
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
     - React-Core
     - React-hermes
-    - Sentry/HybridSDK (= 8.36.0)
-  - RNShare (10.2.0):
+    - Sentry/HybridSDK (= 8.50.2)
+  - RNShare (12.0.11):
+    - RCT-Folly (= 2021.07.22.00)
     - React-Core
   - RNSound (0.11.0):
     - React
@@ -607,7 +610,7 @@ PODS:
   - SDWebImageWebPCoder (0.8.5):
     - libwebp (~> 1.0)
     - SDWebImage/Core (~> 5.10)
-  - Sentry/HybridSDK (8.36.0)
+  - Sentry/HybridSDK (8.50.2)
   - SQLite.swift/standalone (0.15.3):
     - sqlite3
   - "sqlite3 (3.46.0+1)":
@@ -788,6 +791,7 @@ DEPENDENCIES:
   - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
   - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
   - React-logger (from `../node_modules/react-native/ReactCommon/logger`)
+  - "react-native-adservices (from `../node_modules/@brigad/react-native-adservices`)"
   - react-native-camera (from `../node_modules/react-native-camera`)
   - "react-native-compat (from `../node_modules/@walletconnect/react-native-compat`)"
   - react-native-contacts (from `../node_modules/react-native-contacts`)
@@ -967,6 +971,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/jsinspector"
   React-logger:
     :path: "../node_modules/react-native/ReactCommon/logger"
+  react-native-adservices:
+    :path: "../node_modules/@brigad/react-native-adservices"
   react-native-camera:
     :path: "../node_modules/react-native-camera"
   react-native-compat:
@@ -1097,7 +1103,7 @@ SPEC CHECKSUMS:
   disklet: 8a20bf8a568635b6e6bb8f93297dac13ee5cef98
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   edge-core-js: f20da4858c4ad38adf5a7eefa53a55966fd04b5e
-  edge-currency-accountbased: 7d6a886a23fb852b8c1b5582a13ea1f70f403d84
+  edge-currency-accountbased: 2088c7c101ffeaf1395e5447bbad03fe3c61ed1a
   edge-currency-plugins: 895640df32689491d4f23db2a15237a99cd0a4f8
   edge-exchange-plugins: 6a50863447b52dd27e48a8572e6ba55dcd0eaf64
   edge-login-ui-rn: f4b7bada9346ec86e215e5328dd1606d37f0bc27
@@ -1144,6 +1150,7 @@ SPEC CHECKSUMS:
   React-jsiexecutor: 5cc0fdcf933aedb0ea9146172a9668ff38e5cac9
   React-jsinspector: 4ade58a6a355d97a53f847543b14f4cb5033cb70
   React-logger: fc6e4fa928e8773ebfb7f1d287fb6ae60715545a
+  react-native-adservices: 18087a4a5106c5133b0cde73701bf875e3163cfc
   react-native-camera: 806a323ba17579a335ee43a70622f6b8aae98de8
   react-native-compat: c5c101132cacb720def1c72b40cdf0398e34d31e
   react-native-contacts: f4efe82376487f1b87411e22b867e85cc4fb1d3c
@@ -1176,7 +1183,7 @@ SPEC CHECKSUMS:
   ReactCommon: 8a735714dc64b08430132010a5404c95382d1c05
   ReactNativeFileAccess: 4b46f383b251dbb24d7cb9616f44676374a7d481
   rn-id-blurview: 35bf4f960b8b108d12ed8a8ff14cbc22ed908081
-  RNBootSplash: b42375998e728cde229aeabe9376cf26faa13cbf
+  RNBootSplash: efd6dbf15b2579fb86bc575b8b676d1c5ac5709f
   RNCAsyncStorage: c483708b137c90f4063675058a78b7d6d63fbf55
   RNCClipboard: 4598dae0fe33e2aa130d9d213e2007be78310266
   RNCPicker: 68cada0778c2ec65d200a3ae4b44739a0396d333
@@ -1194,15 +1201,15 @@ SPEC CHECKSUMS:
   RNReanimated: b83a48d27a23ff20d88d2a55558a84b82ef10591
   RNScreens: 448026fcd1beb88770b0a67a871a3d1bf9cdde0a
   RNSecureRandom: b64d263529492a6897e236a22a2c4249aa1b53dc
-  RNSentry: 57cc5b69e739fce9515cbc2975b820d6ea5faeae
-  RNShare: 51bbcdb91c6456dccf3999f8f85d952a6d6b55a8
+  RNSentry: 30748d76efd178fc033671cb65689992805045d5
+  RNShare: ec3bd4a4432757294f6a802edbc359b9fc68cc54
   RNSound: 436aa4de81ae87b90e1781b5dd9247df3aa4622a
   RNStoreReview: 30ae7a0ce3e2dd1d753df104bb20d4bea1f8a96e
   RNSVG: e77adf5edb2302f0f10dd03a09e92bb9420d914e
   RNVectorIcons: 2d86acb67d3b496b55ec50893f751ce5ce74783e
   SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
   SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
-  Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57
+  Sentry: d95f5f3b32d01324b3e27d3c52747005302cc026
   SQLite.swift: 8d054987f02728cc912b0eb5a9659650573a65a2
   sqlite3: 292c3e1bfe89f64e51ea7fc7dab9182a017c8630
   SwiftNIO: 829958aab300642625091f82fc2f49cb7cf4ef24