Merge branch 'dev' into 'master'

wallet connect v2 See merge request Trustee/trusteewallet!349
trustee-wallet · Jul 19, 2023 · 721e0c7 · 721e0c7
2 parents 2c61a31 + c61c666
commit 721e0c7
Show file tree

Hide file tree

Showing 35 changed files with 2,129 additions and 715 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -134,7 +134,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "1.51.5"
+        versionName "1.51.6"
 
         missingDimensionStrategy 'react-native-camera', 'general'
         multiDexEnabled true

diff --git a/app/appstores/Stores/Send/SendActionsEnd.ts b/app/appstores/Stores/Send/SendActionsEnd.ts
@@ -1,5 +1,5 @@
 /**
- * @version 0.41
+ * @version 2.0
  */
 import analytics from '@react-native-firebase/analytics'
 
@@ -175,7 +175,7 @@ export namespace SendActionsEnd {
             }})
         } else if (uiType === 'WALLET_CONNECT') {
             Log.log('SendActionsEnd.endRedirect walletConnect will get ' + tx.transactionHash)
-            await walletConnectActions.approveRequestWalletConnect(walletConnectPayload, tx.transactionHash)
+            await walletConnectActions.approveRequest(walletConnectPayload, tx.transactionHash)
             NavStore.goNext('AccountTransactionScreen', {
                 txData: {
                     transactionHash: tx.transactionHash,
@@ -203,7 +203,7 @@ export namespace SendActionsEnd {
         const { bseOrderId } = bse
         const data = { extraData, ...params, orderHash: bseOrderId, status: 'CLOSE' }
         if (uiType === 'WALLET_CONNECT') {
-            await walletConnectActions.rejectRequestWalletConnect(walletConnectPayload)
+            await walletConnectActions.rejectRequest(walletConnectPayload)
         }
         if (typeof bseOrderId === 'undefined' || !bseOrderId) return
         return ApiV3.setExchangeStatus(data)

diff --git a/app/appstores/Stores/WalletConnect/WalletConnectService.js b/app/appstores/Stores/WalletConnect/WalletConnectService.js