refactor: add types util

react/lib/components/PayButton/PayButton.tsx

@@ -2,11 +2,12 @@ import React, { useState, useEffect, useCallback, useRef } from 'react';
 
 import { Theme, ThemeName, ThemeProvider, useTheme } from '../../themes';
 import Button, { ButtonProps } from '../Button/Button';
-import { Transaction, currency, isFiat, getFiatPrice } from '../../util/api-client';
+import { isFiat, getFiatPrice } from '../../util/api-client';
 import { PaymentDialog } from '../PaymentDialog/PaymentDialog';
 import { getCurrencyTypeFromAddress, isValidCashAddress, isValidXecAddress } from '../../util/address';
-import { currencyObject, getCurrencyObject } from '../../util/satoshis';
+import { getCurrencyObject } from '../../util/satoshis';
 import { generatePaymentId } from '../../util/opReturn';
+import { currency, Transaction, currencyObject } from '../../util/types';
 
 export interface PayButtonProps extends ButtonProps {
   to: string;

react/lib/components/PaymentDialog/PaymentDialog.tsx

@@ -5,8 +5,7 @@ import { Theme, ThemeName, ThemeProvider, useTheme } from '../../themes';
 import Button, { ButtonProps } from '../Button/Button';
 import { WidgetContainer } from '../Widget/WidgetContainer';
 import { isValidCashAddress, isValidXecAddress } from '../../util/address';
-import { Transaction, currency } from '../../util/api-client';
-import { currencyObject } from '../../util/satoshis';
+import { currency, currencyObject, Transaction } from '../../util/types';
 
 export interface PaymentDialogProps extends ButtonProps {
   to: string;

react/lib/components/Widget/Widget.tsx

@@ -22,20 +22,12 @@ import { formatPrice, DECIMALS } from '../../util/format';
 import { Button, animation } from '../Button/Button';
 import BarChart from '../BarChart/BarChart';
 
-import { getCurrencyObject, currencyObject } from '../../util/satoshis';
-import {
-  currency,
-  getAddressBalance,
-  getAddressDetails,
-  isFiat,
-  setListener,
-  Transaction,
-  getCashtabProviderStatus,
-  cryptoCurrency,
-} from '../../util/api-client';
 import PencilIcon from '../../assets/edit-pencil';
 import io, { Socket } from 'socket.io-client';
 import { encodeOpReturnProps } from '../../util/opReturn';
+import { getAddressDetails, setListener, getAddressBalance, isFiat, getCashtabProviderStatus } from '../../util/api-client';
+import { getCurrencyObject } from '../../util/satoshis';
+import { currency, currencyObject, Transaction, cryptoCurrency } from '../../util/types';
 
 type QRCodeProps = BaseQRCodeProps & { renderAs: 'svg' };
 

react/lib/components/Widget/WidgetContainer.tsx

@@ -6,17 +6,15 @@ import {
   getCurrencyTypeFromAddress,
 } from '../../util/address';
 import {
-  Transaction,
   isCrypto,
-  currency,
   isValidCurrency,
   isFiat,
   getFiatPrice,
 } from '../../util/api-client';
-import { currencyObject } from '../../util/satoshis';
 import Widget, { WidgetProps } from './Widget';
 import BigNumber from 'bignumber.js';
 import { generatePaymentId } from '../../util/opReturn';
+import { currency, currencyObject, Transaction } from '../../util/types';
 
 export interface WidgetContainerProps
   extends Omit<WidgetProps, 'success' | 'setNewTxs' | 'setCurrencyObject'> {

react/lib/util/address.ts

@@ -1,5 +1,5 @@
 import * as xecaddr from 'xecaddrjs';
-import { cryptoCurrency } from '../util/api-client';
+import { cryptoCurrency } from './types';
 
 export const isValidCashAddress = (address: string): boolean => {
   if (!address) return false;

react/lib/util/api-client.ts

@@ -3,6 +3,7 @@ import _ from 'lodash';
 import { Socket } from 'socket.io-client'
 import config from '../config.json'
 import { isValidCashAddress, isValidXecAddress } from './address';
+import { Transaction, Output, TokenMetaData, TransactionDetails, cryptoCurrency, fiatCurrency, currency } from './types';
 
 export const getAddressDetails = async (
   address: string,
@@ -108,15 +109,8 @@ export default {
 };
 
 export const fiatCurrencies = ['USD', 'CAD'] as const;
-
-type fiatCurrenciesTuple = typeof fiatCurrencies; // readonly ['USD', 'CAD' ]
-export type fiatCurrency = fiatCurrenciesTuple[number]; // "USD" | "CAD" 
-
 export const cryptoCurrencies = ['BCH', 'XEC'] as const;
-type cryptoCurrenciesTuple = typeof cryptoCurrencies; // readonly ['BCH', 'XEC']
-export type cryptoCurrency = cryptoCurrenciesTuple[number]; // "BCH" | "XEC"
 
-export type currency = cryptoCurrency | fiatCurrency;
 
 export function isFiat(unknownString: string): unknownString is fiatCurrency {
   return fiatCurrencies.includes(unknownString as fiatCurrency);
@@ -142,124 +136,11 @@ export const getCashtabProviderStatus = () => {
   return false;
 };
 
-
-export interface Transaction {
-  hash: string
-  amount: string
-  paymentId: string
-  confirmed?: boolean
-  message: string
-  timestamp: number
-  address: string
-}
-
 export interface UtxoDetails {
   outputsList: [Output];
   tokenMetadataList: [TokenMetaData];
 }
 
-export interface Output {
-  outpoint: {
-    hash: string;
-    index: number;
-  };
-  pubkeyScript: string;
-  value: number;
-  isCoinbase: boolean;
-  blockHeight: number;
-}
-
-export interface TokenMetaData {
-  tokenId: string;
-  tokenType: number;
-  v1Fungible: {
-    tokenTicker: string;
-    tokenName: string;
-    tokenDocumentUrl: string;
-    tokenDocumentHash: string;
-    decimals: number;
-    mintBatonHash: string;
-    mintBatonVout: number;
-  };
-}
-
 export interface PriceData {
   price: number;
 }
-
-export interface TransactionDetails {
-  transaction: {
-    hash: string;
-    version: number;
-    inputsList: {
-      index: number;
-      outpoint: {
-        hash: string;
-        index: number;
-      };
-      signatureScript: string;
-      sequence: number;
-      value: number;
-      previousScript: string;
-      address: string;
-      slpToken: {
-        tokenId: string;
-        amount: string;
-        isMintBaton: boolean;
-        address: string;
-        decimals: number;
-        slpAction: number;
-        tokenType: number;
-      };
-    }[];
-    outputsList: {
-      index: number;
-      value: number;
-      pubkeyScript: string;
-      address: string;
-      scriptClass: string;
-      disassembledScript: string;
-      slpToken?: {
-        tokenId: string;
-        amount: string;
-        isMintBaton: boolean;
-        address: string;
-        decimals: number;
-        slpAction: number;
-        tokenType: number;
-      };
-    }[];
-    lockTime: number;
-    size: number;
-    timestamp: number;
-    confirmations: number;
-    blockHeight: number;
-    blockHash: string;
-    slpTransactionInfo: {
-      slpAction: number;
-      validityJudgement: number;
-      parseError: string;
-      tokenId: string;
-      burnFlagsList: [number];
-      v1Nft1ChildGenesis: {
-        name: string;
-        ticker: string;
-        documentUrl: string;
-        documentHash: string;
-        decimals: number;
-        groupTokenId: string;
-      };
-    };
-  };
-  tokenMetadata: {
-    tokenId: string;
-    tokenType: number;
-    v1Nft1Child: {
-      tokenTicker: string;
-      tokenName: string;
-      tokenDocumentUrl: string;
-      tokenDocumentHash: string;
-      groupId: string;
-    };
-  };
-}

react/lib/util/format.ts

@@ -1,5 +1,5 @@
 import currencyFormat from 'currency-formatter';
-import { currency } from './api-client';
+import { currency } from './types';
 
 export const DECIMALS = {
   BCH: 8,

react/lib/util/randomizeSats.ts

@@ -1,4 +1,4 @@
-import { cryptoCurrency } from './api-client';
+import { cryptoCurrency } from "./types";
 
 const DEFAULT = 3
 const MAX = 4

react/lib/util/satoshis.ts

@@ -1,14 +1,10 @@
 import BigNumber from 'bignumber.js';
 import { formatPrice, formatBCH, formatXEC, DECIMALS } from './format';
 
-import { currency, isCrypto } from './api-client';
+import { isCrypto } from './api-client';
 import { randomizeSatoshis } from './randomizeSats';
+import { currency, currencyObject } from './types';
 
-export type currencyObject = {
-  float: number;
-  string: string;
-  currency: string;
-};
 
 export const getCurrencyObject = (
   amount: number,