aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2018-10-21 12:52:41 +0800
committerkumavis <aaron@kumavis.me>2018-10-21 12:52:41 +0800
commitfda101912bbb99f7f1adbac9856d34105390c408 (patch)
tree7bd60c5cdb13d51a4607b538d96e71ab9f9ff08d /ui/app
parent3b46478024f87bd237b507e5fb18068febf02de9 (diff)
downloadtangerine-wallet-browser-fda101912bbb99f7f1adbac9856d34105390c408.tar
tangerine-wallet-browser-fda101912bbb99f7f1adbac9856d34105390c408.tar.gz
tangerine-wallet-browser-fda101912bbb99f7f1adbac9856d34105390c408.tar.bz2
tangerine-wallet-browser-fda101912bbb99f7f1adbac9856d34105390c408.tar.lz
tangerine-wallet-browser-fda101912bbb99f7f1adbac9856d34105390c408.tar.xz
tangerine-wallet-browser-fda101912bbb99f7f1adbac9856d34105390c408.tar.zst
tangerine-wallet-browser-fda101912bbb99f7f1adbac9856d34105390c408.zip
ui - use variable to clarify result of emptiness check
Diffstat (limited to 'ui/app')
-rw-r--r--ui/app/components/send/send.utils.js4
-rw-r--r--ui/app/helpers/transactions.util.js4
2 files changed, 6 insertions, 2 deletions
diff --git a/ui/app/components/send/send.utils.js b/ui/app/components/send/send.utils.js
index af7b3823f..eb1667c63 100644
--- a/ui/app/components/send/send.utils.js
+++ b/ui/app/components/send/send.utils.js
@@ -215,7 +215,9 @@ async function estimateGas ({
// if recipient has no code, gas is 21k max:
if (!selectedToken && !data) {
const code = Boolean(to) && await global.eth.getCode(to)
- if (!code || code === '0x' || code === '0x0') { // Infura will return '0x', and ganache-core v2.2.1 will return '0x0'
+ // Geth will return '0x', and ganache-core v2.2.1 will return '0x0'
+ const codeIsEmpty = !code || code === '0x' || code === '0x0'
+ if (codeIsEmpty) {
return SIMPLE_GAS_COST
}
} else if (selectedToken && !to) {
diff --git a/ui/app/helpers/transactions.util.js b/ui/app/helpers/transactions.util.js
index 9be77e14f..cfe2c4229 100644
--- a/ui/app/helpers/transactions.util.js
+++ b/ui/app/helpers/transactions.util.js
@@ -114,7 +114,9 @@ export function getLatestSubmittedTxWithNonce (transactions = [], nonce = '0x0')
export async function isSmartContractAddress (address) {
const code = await global.eth.getCode(address)
- return code && code !== '0x' && code !== '0x0' // Infura will return '0x', and ganache-core v2.2.1 will return '0x0'
+ // Geth will return '0x', and ganache-core v2.2.1 will return '0x0'
+ const codeIsEmpty = !code || code === '0x' || code === '0x0'
+ return !codeIsEmpty
}
export function sumHexes (...args) {