feat(wdgld): fixing issue with wdgld trading wallet not showing in wa…

…llet dropdown and adding wdgld to swap
inteI-cloud · Nov 20, 2020 · 77f7dfa · 77f7dfa
1 parent aed5a3f
commit 77f7dfa
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/config/mocks/wallet-options-v4.json b/config/mocks/wallet-options-v4.json
@@ -332,7 +332,7 @@
           "coinCode": "WDGLD",
           "coinTicker": "WDGLD",
           "colorCode": "wdgld",
-          "contractAddress": "0xdac17f958d2ee523a2206206994597c13d831ec7",
+          "contractAddress": "0x123151402076fc819B7564510989e475c9cD93CA",
           "displayName": "Wrapped-DGLD",
           "hasLockboxSupport": false,
           "showNewTagSidenav": true,

diff --git a/packages/blockchain-wallet-v4-frontend/src/components/Balances/wallet/selectors.ts b/packages/blockchain-wallet-v4-frontend/src/components/Balances/wallet/selectors.ts
@@ -177,9 +177,18 @@ export const getUsdtBalance = createDeepEqualSelector(
 )
 
 export const getWdgldBalance = createDeepEqualSelector(
-  [getErc20NonCustodialBalance('wdgld')],
-  balanceR => {
-    return Remote.of(new BigNumber(balanceR.getOrElse(0)))
+  [
+    getErc20NonCustodialBalance('wdgld'),
+    selectors.components.simpleBuy.getSBBalances
+  ],
+  (balanceR, sbBalancesR: RemoteDataType<string, SBBalancesType>) => {
+    const sbWdgldBalance = sbBalancesR.getOrElse({ WDGLD: DEFAULT_SB_BALANCE })
+      .WDGLD
+    const sbBalance = sbWdgldBalance ? sbWdgldBalance.available : '0'
+
+    return Remote.of(
+      new BigNumber(balanceR.getOrElse(0)).plus(new BigNumber(sbBalance))
+    )
   }
 )
 

diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/Swap/CoinSelection/selectors.ts b/packages/blockchain-wallet-v4-frontend/src/modals/Swap/CoinSelection/selectors.ts
@@ -15,6 +15,7 @@ export const coinOrder: Array<SwapCoinType> = [
   'XLM',
   'PAX',
   'USDT',
+  'WDGLD',
   'ALGO'
 ]
 

diff --git a/packages/blockchain-wallet-v4/src/exchange/currencies/WDGLD.ts b/packages/blockchain-wallet-v4/src/exchange/currencies/WDGLD.ts
@@ -11,9 +11,9 @@ export default {
       currency: 'WDGLD'
     },
     WDGLD: {
-      rate: '1000000',
+      rate: '100000000',
       symbol: 'WDGLD',
-      decimal_digits: 6,
+      decimal_digits: 8,
       currency: 'WDGLD'
     }
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,7 @@ export const coinOrder: Array<SwapCoinType> = [ @@
       'XLM',
       'PAX',
       'USDT',
+      'WDGLD',
       'ALGO'
     ]
@@ Expand Down @@