Merge pull request #258 from onyb/fix-swap-bugs

Fix swap bugs for Milestone 1.0.32
brave · Jul 15, 2021 · 77e3bf3 · 77e3bf3
2 parents a0163fe + 9746b34
commit 77e3bf3
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 14 deletions.
diff --git a/ui/app/components/ui/unit-input/unit-input.component.js b/ui/app/components/ui/unit-input/unit-input.component.js
@@ -58,8 +58,8 @@ export default class UnitInput extends PureComponent {
   getInputWidth (value) {
     const valueString = String(value)
     const valueLength = valueString.length || 1
-    const decimalPointDeficit = valueString.match(/\./) ? -0.5 : 0
-    return (valueLength + decimalPointDeficit + 0.5) + 'ch'
+    const decimalPointDeficit = valueString.match(/\./) ? -0.56 : 0
+    return (valueLength + decimalPointDeficit + 0.56) + 'ch'
   }
 
   render () {

diff --git a/ui/app/css/itcss/components/swap.scss b/ui/app/css/itcss/components/swap.scss
@@ -978,6 +978,11 @@
     height: 0;
   }
 
+  .btn-secondary[disabled] {
+    opacity: 0.75;
+    color: #b0d7f2 !important;
+  }
+
   &__gas-fee-display {
     width: 100%;
     position: relative;

diff --git a/ui/app/pages/swap/swap-footer/swap-footer.component.js b/ui/app/pages/swap/swap-footer/swap-footer.component.js
@@ -171,14 +171,16 @@ export default class SwapFooter extends Component {
     const { t } = this.context
 
     return (
-      <PageContainerFooter
-        onSubmit={(e) => this.onSubmit(e)}
-        submitText={t('reviewSwap')}
-        disabled={this.reviewSwapButtonShouldBeDisabled()}
-        hideCancel
-      >
-        {this.renderFooterExtra()}
-      </PageContainerFooter>
+      <div className="swap-v2">
+        <PageContainerFooter
+          onSubmit={(e) => this.onSubmit(e)}
+          submitText={t('reviewSwap')}
+          disabled={this.reviewSwapButtonShouldBeDisabled()}
+          hideCancel
+        >
+          {this.renderFooterExtra()}
+        </PageContainerFooter>
+      </div>
     )
   }
 }
diff --git a/ui/app/pages/swap/swap.config.js b/ui/app/pages/swap/swap.config.js
@@ -10,15 +10,15 @@ export default function getConfig (network) {
     case ROPSTEN:
       return {
         swapAPIURL: 'https://ropsten.api.0x.org/swap/v1',
-        buyTokenPercentageFee: 0.00875,
+        buyTokenPercentageFee: '0.00875',
         feeRecipient: '0x7B4933b164092b480A7c1b9bbCdBc8Ecd5201B96',
       }
 
     case MAINNET:
     default:
       return {
         swapAPIURL: 'https://api.0x.org/swap/v1',
-        buyTokenPercentageFee: 0.00875,
+        buyTokenPercentageFee: '0.00875',
         feeRecipient: '0xbd9420A98a7Bd6B89765e5715e169481602D9c3d',
       }
   }

diff --git a/ui/app/store/actions.js b/ui/app/store/actions.js
@@ -220,13 +220,20 @@ export function fetchSwapQuote (fromAsset, toAsset, amount, gasPrice, slippage,
     const network = getNetworkIdentifier(state)
     const selectedAddress = getSelectedAddress(state)
 
-    const gasPriceDecimal = gasPrice && parseInt(gasPrice, 16).toString()
+    const gasPriceDecimal = gasPrice && ethers.BigNumber.from(
+      ethUtil.addHexPrefix(gasPrice),
+    ).toString()
+
+    const amountDecimal = ethers.BigNumber.from(
+      ethUtil.addHexPrefix(amount),
+    ).toString()
 
     const conn = exports.getBackgroundConnection()
+
     const quote = await conn.quote(
       fromAsset,
       toAsset,
-      parseInt(amount, 16),
+      amountDecimal,
       gasPriceDecimal,
       slippage,
       selectedAddress,