aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components
diff options
context:
space:
mode:
authorDan J Miller <danjm.com@gmail.com>2018-06-30 02:36:29 +0800
committerGitHub <noreply@github.com>2018-06-30 02:36:29 +0800
commitf6238b2d39d3899a41ad4f774d7d4922fecf885e (patch)
tree660373f52579bfc4e0628eb8838985adef0f909c /ui/app/components
parenta1fb1b8d3e016a3734fb7453e31e7d79c6637bbb (diff)
parent464b97890dd35acb7428899aeb214a0e506d4507 (diff)
downloadtangerine-wallet-browser-f6238b2d39d3899a41ad4f774d7d4922fecf885e.tar
tangerine-wallet-browser-f6238b2d39d3899a41ad4f774d7d4922fecf885e.tar.gz
tangerine-wallet-browser-f6238b2d39d3899a41ad4f774d7d4922fecf885e.tar.bz2
tangerine-wallet-browser-f6238b2d39d3899a41ad4f774d7d4922fecf885e.tar.lz
tangerine-wallet-browser-f6238b2d39d3899a41ad4f774d7d4922fecf885e.tar.xz
tangerine-wallet-browser-f6238b2d39d3899a41ad4f774d7d4922fecf885e.tar.zst
tangerine-wallet-browser-f6238b2d39d3899a41ad4f774d7d4922fecf885e.zip
Merge pull request #4647 from MetaMask/fix-overflow-currency-display
Fix issues with scrollbar in currency display.
Diffstat (limited to 'ui/app/components')
-rw-r--r--ui/app/components/send/currency-display.js4
-rw-r--r--ui/app/components/send_/send-content/send-amount-row/send-amount-row.component.js1
2 files changed, 4 insertions, 1 deletions
diff --git a/ui/app/components/send/currency-display.js b/ui/app/components/send/currency-display.js
index 9c8ce0044..5e2c5fdf6 100644
--- a/ui/app/components/send/currency-display.js
+++ b/ui/app/components/send/currency-display.js
@@ -118,6 +118,7 @@ CurrencyDisplay.prototype.render = function () {
readOnly = false,
inError = false,
onBlur,
+ step,
} = this.props
const { valueToRender } = this.state
@@ -149,9 +150,10 @@ CurrencyDisplay.prototype.render = function () {
} : {}),
ref: input => { this.currencyInput = input },
style: {
- minWidth: this.getInputWidth(valueToRender, readOnly),
+ width: this.getInputWidth(valueToRender, readOnly),
},
min: 0,
+ step,
}),
h('span.currency-display__currency-symbol', primaryCurrency),
diff --git a/ui/app/components/send_/send-content/send-amount-row/send-amount-row.component.js b/ui/app/components/send_/send-content/send-amount-row/send-amount-row.component.js
index 8da36d3b7..196538c11 100644
--- a/ui/app/components/send_/send-content/send-amount-row/send-amount-row.component.js
+++ b/ui/app/components/send_/send-content/send-amount-row/send-amount-row.component.js
@@ -95,6 +95,7 @@ export default class SendAmountRow extends Component {
primaryCurrency={primaryCurrency || 'ETH'}
selectedToken={selectedToken}
value={amount}
+ step="any"
/>
</SendRowWrapper>
)