Merge pull request #139 from VerusCoin/dev

v1.0.3
VerusCoin · Oct 27, 2023 · c657d83 · c657d83
2 parents 78e8aaf + 4f63c76
commit c657d83
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 47 deletions.
diff --git a/App.js b/App.js
@@ -15,7 +15,7 @@ import BigNumber from 'bignumber.js';
 import Colors from './src/globals/colors';
 import {GestureHandlerRootView} from 'react-native-gesture-handler';
 
-BigNumber.set({EXPONENTIAL_AT: 1000000});
+BigNumber.set({ EXPONENTIAL_AT: 1000000, ROUNDING_MODE: BigNumber.ROUND_FLOOR });
 
 const fontConfig = {
   default: {

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -4,7 +4,7 @@ import com.android.build.OutputFile
 
 def versionMajor = 1
 def versionMinor = 0
-def versionRevision = 2
+def versionRevision = 3
 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.2",
+  "APP_VERSION": "1.0.3",
   "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.2",
+  "APP_VERSION": "1.0.3",
   "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.2",
+  "APP_VERSION": "1.0.3",
   "ELECTRUM_PROTOCOL_CHANGE": 1.4,
 
   "KEY_DERIVATION_VERSION": 1,

diff --git a/ios/verusMobile.xcodeproj/project.pbxproj b/ios/verusMobile.xcodeproj/project.pbxproj
@@ -721,7 +721,7 @@
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/react-native-webview\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/rn-fetch-blob\"",
 				);
-				MARKETING_VERSION = 1.0.2;
+				MARKETING_VERSION = 1.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = org.reactjs.native.verusmobile;
 				PRODUCT_NAME = verusmobile;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -792,7 +792,7 @@
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/react-native-webview\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/rn-fetch-blob\"",
 				);
-				MARKETING_VERSION = 1.0.2;
+				MARKETING_VERSION = 1.0.3;
 				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.2",
+  "version": "1.0.3",
   "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
@@ -209,8 +209,6 @@ const ConvertOrCrossChainSendForm = ({ setLoading, setModalHeight, updateSendFor
             return !x.mapping && x.prelaunch
           } else return !x.mapping && !x.prelaunch
         }).map((path, index) => {
-          const priceFixed = Number(path.price.toFixed(2))
-
           return {
             title: path.destination.fullyqualifiedname,
             logoid: path.destination.currencyid,
@@ -236,13 +234,7 @@ const ConvertOrCrossChainSendForm = ({ setLoading, setModalHeight, updateSendFor
                 : '',
               [SEND_MODAL_PRICE_ESTIMATE]: { price: path.price, name: path.destination.fullyqualifiedname }
             },
-            right: `${
-              priceFixed === 0
-                ? '<0.01'
-                : priceFixed === path.price
-                ? priceFixed
-                : `~${priceFixed}`
-            }`,
+            right: `${Number(BigNumber(1).dividedBy(BigNumber(path.price)).toFixed(8))}`,
             keywords: [path.destination.currencyid, path.destination.fullyqualifiedname]
           };
         });
@@ -251,7 +243,6 @@ const ConvertOrCrossChainSendForm = ({ setLoading, setModalHeight, updateSendFor
         return flatPaths.filter(x => {
           return !x.mapping
         }).map((path, index) => {
-          const priceFixed = Number(path.price.toFixed(2))
           const addr = path.ethdest ? path.destination.address : null;
 
           const name = path.ethdest
@@ -286,13 +277,7 @@ const ConvertOrCrossChainSendForm = ({ setLoading, setModalHeight, updateSendFor
                 : '',
               [SEND_MODAL_PRICE_ESTIMATE]: { price: path.price, name: name }
             },
-            right: `${
-              priceFixed === 0
-                ? '<0.01'
-                : priceFixed === path.price
-                ? priceFixed
-                : `~${priceFixed}`
-            }`,
+            right: `${Number(BigNumber(1).dividedBy(BigNumber(path.price)).toFixed(8))}`,
             keywords: path.ethdest
               ? [path.destination.address, path.destination.symbol, path.destination.name]
               : [path.destination.currencyid, path.destination.fullyqualifiedname]
@@ -317,8 +302,6 @@ const ConvertOrCrossChainSendForm = ({ setLoading, setModalHeight, updateSendFor
             );
           } else return x.via != null;
         }).map((path, index) => {
-          const priceFixed = Number(path.price.toFixed(2))
-
           return {
             title: path.via.fullyqualifiedname,
             logoid: path.via.currencyid,
@@ -338,13 +321,7 @@ const ConvertOrCrossChainSendForm = ({ setLoading, setModalHeight, updateSendFor
                 : '',
               [SEND_MODAL_PRICE_ESTIMATE]: { price: path.price, name: path.destination.fullyqualifiedname }
             },
-            right: `${
-              priceFixed === 0
-                ? '<0.01'
-                : priceFixed === path.price
-                ? priceFixed
-                : `~${priceFixed}`
-            }`,
+            right: `${Number(BigNumber(1).dividedBy(BigNumber(path.price)).toFixed(8))}`,
             keywords: [path.via.currencyid, path.via.fullyqualifiedname]
           };
         })
@@ -392,13 +369,7 @@ const ConvertOrCrossChainSendForm = ({ setLoading, setModalHeight, updateSendFor
                 : '',
               [SEND_MODAL_PRICE_ESTIMATE]: { price: path.price, name: destname }
             },
-            right: `${
-              priceFixed === 0
-                ? '<0.01'
-                : priceFixed === path.price
-                ? priceFixed
-                : `~${priceFixed}`
-            }`,
+            right: `${Number(BigNumber(1).dividedBy(BigNumber(path.price)).toFixed(8))}`,
             keywords: [path.via.currencyid, path.via.fullyqualifiedname]
           };
         })
@@ -1026,7 +997,7 @@ const ConvertOrCrossChainSendForm = ({ setLoading, setModalHeight, updateSendFor
                         right={() =>
                           selectedField !== SEND_MODAL_EXPORTTO_FIELD && selectedField !== SEND_MODAL_MAPPING_FIELD ? (
                             <Text style={{...Styles.listItemTableCell, fontWeight: 'bold'}}>
-                              {sendModal.coinObj.display_ticker + ' price estimate'}
+                              {'est. price in ' + sendModal.coinObj.display_ticker}
                             </Text>
                           ) : null
                         }

diff --git a/src/utils/api/channels/vrpc/requests/getCurrencyConversionPaths.js b/src/utils/api/channels/vrpc/requests/getCurrencyConversionPaths.js
@@ -224,11 +224,7 @@ export const getCurrencyConversionPaths = async (systemId, src, ethNetwork) => {
       : null;
 
     for (const destinationid in paths) {
-      paths[destinationid] = paths[destinationid].filter(x => {
-        const offSystem = (x.destination.systemid != systemId) || (x.via != null && x.via.systemid != systemId);
-
-        return !(offSystem && x.exportto == null);
-      }).map(x => {
+      paths[destinationid] = paths[destinationid].map(x => {
         if (prelaunchCurrencyIds != null && prelaunchCurrencyIds.includes(x.destination.currencyid)) {
           return {
             ...x,