From 7ad5dbc59dc765d44f01cd1e92511196a54be82c Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Tue, 20 Nov 2018 09:51:14 -0800
Subject: Allow user to select other token on success

---
 .../instant/src/containers/selected_erc20_asset_amount_input.ts   | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'packages/instant/src/containers')

diff --git a/packages/instant/src/containers/selected_erc20_asset_amount_input.ts b/packages/instant/src/containers/selected_erc20_asset_amount_input.ts
index 2c2661e1a..bbc103566 100644
--- a/packages/instant/src/containers/selected_erc20_asset_amount_input.ts
+++ b/packages/instant/src/containers/selected_erc20_asset_amount_input.ts
@@ -26,6 +26,7 @@ interface ConnectedState {
     isDisabled: boolean;
     numberOfAssetsAvailable?: number;
     affiliateInfo?: AffiliateInfo;
+    canSelectOtherAsset: boolean;
 }
 
 interface ConnectedDispatch {
@@ -50,6 +51,11 @@ const mapStateToProps = (state: State, _ownProps: SelectedERC20AssetAmountInputP
             ? (state.selectedAsset as ERC20Asset)
             : undefined;
     const numberOfAssetsAvailable = _.isUndefined(state.availableAssets) ? undefined : state.availableAssets.length;
+    const canSelectOtherAsset =
+        numberOfAssetsAvailable && numberOfAssetsAvailable > 1
+            ? isEnabled || processState === OrderProcessState.Success
+            : false;
+
     const assetBuyer = state.providerState.assetBuyer;
     return {
         assetBuyer,
@@ -58,6 +64,7 @@ const mapStateToProps = (state: State, _ownProps: SelectedERC20AssetAmountInputP
         isDisabled,
         numberOfAssetsAvailable,
         affiliateInfo: state.affiliateInfo,
+        canSelectOtherAsset,
     };
 };
 
@@ -104,6 +111,7 @@ const mergeProps = (
         },
         isDisabled: connectedState.isDisabled,
         numberOfAssetsAvailable: connectedState.numberOfAssetsAvailable,
+        canSelectOtherAsset: connectedState.canSelectOtherAsset,
     };
 };
 
-- 
cgit v1.2.3


From b7eb2e887d636e2ed61eade4bae01596dba4b4c2 Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Tue, 20 Nov 2018 13:59:09 -0800
Subject: isDisabled -> isInputDisabled

---
 .../src/containers/selected_erc20_asset_amount_input.ts      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'packages/instant/src/containers')

diff --git a/packages/instant/src/containers/selected_erc20_asset_amount_input.ts b/packages/instant/src/containers/selected_erc20_asset_amount_input.ts
index bbc103566..a39bc46a2 100644
--- a/packages/instant/src/containers/selected_erc20_asset_amount_input.ts
+++ b/packages/instant/src/containers/selected_erc20_asset_amount_input.ts
@@ -23,7 +23,7 @@ interface ConnectedState {
     assetBuyer: AssetBuyer;
     value?: BigNumber;
     asset?: ERC20Asset;
-    isDisabled: boolean;
+    isInputDisabled: boolean;
     numberOfAssetsAvailable?: number;
     affiliateInfo?: AffiliateInfo;
     canSelectOtherAsset: boolean;
@@ -44,8 +44,8 @@ type FinalProps = ConnectedProps & SelectedERC20AssetAmountInputProps;
 
 const mapStateToProps = (state: State, _ownProps: SelectedERC20AssetAmountInputProps): ConnectedState => {
     const processState = state.buyOrderState.processState;
-    const isEnabled = processState === OrderProcessState.None || processState === OrderProcessState.Failure;
-    const isDisabled = !isEnabled;
+    const isInputEnabled = processState === OrderProcessState.None || processState === OrderProcessState.Failure;
+    const isInputDisabled = !isInputEnabled;
     const selectedAsset =
         !_.isUndefined(state.selectedAsset) && state.selectedAsset.metaData.assetProxyId === AssetProxyId.ERC20
             ? (state.selectedAsset as ERC20Asset)
@@ -53,7 +53,7 @@ const mapStateToProps = (state: State, _ownProps: SelectedERC20AssetAmountInputP
     const numberOfAssetsAvailable = _.isUndefined(state.availableAssets) ? undefined : state.availableAssets.length;
     const canSelectOtherAsset =
         numberOfAssetsAvailable && numberOfAssetsAvailable > 1
-            ? isEnabled || processState === OrderProcessState.Success
+            ? isInputEnabled || processState === OrderProcessState.Success
             : false;
 
     const assetBuyer = state.providerState.assetBuyer;
@@ -61,7 +61,7 @@ const mapStateToProps = (state: State, _ownProps: SelectedERC20AssetAmountInputP
         assetBuyer,
         value: state.selectedAssetUnitAmount,
         asset: selectedAsset,
-        isDisabled,
+        isInputDisabled,
         numberOfAssetsAvailable,
         affiliateInfo: state.affiliateInfo,
         canSelectOtherAsset,
@@ -109,7 +109,7 @@ const mergeProps = (
         onChange: (value, asset) => {
             connectedDispatch.updateBuyQuote(connectedState.assetBuyer, value, asset, connectedState.affiliateInfo);
         },
-        isDisabled: connectedState.isDisabled,
+        isInputDisabled: connectedState.isInputDisabled,
         numberOfAssetsAvailable: connectedState.numberOfAssetsAvailable,
         canSelectOtherAsset: connectedState.canSelectOtherAsset,
     };
-- 
cgit v1.2.3