From d19c42fcaeea933793ed459ab5248b42811a0498 Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Sat, 14 Jul 2018 13:47:07 -0700
Subject: Add fallback when no function found, fix network colors, add fiat
 values for tokens with contract exchange rates

---
 ui/app/selectors/confirm-transaction.js | 99 +++++++++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)

(limited to 'ui/app/selectors/confirm-transaction.js')

diff --git a/ui/app/selectors/confirm-transaction.js b/ui/app/selectors/confirm-transaction.js
index cde83804d..5f1ae225c 100644
--- a/ui/app/selectors/confirm-transaction.js
+++ b/ui/app/selectors/confirm-transaction.js
@@ -1,5 +1,6 @@
 import { createSelector } from 'reselect'
 import txHelper from '../../lib/tx-helper'
+import { calcTokenAmount } from '../token-util'
 
 const unapprovedTxsSelector = state => state.metamask.unapprovedTxs
 const unapprovedMsgsSelector = state => state.metamask.unapprovedMsgs
@@ -63,3 +64,101 @@ export const unconfirmedTransactionsHashSelector = createSelector(
 
 export const currentCurrencySelector = state => state.metamask.currentCurrency
 export const conversionRateSelector = state => state.metamask.conversionRate
+
+const txDataSelector = state => state.confirmTransaction.txData
+const tokenDataSelector = state => state.confirmTransaction.tokenData
+const tokenPropsSelector = state => state.confirmTransaction.tokenProps
+
+const contractExchangeRatesSelector = state => state.metamask.contractExchangeRates
+
+const tokenDecimalsSelector = createSelector(
+  tokenPropsSelector,
+  tokenProps => tokenProps && tokenProps.tokenDecimals
+)
+
+const tokenDataParamsSelector = createSelector(
+  tokenDataSelector,
+  tokenData => tokenData && tokenData.params || []
+)
+
+const txParamsSelector = createSelector(
+  txDataSelector,
+  txData => txData && txData.txParams || {}
+)
+
+export const tokenAddressSelector = createSelector(
+  txParamsSelector,
+  txParams => txParams && txParams.to
+)
+
+const TOKEN_PARAM_SPENDER = '_spender'
+const TOKEN_PARAM_TO = '_to'
+const TOKEN_PARAM_VALUE = '_value'
+
+export const tokenAmountAndToAddressSelector = createSelector(
+  tokenDataParamsSelector,
+  params => {
+    let toAddress = ''
+    let tokenAmount = 0
+
+    if (params && params.length) {
+      const toParam = params.find(param => param.name === TOKEN_PARAM_TO)
+      const valueParam = params.find(param => param.name === TOKEN_PARAM_VALUE)
+      toAddress = toParam ? toParam.value : params[0].value
+      tokenAmount = valueParam ? +valueParam.value : +params[1].value
+    }
+
+    return {
+      toAddress,
+      tokenAmount,
+    }
+  }
+)
+
+export const approveTokenAmountAndToAddressSelector = createSelector(
+  tokenDataParamsSelector,
+  params => {
+    let toAddress = ''
+    let tokenAmount = 0
+
+    if (params && params.length) {
+      toAddress = params.find(param => param.name === TOKEN_PARAM_SPENDER).value
+      tokenAmount = +params.find(param => param.name === TOKEN_PARAM_VALUE).value
+    }
+
+    return {
+      toAddress,
+      tokenAmount,
+    }
+  }
+)
+
+export const sendTokenTokenAmountAndToAddressSelector = createSelector(
+  tokenDataParamsSelector,
+  tokenDecimalsSelector,
+  (params, tokenDecimals) => {
+    let toAddress = ''
+    let tokenAmount = 0
+
+    if (params && params.length) {
+      toAddress = params.find(param => param.name === TOKEN_PARAM_TO).value
+      tokenAmount = +params.find(param => param.name === TOKEN_PARAM_VALUE).value
+
+      if (tokenDecimals) {
+        tokenAmount = calcTokenAmount(tokenAmount, tokenDecimals)
+      }
+    }
+
+    return {
+      toAddress,
+      tokenAmount,
+    }
+  }
+)
+
+
+export const contractExchangeRateSelector = createSelector(
+  contractExchangeRatesSelector,
+  tokenAddressSelector,
+  (contractExchangeRates, tokenAddress) => contractExchangeRates[tokenAddress]
+)
-- 
cgit 


From 301ae305b88d0a7e3a3cbca9a500f4b39753dc52 Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Tue, 17 Jul 2018 13:43:15 -0700
Subject: Use Number constructor for number conversion. Use existing
 noConversionRateAvailable message

---
 ui/app/selectors/confirm-transaction.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'ui/app/selectors/confirm-transaction.js')

diff --git a/ui/app/selectors/confirm-transaction.js b/ui/app/selectors/confirm-transaction.js
index 5f1ae225c..54016a30e 100644
--- a/ui/app/selectors/confirm-transaction.js
+++ b/ui/app/selectors/confirm-transaction.js
@@ -105,7 +105,7 @@ export const tokenAmountAndToAddressSelector = createSelector(
       const toParam = params.find(param => param.name === TOKEN_PARAM_TO)
       const valueParam = params.find(param => param.name === TOKEN_PARAM_VALUE)
       toAddress = toParam ? toParam.value : params[0].value
-      tokenAmount = valueParam ? +valueParam.value : +params[1].value
+      tokenAmount = valueParam ? Number(valueParam.value) : Number(params[1].value)
     }
 
     return {
@@ -123,7 +123,7 @@ export const approveTokenAmountAndToAddressSelector = createSelector(
 
     if (params && params.length) {
       toAddress = params.find(param => param.name === TOKEN_PARAM_SPENDER).value
-      tokenAmount = +params.find(param => param.name === TOKEN_PARAM_VALUE).value
+      tokenAmount = Number(params.find(param => param.name === TOKEN_PARAM_VALUE).value)
     }
 
     return {
@@ -142,7 +142,7 @@ export const sendTokenTokenAmountAndToAddressSelector = createSelector(
 
     if (params && params.length) {
       toAddress = params.find(param => param.name === TOKEN_PARAM_TO).value
-      tokenAmount = +params.find(param => param.name === TOKEN_PARAM_VALUE).value
+      tokenAmount = Number(params.find(param => param.name === TOKEN_PARAM_VALUE).value)
 
       if (tokenDecimals) {
         tokenAmount = calcTokenAmount(tokenAmount, tokenDecimals)
-- 
cgit