Merge branch 'staging'

CHANGELOG.md

@@ -2,6 +2,27 @@
 
 ## Unreleased
 
+## 4.15.0
+
+- added: Add Maya Protocol
+- added: Battery Saver warning message for Android
+- added: Buy conversion tracking for Moonpay
+- added: Buy conversion tracking for Paybis
+- added: Support for return.edge.app deeplinks
+- added: Error tracking for failure to report conversions to referral server
+- changed: Remove whitespaces from custom token contract address input
+- changed: Use unique ENV configs for thorchain and thorchainda swap plugins
+- fixed: Correctly tag `tokenApproval` `actionType` in `getTxActionDisplayInfo`
+- fixed: Fixed obscured "done" button display bug on Sepa info display scene for small-screen devices
+- fixed: URI encoding in Paybis return URIs
+- fixed: AddressTile2 touchable area states
+- fixed: Cases where it was possible to create duplicate custom tokens
+- fixed: Clear previous swap errors when new amounts are entered or swap assets are changed in `SwapCreateScene`
+- fixed: Handle race condition when navigating to a token's transaction list which requires token activation (XRP, Algorand, etc)
+- fixed: Message about overriding a built-in token contract, which is not possible to do
+- fixed: Round Kado-provided amounts during sell
+- fixed: "Contacts Access" setting could be out of sync with the OS-level contacts access setting
+
 ## 4.14.2
 
 - fixed: Downgrade edge-exchange-plugins to v2.8.1 to remove Thorchain bugs introduced by Maya protocol additions
@@ -12,7 +33,7 @@
 - changed: More informative buy amount limit errors for light accounts
 - fixed: Default buy amounts for light accounts can potentially be over limit for non-USD currencies
 
-## 4.14.0
+## 4.14.0 (2024-09-30)
 
 - added: `ExpandableList` component, replacing the address hint dropdown in `AddressFormScene`
 - added: Add 'Cris Cyborg,' 'Free Talk Live,' and 'Crypto Canal' options to survey modal
@@ -28,12 +49,12 @@
 - changed: Updated ACH supported US states
 - changed: Use new platform-specific `assetStatsCards2` info server data
 - fixed: Missing ellipses for long usernames displayed in the `SideMenu`
-- fixed: "Apple Pay" renamed to "Pay with Apple Pay" to align with branding guidelines
-- fixed: "Most Recent Wallets" do not show those chosen through `fiatPlugin`
-- fixed: Crash on HomeScene when logging while in airplane mode
 - fixed: Inconsistent content of address hint dropdown between iOS and Android in `AddressFormScene`
+- fixed: Allow `InfoCardCarousel` to receive undefined `countryCodes`
+- fixed: Crash on HomeScene when logging while in airplane mode
 - fixed: Inconsistent corners in `SideMenu`
-- fixed: Round Kado-provided amounts during sell
+- fixed: "Most Recent Wallets" do not show those chosen through `fiatPlugin`
+- fixed: "Apple Pay" renamed to "Pay with Apple Pay" to align with branding guidelines
 
 ## 4.13.0 (2024-09-18)
 

android/app/src/main/AndroidManifest.xml

@@ -58,6 +58,7 @@
         <data android:scheme="https" />
         <data android:host="deep.edge.app" />
         <data android:host="dl.edge.app" />
+        <data android:host="return.edge.app" />
       </intent-filter>
       <intent-filter android:label="Edge Deep Links">
         <action android:name="android.intent.action.VIEW" />

ios/Podfile.lock

@@ -17,13 +17,13 @@ PODS:
   - DoubleConversion (1.1.6)
   - edge-core-js (2.18.0):
     - React-Core
-  - edge-currency-accountbased (4.24.6):
+  - edge-currency-accountbased (4.26.0):
     - React-Core
-  - edge-currency-plugins (3.3.2):
+  - edge-currency-plugins (3.4.0):
     - React-Core
-  - edge-exchange-plugins (2.8.1):
+  - edge-exchange-plugins (2.12.0):
     - React-Core
-  - edge-login-ui-rn (3.22.3):
+  - edge-login-ui-rn (3.22.4):
     - React-Core
   - EXApplication (5.1.1):
     - ExpoModulesCore
@@ -430,7 +430,7 @@ PODS:
   - react-native-webview (13.8.4):
     - RCT-Folly (= 2021.07.22.00)
     - React-Core
-  - react-native-zcash (0.8.1):
+  - react-native-zcash (0.9.1):
     - gRPC-Swift (~> 1.8)
     - MnemonicSwift (~> 2.2)
     - React-Core
@@ -572,11 +572,12 @@ PODS:
     - React-RCTImage
   - RNSecureRandom (1.0.1):
     - React
-  - RNSentry (5.22.3):
+  - RNSentry (5.33.1):
     - hermes-engine
+    - RCT-Folly (= 2021.07.22.00)
     - React-Core
     - React-hermes
-    - Sentry/HybridSDK (= 8.26.0)
+    - Sentry/HybridSDK (= 8.36.0)
   - RNShare (10.2.0):
     - React-Core
   - RNSound (0.11.0):
@@ -597,7 +598,7 @@ PODS:
   - SDWebImageWebPCoder (0.8.5):
     - libwebp (~> 1.0)
     - SDWebImage/Core (~> 5.10)
-  - Sentry/HybridSDK (8.26.0)
+  - Sentry/HybridSDK (8.36.0)
   - SQLite.swift/standalone (0.15.3):
     - sqlite3
   - "sqlite3 (3.46.0+1)":
@@ -1078,12 +1079,12 @@ SPEC CHECKSUMS:
   CNIOLinux: 62e3505f50de558c393dc2f273dde71dcce518da
   CNIOWindows: 3047f2d8165848a3936a0a755fee27c6b5ee479b
   disklet: e7ed3e673ccad9d175a1675f9f3589ffbf69a5fd
-  DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
+  DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   edge-core-js: 36f9eccd1b3e22ad3e1ca14773c9754c2bf83b63
-  edge-currency-accountbased: 86f333e5789a79adb7b47519104d72db21e1eb72
-  edge-currency-plugins: d2d7466f1215ffed6ff18d056fb5470dd2f86ab3
-  edge-exchange-plugins: 407e31812667be6679b1d1338ae15783556ae2b8
-  edge-login-ui-rn: 42c2652b2bd8b9a98b7208368ecc2827eea23955
+  edge-currency-accountbased: 092d54b79970e894724baa85fbc1788a392b3710
+  edge-currency-plugins: 266bf440ce5c26a6838f8217b0d183d6c0a12bae
+  edge-exchange-plugins: 5037e196e652d1dca42afacd86b2395bd0d7f298
+  edge-login-ui-rn: 59a7ab5b9d5bbebd045fa77b09a1e26647845c85
   EXApplication: d8f53a7eee90a870a75656280e8d4b85726ea903
   EXConstants: f348da07e21b23d2b085e270d7b74f282df1a7d9
   EXFileSystem: 844e86ca9b5375486ecc4ef06d3838d5597d895d
@@ -1100,7 +1101,7 @@ SPEC CHECKSUMS:
   FirebaseInstallations: 766dabca09fd94aef922538aaf144cc4a6fb6869
   FirebaseMessaging: 585984d0a1df120617eb10b44cad8968b859815e
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
+  glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
   GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
   GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
   gRPC-Swift: 74adcaaa62ac5e0a018938840328cb1fdfb09e7b
@@ -1140,7 +1141,7 @@ SPEC CHECKSUMS:
   react-native-safari-view: 955d7160d159241b8e9395d12d10ea0ef863dcdd
   react-native-safe-area-context: dcab599c527c2d7de2d76507a523d20a0b83823d
   react-native-webview: fa228e55c53372c2b361d2fa5e415844fa83eabf
-  react-native-zcash: 2959ff77ba393d08bcd65aa582fef8445c99453c
+  react-native-zcash: c6f228ef34d408d14f38fbd2cf008b9d09b80a78
   React-perflogger: 0cc42978a483a47f3696171dac2e7033936fc82d
   React-RCTActionSheet: ea922b476d24f6d40b8e02ac3228412bd3637468
   React-RCTAnimation: 7be2c148398eaa5beac950b2b5ec7102389ec3ad
@@ -1174,15 +1175,15 @@ SPEC CHECKSUMS:
   RNReanimated: 271f958e94385e59e0660b872ce866407e36bb45
   RNScreens: 93ae3be2f119d955620f9bbb39ad372adb53b7a9
   RNSecureRandom: 07efbdf2cd99efe13497433668e54acd7df49fef
-  RNSentry: 7e184247ee04989474d12cce0b7ef7bc4a71632f
+  RNSentry: 0744d3c79504bc4778190d047d1b60daf4a378cd
   RNShare: 554a91f5cfbe4adac4cfe3654826ee8b299fe365
   RNSound: da030221e6ac7e8290c6b43f2b5f2133a8e225b0
   RNStoreReview: 923b1c888c13469925bf0256dc2c046eab557ce5
   RNSVG: a48668fd382115bc89761ce291a81c4ca5f2fd2e
   RNVectorIcons: bfb663f3f7b37340cd90120151b720641523dc84
   SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
   SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
-  Sentry: 74a073c71c998117edb08f56f443c83570a31bed
+  Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57
   SQLite.swift: 8d054987f02728cc912b0eb5a9659650573a65a2
   sqlite3: 292c3e1bfe89f64e51ea7fc7dab9182a017c8630
   SwiftNIO: 829958aab300642625091f82fc2f49cb7cf4ef24

ios/edge/edge.entitlements

@@ -7,6 +7,7 @@
 	<key>com.apple.developer.associated-domains</key>
 	<array>
 		<string>applinks:dl.edge.app</string>
+		<string>applinks:return.edge.app</string>
 		<string>applinks:deep.edge.app</string>
 	</array>
 </dict>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "edge-react-gui",
-  "version": "4.14.2",
+  "version": "4.15.0",
   "private": true,
   "description": "Edge Wallet React GUI",
   "homepage": "https://edge.app",
@@ -79,7 +79,7 @@
     "@react-navigation/elements": "^1.3.14",
     "@react-navigation/native": "^6.1.3",
     "@react-navigation/stack": "^6.3.12",
-    "@sentry/react-native": "^5.22.3",
+    "@sentry/react-native": "^5.33.1",
     "@types/jsrsasign": "^10.5.13",
     "@walletconnect/react-native-compat": "^2.11.0",
     "@walletconnect/web3wallet": "^1.10.1",
@@ -98,12 +98,12 @@
     "detect-bundler": "^1.1.0",
     "disklet": "^0.5.2",
     "edge-core-js": "^2.18.0",
-    "edge-currency-accountbased": "^4.24.6",
+    "edge-currency-accountbased": "^4.26.0",
     "edge-currency-monero": "^1.3.1",
-    "edge-currency-plugins": "^3.3.2",
-    "edge-exchange-plugins": "^2.8.1",
-    "edge-info-server": "^2.7.0",
-    "edge-login-ui-rn": "^3.22.3",
+    "edge-currency-plugins": "^3.4.0",
+    "edge-exchange-plugins": "^2.12.0",
+    "edge-info-server": "^3.0.1",
+    "edge-login-ui-rn": "^3.22.4",
     "ethers": "^5.7.2",
     "expo": "^48.0.0",
     "jsrsasign": "^11.1.0",
@@ -141,7 +141,8 @@
     "react-native-mymonero-core": "^0.3.1",
     "react-native-patina": "^0.1.6",
     "react-native-permissions": "^4.1.5",
-    "react-native-piratechain": "^0.5.1",
+    "react-native-piratechain": "^0.5.3",
+    "react-native-power-saving-mode": "^0.1.1",
     "react-native-reanimated": "^3.14.0",
     "react-native-safari-view": "^2.1.0",
     "react-native-safe-area-context": "^4.10.1",
@@ -154,7 +155,7 @@
     "react-native-svg": "^15.3.0",
     "react-native-vector-icons": "^10.1.0",
     "react-native-webview": "^13.8.4",
-    "react-native-zcash": "^0.8.1",
+    "react-native-zcash": "^0.9.1",
     "react-redux": "^8.1.1",
     "redux": "^4.2.1",
     "redux-thunk": "^2.3.0",