Error handling + action fix

src/errors.js

@@ -193,6 +193,36 @@ export const SwapGenericAPIError = createCustomErrorClass(
   "SwapGenericAPIError"
 );
 
+export const JSONRPCResponseError = createCustomErrorClass(
+  "JSONRPCResponseError"
+);
+export const JSONDecodeError = createCustomErrorClass("JSONDecodeError");
+export const NoIPHeaderError = createCustomErrorClass("NoIPHeaderError");
+export const CurrencyNotSupportedError = createCustomErrorClass(
+  "CurrencyNotSupportedError"
+);
+export const CurrencyDisabledError = createCustomErrorClass(
+  "CurrencyDisabledError"
+);
+export const CurrencyDisabledAsInputError = createCustomErrorClass(
+  "CurrencyDisabledAsInputError"
+);
+export const CurrencyDisabledAsOutputError = createCustomErrorClass(
+  "CurrencyDisabledAsOutputError"
+);
+export const CurrencyNotSupportedByProviderError = createCustomErrorClass(
+  "CurrencyNotSupportedByProviderError"
+);
+export const TradeMethodNotSupportedError = createCustomErrorClass(
+  "TradeMethodNotSupportedError"
+);
+export const UnexpectedError = createCustomErrorClass("UnexpectedError");
+export const NotImplementedError = createCustomErrorClass(
+  "NotImplementedError"
+);
+export const ValidationError = createCustomErrorClass("ValidationError");
+export const AccessDeniedError = createCustomErrorClass("AccessDeniedError");
+
 export const AlgorandASANotOptInInRecipient = createCustomErrorClass(
   "AlgorandASANotOptInInRecipient"
 );

src/exchange/swap/getExchangeRates.js

@@ -7,7 +7,7 @@ import type { Unit } from "../../types";
 import { formatCurrencyUnit } from "../../currencies";
 import { mockGetExchangeRates } from "./mock";
 import network from "../../network";
-import { getSwapAPIBaseURL } from "./";
+import { getSwapAPIError, getSwapAPIBaseURL } from "./";
 import { getEnv } from "../../env";
 import { BigNumber } from "bignumber.js";
 import {
@@ -109,17 +109,24 @@ const inferError = (
     minAmountFrom: string,
     maxAmountFrom: string,
     errorCode?: number,
+    errorMessage?: string,
   }
 ): ?Error => {
   const tenPowMagnitude = BigNumber(10).pow(unitFrom.magnitude);
-  const { amountTo, minAmountFrom, maxAmountFrom, errorCode } = responseData;
+  const {
+    amountTo,
+    minAmountFrom,
+    maxAmountFrom,
+    errorCode,
+    errorMessage,
+  } = responseData;
 
   if (!amountTo) {
     // We are in an error case regardless of api version.
     if (errorCode) {
-      // TODO Do we have consistent errorCodes for providers?
-      return new Error(`Generic Swap API error with code [${errorCode}]`);
+      return getSwapAPIError(errorCode, errorMessage);
     }
+
     // For out of range errors we will have a min/max pairing
     if (minAmountFrom) {
       const isTooSmall = BigNumber(apiAmount).lte(minAmountFrom);

src/exchange/swap/index.js

@@ -9,6 +9,21 @@ import getKYCStatus from "./getKYCStatus";
 import submitKYC from "./submitKYC";
 import initSwap from "./initSwap";
 import { getEnv } from "../../env";
+import {
+  JSONRPCResponseError,
+  JSONDecodeError,
+  NoIPHeaderError,
+  CurrencyNotSupportedError,
+  CurrencyDisabledError,
+  CurrencyDisabledAsInputError,
+  CurrencyDisabledAsOutputError,
+  CurrencyNotSupportedByProviderError,
+  TradeMethodNotSupportedError,
+  UnexpectedError,
+  NotImplementedError,
+  ValidationError,
+  AccessDeniedError,
+} from "../../errors";
 
 export const operationStatusList = {
   finishedOK: ["finished"],
@@ -117,7 +132,28 @@ const USStates = {
 
 const countries = {
   US: "United States",
-  ES: "Spain", // FIXME remove before merging
+};
+
+const swapBackendErrorCodes = {
+  "100": JSONRPCResponseError,
+  "101": JSONDecodeError,
+  "200": NoIPHeaderError,
+  "300": CurrencyNotSupportedError,
+  "301": CurrencyDisabledError,
+  "302": CurrencyDisabledAsInputError,
+  "303": CurrencyDisabledAsOutputError,
+  "304": CurrencyNotSupportedByProviderError,
+  "400": TradeMethodNotSupportedError,
+  "500": UnexpectedError,
+  "600": NotImplementedError,
+  "700": ValidationError,
+  "701": AccessDeniedError,
+};
+
+export const getSwapAPIError = (errorCode: number, errorMessage?: string) => {
+  if (errorCode in swapBackendErrorCodes)
+    return new swapBackendErrorCodes[errorCode](errorMessage);
+  return new Error(errorMessage);
 };
 
 export {

src/exchange/swap/submitKYC.js

@@ -3,30 +3,31 @@
 import network from "../../network";
 import { getSwapAPIBaseURL } from "./";
 import type { KYCData, SubmitKYC } from "./types";
-import { SwapCheckKYCStatusFailed, SwapSubmitKYCFailed } from "../../errors";
+import { ValidationError } from "../../errors";
 
 export const submitKYC: SubmitKYC = async (provider: string, data: KYCData) => {
-  const res = await network({
-    method: "POST",
-    url: `${getSwapAPIBaseURL()}/provider/${provider}/user`,
-    data,
-  });
+  try {
+    const res = await network({
+      method: "POST",
+      url: `${getSwapAPIBaseURL()}/provider/${provider}/user`,
+      data,
+    });
 
-  if (res.data?.code) {
-    // Wyre KYC errors get mapped to {code, message}
-    return new SwapSubmitKYCFailed(res.data.message);
-  }
-
-  if (!res.data?.status) {
-    return new SwapCheckKYCStatusFailed();
-  }
+    const { id, status } = res.data;
 
-  const { id, status } = res.data;
+    return {
+      id,
+      status,
+    };
+  } catch (error) {
+    // Nb this is the best we have, no _per field_ validation but rather
+    // error handling at the top level.
 
-  return {
-    id,
-    status,
-  };
+    // TODO detect KYC specs changed to throw specific error
+    return {
+      error: new ValidationError(error.message),
+    };
+  }
 };
 
 export default submitKYC;

src/exchange/swap/types.js

@@ -16,7 +16,10 @@ import type {
 export type ValidKYCStatus = "open" | "pending" | "approved" | "closed";
 export type KYCStatus = { id: string, status: ValidKYCStatus };
 export type GetKYCStatus = (string, string) => Promise<KYCStatus>;
-export type SubmitKYC = (string, KYCData) => Promise<KYCStatus>;
+export type SubmitKYC = (
+  string,
+  KYCData
+) => Promise<KYCStatus | { error: Error }>;
 
 export type KYCData = {
   firstName: string,

src/hw/actions/initSwap.js

@@ -37,6 +37,7 @@ type InitSwapRequest = {
   exchangeRate: ExchangeRate,
   transaction: Transaction,
   userId?: string,
+  requireLatestFirmware?: boolean,
 };
 
 type Result =
@@ -117,7 +118,14 @@ export const createAction = (
       state.freezeReduxDevice
     );
 
-    const { exchange, exchangeRate, transaction, userId } = initSwapRequest;
+    const {
+      exchange,
+      exchangeRate,
+      transaction,
+      userId,
+      requireLatestFirmware,
+    } = initSwapRequest;
+
     const {
       fromAccount,
       fromParentAccount,
@@ -134,6 +142,7 @@ export const createAction = (
           { account: mainFromAccount },
           { account: maintoAccount },
         ],
+        requireLatestFirmware,
       }
     );