From ef3b4e1848b2086ddf0e5fed0e91903a123bd63e Mon Sep 17 00:00:00 2001 From: Georges KABBOUCHI Date: Mon, 16 Aug 2021 19:15:56 +0300 Subject: [PATCH] wip --- components/swap/SwapCard.vue | 125 ++++++++++++++++++++++++++++++----- package.json | 1 + pages/mainnet/1inch.vue | 77 ++++++++++++++++++++- yarn.lock | 5 ++ 4 files changed, 188 insertions(+), 20 deletions(-) diff --git a/components/swap/SwapCard.vue b/components/swap/SwapCard.vue index 3a129f2..0ea6015 100644 --- a/components/swap/SwapCard.vue +++ b/components/swap/SwapCard.vue @@ -20,8 +20,8 @@ maxlength="79" spellcheck="false" :size=" - token0.amount.length > 0 - ? Math.min(token0.amount.length, 20) + String(token0.amount).length > 0 + ? Math.min(String(token0.amount).length, 24) : 2 " class="border-0 focus:outline-none focus:ring-0 text-lg font-semibold px-0 max-w-full" @@ -95,9 +95,11 @@
-
~ $ 9,321.69
+
~ {{ formatUsd(token0.amountUSD) }}
-
Balance: 85 {{ token0.symbol }}
+
+ Balance: {{ formatDecimal(token0.balance) }} {{ token0.symbol }} +
-
~ $ 9,321.69 (0.188%)
+
+ ~ {{ formatUsd(token1.amountUSD) }} + ({{ formatPercent(slippagePerc) }}) +
-
Balance: 85 {{ token1.symbol }}
+
+ Balance: {{ formatDecimal(token1.balance) }} {{ token1.symbol }} +
-
- 1 DAI = 0.0004272 ETH +
+ 1 {{ token1.symbol }} = + {{ formatDecimal(token0.amount / token1.amount, 7) }} + {{ token0.symbol }}
@@ -316,13 +335,19 @@
- Swap + Swap
diff --git a/yarn.lock b/yarn.lock index 87924f9..b5275a2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11642,6 +11642,11 @@ vuex@^3.6.2: resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.6.2.tgz#236bc086a870c3ae79946f107f16de59d5895e71" integrity sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw== +waait@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/waait/-/waait-1.0.5.tgz#6a3c7aaa88bd0a1a545e9d47890b9595bebf9aa7" + integrity sha512-wp+unA4CpqxvBUKHHv8D86fK4jWByHAWyhEXXVHfVUZfK+16ylpj7hjQ58Z8j9ntu8XNukRQT8Fi5qbyJ8rkyw== + walletlink@^2.1.6: version "2.1.6" resolved "https://registry.yarnpkg.com/walletlink/-/walletlink-2.1.6.tgz#4e48310af09bb0c940a156c26c1d0b1b9506ddb9"