From 062187f28d76bf420c235bc83a56926e35bd8db0 Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Thu, 25 Oct 2018 13:58:32 -0700
Subject: better type names

---
 packages/instant/src/types.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/instant/src/types.ts b/packages/instant/src/types.ts
index 63b49cb26..c63371fb4 100644
--- a/packages/instant/src/types.ts
+++ b/packages/instant/src/types.ts
@@ -16,14 +16,14 @@ export enum OrderProcessState {
     FAILURE = 'Failure',
 }
 
-interface OrderStateWithoutTx {
+interface OrderStatePreTx {
     processState: OrderProcessState.NONE | OrderProcessState.AWAITING_SIGNATURE;
 }
-interface OrderStateWithTx {
+interface OrderStatePostTx {
     processState: OrderProcessState.PROCESSING | OrderProcessState.SUCCESS | OrderProcessState.FAILURE;
     txHash: string;
 }
-export type OrderState = OrderStateWithoutTx | OrderStateWithTx;
+export type OrderState = OrderStatePreTx | OrderStatePostTx;
 
 export enum DisplayStatus {
     Present,
-- 
cgit v1.2.3


From f04eba77736a429bea19a4544cfbabc38069d04d Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Thu, 25 Oct 2018 14:44:25 -0700
Subject: Added string to constants

---
 packages/instant/src/components/buy_button.tsx | 3 ++-
 packages/instant/src/constants.ts              | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/instant/src/components/buy_button.tsx b/packages/instant/src/components/buy_button.tsx
index 6fe333dc7..a7a22e3bc 100644
--- a/packages/instant/src/components/buy_button.tsx
+++ b/packages/instant/src/components/buy_button.tsx
@@ -2,6 +2,7 @@ import { AssetBuyer, AssetBuyerError, BuyQuote } from '@0x/asset-buyer';
 import * as _ from 'lodash';
 import * as React from 'react';
 
+import { WEB_3_WRAPPER_TRANSACTION_FAILED_ERROR_MSG_PREFIX } from '../constants';
 import { ColorOption } from '../style/theme';
 import { util } from '../util/util';
 import { web3Wrapper } from '../util/web3_wrapper';
@@ -62,7 +63,7 @@ export class BuyButton extends React.Component<BuyButtonProps> {
         try {
             await web3Wrapper.awaitTransactionSuccessAsync(txHash);
         } catch (e) {
-            if (e instanceof Error && e.message.startsWith('Transaction failed')) {
+            if (e instanceof Error && e.message.startsWith(WEB_3_WRAPPER_TRANSACTION_FAILED_ERROR_MSG_PREFIX)) {
                 this.props.onBuyFailure(buyQuote, txHash);
                 return;
             }
diff --git a/packages/instant/src/constants.ts b/packages/instant/src/constants.ts
index 31491c80a..48d0d4aa2 100644
--- a/packages/instant/src/constants.ts
+++ b/packages/instant/src/constants.ts
@@ -2,3 +2,4 @@ import { BigNumber } from '@0x/utils';
 export const BIG_NUMBER_ZERO = new BigNumber(0);
 export const ethDecimals = 18;
 export const DEFAULT_ZERO_EX_CONTAINER_SELECTOR = '#zeroExInstantContainer';
+export const WEB_3_WRAPPER_TRANSACTION_FAILED_ERROR_MSG_PREFIX = 'Transaction failed';
-- 
cgit v1.2.3


From 89e59cca28a86763519237ab9c6971600e200b5e Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Thu, 25 Oct 2018 14:48:59 -0700
Subject: cleanup code

---
 packages/instant/src/components/buy_button.tsx | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/packages/instant/src/components/buy_button.tsx b/packages/instant/src/components/buy_button.tsx
index a7a22e3bc..a70269dde 100644
--- a/packages/instant/src/components/buy_button.tsx
+++ b/packages/instant/src/components/buy_button.tsx
@@ -49,14 +49,9 @@ export class BuyButton extends React.Component<BuyButtonProps> {
         } catch (e) {
             if (e instanceof Error && e.message === AssetBuyerError.SignatureRequestDenied) {
                 this.props.onSignatureDenied(buyQuote, e);
-            } else {
-                throw e;
+                return;
             }
-        }
-
-        // Have to let TS know that txHash is definitely defined now
-        if (!txHash) {
-            throw new Error('No txHash available');
+            throw e;
         }
 
         this.props.onBuyProcessing(buyQuote, txHash);
-- 
cgit v1.2.3