diff options
author | fragosti <francesco.agosti93@gmail.com> | 2018-11-16 04:40:28 +0800 |
---|---|---|
committer | fragosti <francesco.agosti93@gmail.com> | 2018-11-16 04:41:49 +0800 |
commit | 4da574560d50f661227ec4d91acf20917c26b17b (patch) | |
tree | b4d17a68db63cc788b4980848be99d9a42acd5b0 | |
parent | f9e012398606a85d286087f3e94bf8b95a52df55 (diff) | |
download | dexon-0x-contracts-4da574560d50f661227ec4d91acf20917c26b17b.tar dexon-0x-contracts-4da574560d50f661227ec4d91acf20917c26b17b.tar.gz dexon-0x-contracts-4da574560d50f661227ec4d91acf20917c26b17b.tar.bz2 dexon-0x-contracts-4da574560d50f661227ec4d91acf20917c26b17b.tar.lz dexon-0x-contracts-4da574560d50f661227ec4d91acf20917c26b17b.tar.xz dexon-0x-contracts-4da574560d50f661227ec4d91acf20917c26b17b.tar.zst dexon-0x-contracts-4da574560d50f661227ec4d91acf20917c26b17b.zip |
fix: remove redundant handler
-rw-r--r-- | packages/instant/src/components/payment_method.tsx | 22 | ||||
-rw-r--r-- | packages/instant/src/containers/connected_account_payment_method.ts | 10 |
2 files changed, 6 insertions, 26 deletions
diff --git a/packages/instant/src/components/payment_method.tsx b/packages/instant/src/components/payment_method.tsx index 21bb2902b..66ebe1f20 100644 --- a/packages/instant/src/components/payment_method.tsx +++ b/packages/instant/src/components/payment_method.tsx @@ -102,7 +102,7 @@ export class PaymentMethod extends React.Component<PaymentMethodProps> { ); case AccountState.None: return ( - <WalletPrompt onClick={this._handleInstallWalletClick} image={logo} {...colors}> + <WalletPrompt onClick={this.props.onInstallWalletClick} image={logo} {...colors}> {isMobile ? 'Install Coinbase Wallet' : 'Install MetaMask'} </WalletPrompt> ); @@ -116,24 +116,4 @@ export class PaymentMethod extends React.Component<PaymentMethodProps> { ); } }; - private readonly _handleInstallWalletClick = (): void => { - const isMobile = envUtil.isMobileOperatingSystem(); - if (!isMobile) { - this.props.onInstallWalletClick(); - return; - } - const operatingSystem = envUtil.getOperatingSystem(); - let url = COINBASE_WALLET_SITE_URL; - switch (operatingSystem) { - case OperatingSystem.Android: - url = COINBASE_WALLET_ANDROID_APP_STORE_URL; - break; - case OperatingSystem.iOS: - url = COINBASE_WALLET_IOS_APP_STORE_URL; - break; - default: - break; - } - window.open(url, '_blank'); - }; } diff --git a/packages/instant/src/containers/connected_account_payment_method.ts b/packages/instant/src/containers/connected_account_payment_method.ts index beaaccf2f..eacbadfca 100644 --- a/packages/instant/src/containers/connected_account_payment_method.ts +++ b/packages/instant/src/containers/connected_account_payment_method.ts @@ -22,7 +22,7 @@ interface ConnectedState { } interface ConnectedDispatch { - onInstallWalletClick: () => void; + openInstallWalletPanel: () => void; unlockWalletAndDispatchToStore: (providerState: ProviderState) => void; } @@ -39,7 +39,7 @@ const mapDispatchToProps = ( dispatch: Dispatch<Action>, ownProps: ConnectedAccountPaymentMethodProps, ): ConnectedDispatch => ({ - onInstallWalletClick: () => dispatch(actions.openStandardSlidingPanel(StandardSlidingPanelContent.InstallWallet)), + openInstallWalletPanel: () => dispatch(actions.openStandardSlidingPanel(StandardSlidingPanelContent.InstallWallet)), unlockWalletAndDispatchToStore: async (providerState: ProviderState) => asyncData.fetchAccountInfoAndDispatchToStore(providerState, dispatch, true), }); @@ -52,12 +52,12 @@ const mergeProps = ( ...ownProps, network: connectedState.network, account: connectedState.providerState.account, - onInstallWalletClick: connectedDispatch.onInstallWalletClick, walletName: connectedState.providerState.name, - onUnlockWalletClick: () => { + onUnlockWalletClick: () => connectedDispatch.unlockWalletAndDispatchToStore(connectedState.providerState), + onInstallWalletClick: () => { const isMobile = envUtil.isMobileOperatingSystem(); if (!isMobile) { - connectedDispatch.unlockWalletAndDispatchToStore(connectedState.providerState); + connectedDispatch.openInstallWalletPanel(); return; } const operatingSystem = envUtil.getOperatingSystem(); |