Merge pull request #199 from VerusCoin/dev

v1.0.24
VerusCoin · Dec 17, 2024 · c366d3b · c366d3b
2 parents 2b330ea + 90d217d
commit c366d3b
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 41 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -5,7 +5,7 @@ import com.android.build.OutputFile
 
 def versionMajor = 1
 def versionMinor = 0
-def versionRevision = 23
+def versionRevision = 24
 def versionBuild = 0
 
 def keystorePropertiesFile = rootProject.file("keystore.properties");

diff --git a/env/main.android.json b/env/main.android.json
@@ -1,5 +1,5 @@
 {
-  "APP_VERSION": "1.0.23",
+  "APP_VERSION": "1.0.24",
   "ELECTRUM_PROTOCOL_CHANGE": 1.4,
 
   "KEY_DERIVATION_VERSION": 1,

diff --git a/env/main.ios.json b/env/main.ios.json
@@ -1,5 +1,5 @@
 {
-  "APP_VERSION": "1.0.23",
+  "APP_VERSION": "1.0.24",
   "ELECTRUM_PROTOCOL_CHANGE": 1.4,
 
   "KEY_DERIVATION_VERSION": 1,

diff --git a/ios/assets/env/main.json b/ios/assets/env/main.json
@@ -1,5 +1,5 @@
 {
-  "APP_VERSION": "1.0.23",
+  "APP_VERSION": "1.0.24",
   "ELECTRUM_PROTOCOL_CHANGE": 1.4,
 
   "KEY_DERIVATION_VERSION": 1,

diff --git a/ios/verusMobile.xcodeproj/project.pbxproj b/ios/verusMobile.xcodeproj/project.pbxproj
@@ -745,7 +745,7 @@
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/react-native-webview\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/rn-fetch-blob\"",
 				);
-				MARKETING_VERSION = 1.0.23;
+				MARKETING_VERSION = 1.0.24;
 				PRODUCT_BUNDLE_IDENTIFIER = org.reactjs.native.verusmobile;
 				PRODUCT_NAME = verusmobile;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -817,7 +817,7 @@
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/react-native-webview\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/rn-fetch-blob\"",
 				);
-				MARKETING_VERSION = 1.0.23;
+				MARKETING_VERSION = 1.0.24;
 				PRODUCT_BUNDLE_IDENTIFIER = org.reactjs.native.verusmobile;
 				PRODUCT_NAME = verusmobile;
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "verusmobile",
-  "version": "1.0.23",
+  "version": "1.0.24",
   "private": true,
   "scripts": {
     "postinstall": "./node_modules/.bin/rn-nodeify --hack --install --yarn && npx jetify",

diff --git a/...dModal/ConvertOrCrossChainSend/ConvertOrCrossChainSendForm/ConvertOrCrossChainSendForm.js b/...dModal/ConvertOrCrossChainSend/ConvertOrCrossChainSendForm/ConvertOrCrossChainSendForm.js
@@ -577,33 +577,35 @@ const ConvertOrCrossChainSendForm = ({ setLoading, setModalHeight, updateSendFor
         }
       }
 
-      for (const coinId in activeAccount.keys) {
-        if (activeAccount.keys[coinId] && (activeAccount.keys[coinId][ETH] || activeAccount.keys[coinId][ERC20])) {
-          const ethAddresses = activeAccount.keys[coinId][ETH] ? 
-            activeAccount.keys[coinId][ETH].addresses : activeAccount.keys[coinId][ERC20].addresses;
-
-          if (ethAddresses && ethAddresses.length > 0) {
-            const addr = ethAddresses[0];
-            const addrTitle = addr.substring(0, 8) + '...' + addr.substring(addr.length - 8);
-
-            if (!seen.has(addr)) {
-              seen.add(addr);
-              addresses.push({
-                title: addrTitle,
-                logoid: coinsList.ETH.id,
-                key: addr,
-                description: addr,
-                values: {
-                  [SEND_MODAL_TO_ADDRESS_FIELD]: addr
-                },
-                right: "",
-                keywords: [
-                  addr
-                ]
-              })
+      if (!sendModal.data[SEND_MODAL_IS_PRECONVERT]) {
+        for (const coinId in activeAccount.keys) {
+          if (activeAccount.keys[coinId] && (activeAccount.keys[coinId][ETH] || activeAccount.keys[coinId][ERC20])) {
+            const ethAddresses = activeAccount.keys[coinId][ETH] ? 
+              activeAccount.keys[coinId][ETH].addresses : activeAccount.keys[coinId][ERC20].addresses;
+
+            if (ethAddresses && ethAddresses.length > 0) {
+              const addr = ethAddresses[0];
+              const addrTitle = addr.substring(0, 8) + '...' + addr.substring(addr.length - 8);
+
+              if (!seen.has(addr)) {
+                seen.add(addr);
+                addresses.push({
+                  title: addrTitle,
+                  logoid: coinsList.ETH.id,
+                  key: addr,
+                  description: addr,
+                  values: {
+                    [SEND_MODAL_TO_ADDRESS_FIELD]: addr
+                  },
+                  right: "",
+                  keywords: [
+                    addr
+                  ]
+                })
+              }
+
+              break;
             }
-
-            break;
           }
         }
       }
@@ -667,9 +669,11 @@ const ConvertOrCrossChainSendForm = ({ setLoading, setModalHeight, updateSendFor
         case SEND_MODAL_MAPPING_FIELD:
           newSuggestionsBase = await processMappingSuggestionPaths(flatPaths, sendModal.coinObj);
           setSuggestionBase(newSuggestionsBase);
+          break;
         case SEND_MODAL_TO_ADDRESS_FIELD:
           newSuggestionsBase = processSelfSuggestionPaths();
           setSuggestionBase(newSuggestionsBase);
+          break;
         default:
           setSuggestionBase(newSuggestionsBase);
           break;
@@ -1037,13 +1041,17 @@ const ConvertOrCrossChainSendForm = ({ setLoading, setModalHeight, updateSendFor
     fillAmount(BigNumber(spendableBalance));
   };
 
-  const setAddressSelf = () => {
-    const addr = addresses.results[0]
-
-    updateSendFormData(
-      SEND_MODAL_TO_ADDRESS_FIELD,
-      addr
-    );
+  const handleSelfPressed = () => {
+    if (allSubWallets[coinsList.VRSC.id]) {
+      handleFieldFocus(SEND_MODAL_TO_ADDRESS_FIELD);
+    } else {
+      const addr = addresses.results[0]
+
+      updateSendFormData(
+        SEND_MODAL_TO_ADDRESS_FIELD,
+        addr
+      );
+    }
   };
 
   return localBalances == null ? (<AnimatedActivityIndicatorBox />) : (
@@ -1190,7 +1198,7 @@ const ConvertOrCrossChainSendForm = ({ setLoading, setModalHeight, updateSendFor
                 onRecipientAddressChange={text =>
                   updateSendFormData(SEND_MODAL_TO_ADDRESS_FIELD, text)
                 }
-                onSelfPress={() => handleFieldFocus(SEND_MODAL_TO_ADDRESS_FIELD)}
+                onSelfPress={() => handleSelfPressed()}
                 amountValue={sendModal.data[SEND_MODAL_AMOUNT_FIELD]}
                 onAmountChange={text =>
                   updateSendFormData(SEND_MODAL_AMOUNT_FIELD, text)
@@ -1200,6 +1208,7 @@ const ConvertOrCrossChainSendForm = ({ setLoading, setModalHeight, updateSendFor
                 networkName={networkName}
                 estimatedResultSubtitle={
                   isConversion &&
+                  !isExport &&
                   sendModal.data[SEND_MODAL_PRICE_ESTIMATE] != null &&
                   processedAmount != null
                     ? `≈ ${Number(