diff options
| author | Kevin Serrano <kevin.serrano@consensys.net> | 2017-10-27 07:22:08 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevin.serrano@consensys.net> | 2017-10-27 07:22:08 +0800 |
| commit | 1e9c0a9db2d58e61361bff7430d3a74006ef131c (patch) | |
| tree | 1d1f09bfe2e1985c42d5a117e8e63d19c71a360b /ui/app/components/shapeshift-form.js | |
| parent | a387def701303e56f721fdc7c716e72641bfaf8f (diff) | |
| parent | 19afb638194a11367250153a710d77011665132a (diff) | |
| download | tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.tar tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.tar.gz tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.tar.bz2 tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.tar.lz tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.tar.xz tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.tar.zst tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.zip | |
Resolve merge conflicts
Diffstat (limited to 'ui/app/components/shapeshift-form.js')
| -rw-r--r-- | ui/app/components/shapeshift-form.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/app/components/shapeshift-form.js b/ui/app/components/shapeshift-form.js index 901a4a956..c5993e3d3 100644 --- a/ui/app/components/shapeshift-form.js +++ b/ui/app/components/shapeshift-form.js @@ -130,9 +130,9 @@ ShapeshiftForm.prototype.renderMain = function () { alignItems: 'flex-start', }, }, [ - this.props.warning - ? this.props.warning - && h('span.error.flex-center', { + this.props.warning ? + this.props.warning && + h('span.error.flex-center', { style: { textAlign: 'center', width: '229px', |