Merge branch 'staging'

EdgeApp · Jan 14, 2025 · 71a3e63 · 71a3e63
2 parents 9bc4725 + e31db9f
commit 71a3e63
Show file tree

Hide file tree

Showing 73 changed files with 2,012 additions and 1,411 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,21 +2,25 @@
 
 ## Unreleased (develop)
 
-- added: Transaction id for swap details
+## 4.20.0 (staging)
+
+- added: (Tron) PIX warning when sending USDT to a pasted email
 - added: 'numAccounts' to 'Signup_Complete' event
 - added: New Kado OTC provider integration.
-- changed: `WalletListScene` filter mode remains active on empty text
+- added: Transaction id for swap details
 - changed: (iOS) `SimpleTextInput` back chevron replaced with "Cancel" button
+- changed: `WalletListScene` filter mode remains active on empty text
+- changed: Auto select text in tx details payee field when focused
+- changed: Fiat buy/sell shows message if region is unsupported for the selected payment method
+- changed: Handle errors in StakeKit API responses
 - changed: Improved EdgeCrashEvent reporting with additional metadata, tags, and name/message information.
 - changed: Integrate `installSurvey` endpoint for post-install survey options
-- changed: Fiat buy/sell shows message if region is unsupported for the selected payment method
 - changed: StakeKit staking plugin to check validator status before getting quote
-- changed: Auto select text in tx details payee field when focused
-- changed: Handle errors in StakeKit API responses
 - fixed: Missing "Done" button when managing tokens for certain assets
 - fixed: Only send successful import items to completion scene
 - fixed: WalletConnect `eth_sendRawTransaction` event handling
 - removed: Removed patch for usb and node-hid
+- removed: 'uspSigninCta' experiment in favor of the 'alreadyHaveAccount' variant
 
 ## 4.19.2 (2025-01-06)
 

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -15,15 +15,15 @@ PODS:
   - disklet (0.5.2):
     - React
   - DoubleConversion (1.1.6)
-  - edge-core-js (2.22.2):
+  - edge-core-js (2.22.1):
     - React-Core
-  - edge-currency-accountbased (4.31.4):
+  - edge-currency-accountbased (4.32.4):
     - React-Core
   - edge-currency-plugins (3.4.5):
     - React-Core
-  - edge-exchange-plugins (2.15.1):
+  - edge-exchange-plugins (2.16.1):
     - React-Core
-  - edge-login-ui-rn (3.24.0):
+  - edge-login-ui-rn (3.24.1):
     - React-Core
   - EXApplication (5.1.1):
     - ExpoModulesCore
@@ -1080,11 +1080,11 @@ SPEC CHECKSUMS:
   CNIOWindows: 3047f2d8165848a3936a0a755fee27c6b5ee479b
   disklet: e7ed3e673ccad9d175a1675f9f3589ffbf69a5fd
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
-  edge-core-js: c5f02df2b88d47db739d95e39edd046a783becbc
-  edge-currency-accountbased: b3045433463e23d8154ab29455c9028a8c5c6aae
+  edge-core-js: e824579a514ac6bbe61b3d89541efb9019569057
+  edge-currency-accountbased: 8afc6acd357335a970ae9589c73f680751cd2034
   edge-currency-plugins: 797acb6852c2f0a3ccf5e6bde510cc85ee591402
-  edge-exchange-plugins: fd725d2fbe76ea0cc8eba1711c565f401cfb6c1b
-  edge-login-ui-rn: 70f8057108ae213e43583a0b3876c88c500c27bc
+  edge-exchange-plugins: 5433ebd732d6d5ae87359629e658243538e3ea10
+  edge-login-ui-rn: 2eb26b870395b36d738d73885ac863b7e2fd86de
   EXApplication: d8f53a7eee90a870a75656280e8d4b85726ea903
   EXConstants: f348da07e21b23d2b085e270d7b74f282df1a7d9
   EXFileSystem: 844e86ca9b5375486ecc4ef06d3838d5597d895d

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "edge-react-gui",
-  "version": "4.19.2",
+  "version": "4.20.0",
   "private": true,
   "description": "Edge Wallet React GUI",
   "homepage": "https://edge.app",
@@ -98,16 +98,17 @@
     "deepmerge": "^4.3.1",
     "detect-bundler": "^1.1.0",
     "disklet": "^0.5.2",
-    "edge-core-js": "^2.22.2",
-    "edge-currency-accountbased": "^4.31.4",
+    "edge-core-js": "^2.22.1",
+    "edge-currency-accountbased": "^4.32.4",
     "edge-currency-monero": "^1.3.2",
     "edge-currency-plugins": "^3.4.5",
-    "edge-exchange-plugins": "^2.15.1",
-    "edge-info-server": "^3.0.1",
-    "edge-login-ui-rn": "^3.24.0",
+    "edge-exchange-plugins": "^2.16.1",
+    "edge-info-server": "^3.2.0",
+    "edge-login-ui-rn": "^3.24.1",
     "ethers": "^5.7.2",
     "expo": "^48.0.0",
     "jsrsasign": "^11.1.0",
+    "p-debounce": "^4.0.0",
     "paraswap": "^5.2.0",
     "posthog-js": "^1.88.1",
     "posthog-react-native": "^2.8.1",
@@ -181,7 +182,7 @@
     "@react-native/babel-preset": "0.73.21",
     "@react-native/typescript-config": "0.73.1",
     "@rollup/plugin-babel": "^6.0.3",
-    "@stakekit/api-hooks": "^0.0.52",
+    "@stakekit/api-hooks": "^0.0.93",
     "@sucrase/webpack-loader": "^2.0.0",
     "@typechain/ethers-v5": "^11.1.2",
     "@types/async-lock": "^1.1.5",

diff --git a/patches/fake-hw-transport-node-hid/index.js b/patches/fake-hw-transport-node-hid/index.js
diff --git a/patches/fake-hw-transport-node-hid/package.json b/patches/fake-hw-transport-node-hid/package.json
diff --git a/scripts/prepare.sh b/scripts/prepare.sh
@@ -13,12 +13,6 @@ node -r sucrase/register ./scripts/configure.ts
 ## Fix broken packages:
 yarn patch-package
 
-# The `usb` and 'node-hid' modules doesn't properly install on some boxes:
-mkdir -p node_modules/usb
-touch node_modules/usb/index.js
-mkdir -p node_modules/node-hid
-touch node_modules/node-hid/index.js
-
 # Fix Android dependency import statments: 
 # Old native Android dependencies use outdated package names for their imports
 # that were later renamed by Google.

diff --git a/src/__tests__/modals/__snapshots__/WalletListModal.test.tsx.snap b/src/__tests__/modals/__snapshots__/WalletListModal.test.tsx.snap
@@ -126,6 +126,7 @@ exports[`WalletListModal should render with loading props 1`] = `
         style={
           {
             "flexGrow": 1,
+            "flexShrink": 1,
           }
         }
       >
@@ -161,11 +162,26 @@ exports[`WalletListModal should render with loading props 1`] = `
           </Text>
         </View>
         <View
-          style={
+          marginRemProps={
             {
-              "flexDirection": "row",
+              "aroundRem": 0.5,
             }
           }
+          style={
+            [
+              {
+                "marginBottom": 11,
+                "marginLeft": 11,
+                "marginRight": 11,
+                "marginTop": 11,
+              },
+              {
+                "alignItems": "center",
+                "flexDirection": "row",
+                "justifyContent": "center",
+              },
+            ]
+          }
         >
           <View
             accessibilityState={
@@ -189,11 +205,6 @@ exports[`WalletListModal should render with loading props 1`] = `
               }
             }
             focusable={true}
-            marginRemProps={
-              {
-                "aroundRem": 0.5,
-              }
-            }
             onClick={[Function]}
             onResponderGrant={[Function]}
             onResponderMove={[Function]}
@@ -208,18 +219,13 @@ exports[`WalletListModal should render with loading props 1`] = `
             }
             style={
               [
-                {
-                  "marginBottom": 11,
-                  "marginLeft": 11,
-                  "marginRight": 11,
-                  "marginTop": 11,
-                },
                 {
                   "alignItems": "center",
                   "borderRadius": 2247,
                   "borderWidth": 1,
                   "flexDirection": "row",
                   "flexGrow": 1,
+                  "flexShrink": 1,
                   "paddingHorizontal": 22,
                   "paddingVertical": 17,
                 },
@@ -308,7 +314,7 @@ exports[`WalletListModal should render with loading props 1`] = `
               <View
                 size={
                   {
-                    "value": undefined,
+                    "value": 0,
                   }
                 }
                 style={
@@ -318,8 +324,8 @@ exports[`WalletListModal should render with loading props 1`] = `
                       "aspectRatio": 1,
                     },
                     {
-                      "opacity": undefined,
-                      "width": undefined,
+                      "opacity": 0,
+                      "width": 0,
                     },
                   ]
                 }
@@ -329,7 +335,7 @@ exports[`WalletListModal should render with loading props 1`] = `
                     {
                       "color": "#FFFFFF",
                       "fontFamily": "Material Icons",
-                      "fontSize": 22,
+                      "fontSize": 0,
                       "fontStyle": "normal",
                       "fontWeight": "normal",
                     }

diff --git a/src/__tests__/reducers/__snapshots__/RootReducer.test.ts.snap b/src/__tests__/reducers/__snapshots__/RootReducer.test.ts.snap
@@ -58,6 +58,9 @@ exports[`initialState 1`] = `
     "location": "denied",
   },
   "sortedWalletList": [],
+  "staking": {
+    "walletStakingMap": {},
+  },
   "ui": {
     "exchangeInfo": {
       "buy": {

diff --git a/src/__tests__/scenes/__snapshots__/CreateWalletSelectCryptoScene.test.tsx.snap b/src/__tests__/scenes/__snapshots__/CreateWalletSelectCryptoScene.test.tsx.snap
@@ -294,11 +294,27 @@ exports[`CreateWalletSelectCrypto should render with loading props 1`] = `
       </View>
     </View>
     <View
-      style={
+      marginRemProps={
         {
-          "flexDirection": "row",
+          "horizontalRem": 1,
+          "verticalRem": 0.5,
         }
       }
+      style={
+        [
+          {
+            "marginBottom": 11,
+            "marginLeft": 22,
+            "marginRight": 22,
+            "marginTop": 11,
+          },
+          {
+            "alignItems": "center",
+            "flexDirection": "row",
+            "justifyContent": "center",
+          },
+        ]
+      }
     >
       <View
         accessibilityState={
@@ -322,12 +338,6 @@ exports[`CreateWalletSelectCrypto should render with loading props 1`] = `
           }
         }
         focusable={true}
-        marginRemProps={
-          {
-            "horizontalRem": 1,
-            "verticalRem": 0.5,
-          }
-        }
         onClick={[Function]}
         onResponderGrant={[Function]}
         onResponderMove={[Function]}
@@ -342,18 +352,13 @@ exports[`CreateWalletSelectCrypto should render with loading props 1`] = `
         }
         style={
           [
-            {
-              "marginBottom": 11,
-              "marginLeft": 22,
-              "marginRight": 22,
-              "marginTop": 11,
-            },
             {
               "alignItems": "center",
               "borderRadius": 2247,
               "borderWidth": 1,
               "flexDirection": "row",
               "flexGrow": 1,
+              "flexShrink": 1,
               "paddingHorizontal": 22,
               "paddingVertical": 17,
             },
@@ -442,7 +447,7 @@ exports[`CreateWalletSelectCrypto should render with loading props 1`] = `
           <View
             size={
               {
-                "value": undefined,
+                "value": 0,
               }
             }
             style={
@@ -452,8 +457,8 @@ exports[`CreateWalletSelectCrypto should render with loading props 1`] = `
                   "aspectRatio": 1,
                 },
                 {
-                  "opacity": undefined,
-                  "width": undefined,
+                  "opacity": 0,
+                  "width": 0,
                 },
               ]
             }
@@ -463,7 +468,7 @@ exports[`CreateWalletSelectCrypto should render with loading props 1`] = `
                 {
                   "color": "#FFFFFF",
                   "fontFamily": "Material Icons",
-                  "fontSize": 22,
+                  "fontSize": 0,
                   "fontStyle": "normal",
                   "fontWeight": "normal",
                 }

diff --git a/src/actions/DeepLinkingActions.tsx b/src/actions/DeepLinkingActions.tsx
@@ -3,6 +3,7 @@ import * as React from 'react'
 import { sprintf } from 'sprintf-js'
 
 import { ButtonsModal } from '../components/modals/ButtonsModal'
+import { ConfirmContinueModal } from '../components/modals/ConfirmContinueModal'
 import { FundAccountModal } from '../components/modals/FundAccountModal'
 import { pickWallet } from '../components/modals/WalletListModal'
 import { Airship, showError, showToast, showToastSpinner } from '../components/services/AirshipInstance'
@@ -15,7 +16,7 @@ import { Dispatch, RootState, ThunkAction } from '../types/reduxTypes'
 import { NavigationBase } from '../types/routerTypes'
 import { EdgeAsset } from '../types/types'
 import { logEvent } from '../util/tracking'
-import { base58ToUuid } from '../util/utils'
+import { base58ToUuid, isEmail } from '../util/utils'
 import { activatePromotion } from './AccountReferralActions'
 import { checkAndShowLightBackupModal } from './BackupModalActions'
 import { logoutRequest } from './LoginActions'
@@ -235,9 +236,27 @@ async function handleLink(navigation: NavigationBase, dispatch: Dispatch, state:
           }
         }
       }
+
       const promise = parseWallets()
       await showToastSpinner(lstrings.scan_parsing_link, promise)
 
+      // Check if this is an email for Tron USDT and show warning for potential
+      // PIX send
+      if (isEmail(link.uri) && assets.find(asset => asset.pluginId === 'tron' && asset.tokenId === 'TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t') != null) {
+        const approved = await Airship.show<boolean>(bridge => (
+          <ConfirmContinueModal
+            bridge={bridge}
+            title={lstrings.warning_sending_pix_to_email_title}
+            body={lstrings.warning_sending_pix_to_email_body}
+            warning
+            isSkippable
+          />
+        ))
+        if (!approved) {
+          return
+        }
+      }
+
       // Check if the uri matches one of the wallet types that we could create. In such a case, link.uri
       // would be of the format 'dogecoin:QUE1U9n3kMYR...'
       const [linkCurrency] = link.uri.split(':')

diff --git a/src/actions/LoginActions.tsx b/src/actions/LoginActions.tsx
@@ -103,7 +103,7 @@ export function initializeAccount(navigation: NavigationBase, account: EdgeAccou
         }
 
         await createWalletsPromise
-        dispatch(logEvent('Signup_Complete'))
+        dispatch(logEvent('Signup_Complete', { numAccounts: getState().core.context.localUsers.length }))
       }
 
       rootNavigation.replace('edgeApp', {