aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorDan Miller <danjm.com@gmail.com>2018-10-11 07:06:14 +0800
committerDan Miller <danjm.com@gmail.com>2018-12-04 11:36:05 +0800
commit6dd1028c71a343b2a60768bf988ba0ed33c84fb3 (patch)
treee276ac38882d2af3d0f7836ed73197efc5a34d3f /ui
parent6f8e2b1ad94fd70c3be976ef88179dc00ceebb45 (diff)
downloadtangerine-wallet-browser-6dd1028c71a343b2a60768bf988ba0ed33c84fb3.tar
tangerine-wallet-browser-6dd1028c71a343b2a60768bf988ba0ed33c84fb3.tar.gz
tangerine-wallet-browser-6dd1028c71a343b2a60768bf988ba0ed33c84fb3.tar.bz2
tangerine-wallet-browser-6dd1028c71a343b2a60768bf988ba0ed33c84fb3.tar.lz
tangerine-wallet-browser-6dd1028c71a343b2a60768bf988ba0ed33c84fb3.tar.xz
tangerine-wallet-browser-6dd1028c71a343b2a60768bf988ba0ed33c84fb3.tar.zst
tangerine-wallet-browser-6dd1028c71a343b2a60768bf988ba0ed33c84fb3.zip
Lint and unit test fixes.
Diffstat (limited to 'ui')
-rw-r--r--ui/app/components/gas-customization/gas-modal-page-container/tests/gas-modal-page-container-component.test.js6
-rw-r--r--ui/app/components/send/tests/send-container.test.js2
-rw-r--r--ui/app/helpers/conversions.util.js1
3 files changed, 4 insertions, 5 deletions
diff --git a/ui/app/components/gas-customization/gas-modal-page-container/tests/gas-modal-page-container-component.test.js b/ui/app/components/gas-customization/gas-modal-page-container/tests/gas-modal-page-container-component.test.js
index 714f01538..bb1a28136 100644
--- a/ui/app/components/gas-customization/gas-modal-page-container/tests/gas-modal-page-container-component.test.js
+++ b/ui/app/components/gas-customization/gas-modal-page-container/tests/gas-modal-page-container-component.test.js
@@ -229,9 +229,9 @@ describe('GasModalPageContainer Component', function () {
assert(renderedInfoRows.at(2).hasClass(`${baseClassName}__total-info`))
assert(renderedInfoRows.at(3).hasClass(`${baseClassName}__fiat-total-info`))
- assert.equal(renderedInfoRows.at(0).text(), 'Send Amount mockSendAmount')
- assert.equal(renderedInfoRows.at(1).text(), 'Transaction Fee mockTransactionFee')
- assert.equal(renderedInfoRows.at(2).text(), 'New Total mockNewTotalEth')
+ assert.equal(renderedInfoRows.at(0).text(), 'sendAmount mockSendAmount')
+ assert.equal(renderedInfoRows.at(1).text(), 'transactionFee mockTransactionFee')
+ assert.equal(renderedInfoRows.at(2).text(), 'newTotal mockNewTotalEth')
assert.equal(renderedInfoRows.at(3).text(), 'mockNewTotalFiat')
})
})
diff --git a/ui/app/components/send/tests/send-container.test.js b/ui/app/components/send/tests/send-container.test.js
index d8fe85d22..19b6563e6 100644
--- a/ui/app/components/send/tests/send-container.test.js
+++ b/ui/app/components/send/tests/send-container.test.js
@@ -125,7 +125,7 @@ describe('send container', () => {
assert(dispatchSpy.calledOnce)
assert.deepEqual(
actionSpies.updateGasData.getCall(0).args[0],
- { gasPrice, selectedAddress, selectedToken, recentBlocks, blockGasLimit, to, value, }
+ { gasPrice, selectedAddress, selectedToken, recentBlocks, blockGasLimit, to, value, data }
)
})
})
diff --git a/ui/app/helpers/conversions.util.js b/ui/app/helpers/conversions.util.js
index d8e0d87fe..065d67e8e 100644
--- a/ui/app/helpers/conversions.util.js
+++ b/ui/app/helpers/conversions.util.js
@@ -1,5 +1,4 @@
import ethUtil from 'ethereumjs-util'
-import { conversionUtil } from '../conversion-util'
import { ETH, GWEI, WEI } from '../constants/common'
import { conversionUtil, addCurrencies } from '../conversion-util'