From 3af8b618c5e1ea8d747e00fa22f7b44ce09ea7db Mon Sep 17 00:00:00 2001 From: michaeltout Date: Fri, 10 Nov 2023 09:14:28 +0100 Subject: [PATCH 1/3] Fix gas price calculations for ERC20 tokens --- src/utils/api/channels/erc20/requests/send.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/api/channels/erc20/requests/send.js b/src/utils/api/channels/erc20/requests/send.js index 878a10e6..c1772ad5 100644 --- a/src/utils/api/channels/erc20/requests/send.js +++ b/src/utils/api/channels/erc20/requests/send.js @@ -32,7 +32,7 @@ export const send = async (coinObj, activeUser, address, amount, passthrough) => const response = await signableContract.transfer( address, amountBn, - { gasLimit: gasLimit.toNumber(), gasPrice: ethers.utils.parseUnits(gasPrice.toString(), 'gwei') } + { gasLimit: gasLimit.toNumber(), gasPrice: gasPrice } ); return { From 82d5b71668f1a4ba21ca7e7596bb8b0f9e950a30 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Fri, 10 Nov 2023 00:35:46 -0800 Subject: [PATCH 2/3] update version --- android/app/build.gradle | 2 +- env/main.android.json | 2 +- env/main.ios.json | 2 +- ios/assets/env/main.json | 2 +- ios/verusMobile.xcodeproj/project.pbxproj | 4 ++-- package.json | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 904420eb..a65f7837 100755 --- 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 = 5 +def versionRevision = 6 def versionBuild = 0 def keystorePropertiesFile = rootProject.file("keystore.properties"); diff --git a/env/main.android.json b/env/main.android.json index acf26316..89e8e700 100644 --- a/env/main.android.json +++ b/env/main.android.json @@ -1,5 +1,5 @@ { - "APP_VERSION": "1.0.5", + "APP_VERSION": "1.0.6", "ELECTRUM_PROTOCOL_CHANGE": 1.4, "KEY_DERIVATION_VERSION": 1, diff --git a/env/main.ios.json b/env/main.ios.json index bc72d518..2d5505ec 100644 --- a/env/main.ios.json +++ b/env/main.ios.json @@ -1,5 +1,5 @@ { - "APP_VERSION": "1.0.5", + "APP_VERSION": "1.0.6", "ELECTRUM_PROTOCOL_CHANGE": 1.4, "KEY_DERIVATION_VERSION": 1, diff --git a/ios/assets/env/main.json b/ios/assets/env/main.json index bc72d518..2d5505ec 100644 --- a/ios/assets/env/main.json +++ b/ios/assets/env/main.json @@ -1,5 +1,5 @@ { - "APP_VERSION": "1.0.5", + "APP_VERSION": "1.0.6", "ELECTRUM_PROTOCOL_CHANGE": 1.4, "KEY_DERIVATION_VERSION": 1, diff --git a/ios/verusMobile.xcodeproj/project.pbxproj b/ios/verusMobile.xcodeproj/project.pbxproj index 1b90bc5e..432c67ea 100644 --- 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.5; + MARKETING_VERSION = 1.0.6; 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.5; + MARKETING_VERSION = 1.0.6; PRODUCT_BUNDLE_IDENTIFIER = org.reactjs.native.verusmobile; PRODUCT_NAME = verusmobile; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/package.json b/package.json index 310f00cc..c795d77f 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "verusmobile", - "version": "1.0.5", + "version": "1.0.6", "private": true, "scripts": { "postinstall": "./node_modules/.bin/rn-nodeify --hack --install --yarn && npx jetify", From ec3a0feb47b10d8ab32cb6430329f94b6cfb5053 Mon Sep 17 00:00:00 2001 From: michaeltout Date: Fri, 10 Nov 2023 10:33:27 +0100 Subject: [PATCH 3/3] Format fee display correctly in ETH tx preflight --- src/utils/api/channels/eth/requests/preflight.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/api/channels/eth/requests/preflight.js b/src/utils/api/channels/eth/requests/preflight.js index dcc09b4e..3f64d474 100644 --- a/src/utils/api/channels/eth/requests/preflight.js +++ b/src/utils/api/channels/eth/requests/preflight.js @@ -35,7 +35,7 @@ export const txPreflight = async (coinObj, activeUser, address, amount, params) if (adjustedValue.lt(ethers.BigNumber.from(0))) throw new Error( - `Insufficient funds, cannot cover fee costs of at least ${maxFee} ETH.` + `Insufficient funds, cannot cover fee costs of at least ${ethers.utils.formatUnits(maxFee)} ETH.` ); else return await txPreflight(