2 files changed, 19 insertions, 7 deletions
diff --git a/packages/instant/src/containers/connected_account_payment_method.ts b/packages/instant/src/containers/connected_account_payment_method.ts
index eacbadfca..cdeb49a25 100644
--- a/packages/instant/src/containers/connected_account_payment_method.ts
+++ b/packages/instant/src/containers/connected_account_payment_method.ts
@@ -12,6 +12,7 @@ import { Action, actions } from '../redux/actions';
 import { asyncData } from '../redux/async_data';
 import { State } from '../redux/reducer';
 import { Network, Omit, OperatingSystem, ProviderState, StandardSlidingPanelContent } from '../types';
+import { analytics } from '../util/analytics';
 import { envUtil } from '../util/env';
 
 export interface ConnectedAccountPaymentMethodProps {}
@@ -40,8 +41,11 @@ const mapDispatchToProps = (
     ownProps: ConnectedAccountPaymentMethodProps,
 ): ConnectedDispatch => ({
     openInstallWalletPanel: () => dispatch(actions.openStandardSlidingPanel(StandardSlidingPanelContent.InstallWallet)),
-    unlockWalletAndDispatchToStore: async (providerState: ProviderState) =>
-        asyncData.fetchAccountInfoAndDispatchToStore(providerState, dispatch, true),
+    unlockWalletAndDispatchToStore: (providerState: ProviderState) => {
+        analytics.trackAccountUnlockRequested();
+        // tslint:disable-next-line:no-floating-promises
+        asyncData.fetchAccountInfoAndDispatchToStore(providerState, dispatch, true);
+    },
 });
 
 const mergeProps = (
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..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,9 +23,10 @@ interface ConnectedState {
     assetBuyer: AssetBuyer;
     value?: BigNumber;
     asset?: ERC20Asset;
-    isDisabled: boolean;
+    isInputDisabled: boolean;
     numberOfAssetsAvailable?: number;
     affiliateInfo?: AffiliateInfo;
+    canSelectOtherAsset: boolean;
 }
 
 interface ConnectedDispatch {
@@ -43,21 +44,27 @@ 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)
             : undefined;
     const numberOfAssetsAvailable = _.isUndefined(state.availableAssets) ? undefined : state.availableAssets.length;
+    const canSelectOtherAsset =
+        numberOfAssetsAvailable && numberOfAssetsAvailable > 1
+            ? isInputEnabled || processState === OrderProcessState.Success
+            : false;
+
     const assetBuyer = state.providerState.assetBuyer;
     return {
         assetBuyer,
         value: state.selectedAssetUnitAmount,
         asset: selectedAsset,
-        isDisabled,
+        isInputDisabled,
         numberOfAssetsAvailable,
         affiliateInfo: state.affiliateInfo,
+        canSelectOtherAsset,
     };
 };
 
@@ -102,8 +109,9 @@ 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,
     };
 };