fix: paybutton imports

react/lib/components/PayButton/PayButton.tsx

@@ -11,8 +11,11 @@ import {
   getCurrencyTypeFromAddress,
   isValidCashAddress,
   isValidXecAddress,
-  CurrencyObject
+  CurrencyObject,
+  generatePaymentId,
+  getCurrencyObject
 } from '../../util';
+import { PaymentDialog } from '../PaymentDialog';
 export interface PayButtonProps extends ButtonProps {
   to: string;
   amount?: number | string;

react/lib/components/PaymentDialog/PaymentDialog.tsx

@@ -4,8 +4,7 @@ import React, { useState, useEffect } from 'react';
 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 { Currency, CurrencyObject, Transaction } from '../../util/types';
+import { Currency, CurrencyObject, Transaction, isValidCashAddress, isValidXecAddress } from '../../util';
 
 export interface PaymentDialogProps extends ButtonProps {
   to: string;

react/lib/components/Widget/Widget.tsx

@@ -10,19 +10,12 @@ import {
 import React, { useEffect, useMemo, useState } from 'react';
 import copy from 'copy-to-clipboard';
 import QRCode, { BaseQRCodeProps } from 'qrcode.react';
+import io, { Socket } from 'socket.io-client';
+import PencilIcon from '../../assets/edit-pencil';
 import config from '../../config.json';
-
 import { Theme, ThemeName, ThemeProvider, useTheme } from '../../themes';
-import {
-  isValidCashAddress,
-  isValidXecAddress,
-  getCurrencyTypeFromAddress,
-} from '../../util/address';
-import { formatPrice } from '../../util/format';
 import { Button, animation } from '../Button/Button';
 import BarChart from '../BarChart/BarChart';
-
-import { getCurrencyObject } from '../../util/satoshis';
 import {
   Currency,
   getAddressBalance,
@@ -32,12 +25,15 @@ import {
   getCashtabProviderStatus,
   CryptoCurrency,
   DECIMALS,
-  CurrencyObject
+  CurrencyObject,
+  getCurrencyObject,
+  formatPrice,
+  setListener,
+  encodeOpReturnProps,
+  isValidCashAddress,
+  isValidXecAddress,
+  getCurrencyTypeFromAddress,
 } from '../../util';
-import { setListener } from '../../util/socket';
-import PencilIcon from '../../assets/edit-pencil';
-import io, { Socket } from 'socket.io-client';
-import { encodeOpReturnProps } from '../../util/opReturn';
 
 type QRCodeProps = BaseQRCodeProps & { renderAs: 'svg' };
 

react/lib/components/Widget/WidgetContainer.tsx

@@ -3,20 +3,21 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
 
 import successSound from '../../assets/success.mp3.json';
 
-import {
-  getCurrencyTypeFromAddress,
-} from '../../util/address';
 import {
   getFiatPrice,
   Currency,
   CurrencyObject,
-  Transaction
+  Transaction,
+  generatePaymentId,
+  getCurrencyTypeFromAddress,
+  isCrypto,
+  isFiat,
+  isGreaterThanZero,
+  isValidCurrency,
+  resolveNumber
 } from '../../util';
 
 import Widget, { WidgetProps } from './Widget';
-import { generatePaymentId } from '../../util/opReturn';
-import { isGreaterThanZero, resolveNumber } from '../../util/number';
-import { isCrypto, isFiat, isValidCurrency } from '../../util/currency';
 
 export interface WidgetContainerProps
   extends Omit<WidgetProps, 'success' | 'setNewTxs' | 'setCurrencyObject'> {

react/lib/util/address.ts

@@ -33,24 +33,6 @@ export const getCurrencyTypeFromAddress = (address: string): CryptoCurrency => {
   }
 };
 
-export const isAddressSupported = (address: string): boolean => {
-  return xecaddr.isValidAddress(address);
-};
-
-export const compareAddresses = (
-  addressA: string,
-  addressB: string,
-): boolean => {
-  const prefixes = ['bitcoincash', 'bchtest', 'bchreg', 'ecash', 'ectest'];
-  prefixes.forEach(prefix =>
-    [addressA, addressB].forEach(a =>
-      a.replace(prefix, '').toLocaleUpperCase(),
-    ),
-  );
-
-  return addressA === addressB;
-};
-
 export default {
   isValidCashAddress,
   isValidXecAddress,

react/lib/util/api-client.ts

@@ -96,3 +96,11 @@ export default {
   getXecFiatPrice,
   getAddressBalance,
 };
+
+export const getCashtabProviderStatus = () => {
+  const windowAny = window as any
+  if (window && windowAny.bitcoinAbc && windowAny.bitcoinAbc === 'cashtab') {
+    return true;
+  }
+  return false;
+};

react/lib/util/index.ts

@@ -9,13 +9,4 @@ export * from './satoshis';
 export * from './socket';
 export * from './types';
 export * from './number';
-export * from './currency';
-
-
-export const getCashtabProviderStatus = () => {
-  const windowAny = window as any;
-  if (window && windowAny.bitcoinAbc && windowAny.bitcoinAbc === 'cashtab') {
-    return true;
-  }
-  return false;
-};
+export * from './currency';

react/lib/util/opReturn.ts

@@ -140,4 +140,4 @@ export const exportedForTesting = {
   generatePushdataPrefixedPaymentId,
   stringToHex,
   getDataPushdata,
-};
+};

react/lib/util/randomizeSats.ts

@@ -1,60 +1,53 @@
 import { CryptoCurrency } from "./types";
 
-const DEFAULT = 3;
-const MAX = 4;
+const DEFAULT = 3
+const MAX = 4
 
-export const getNSatoshis = (
-  amount: number,
-  randomSatoshis: boolean | number,
-  satsPrecision: number,
-): number => {
-  const amountDigits = amount
-    .toFixed(satsPrecision)
-    .toString()
-    .replace('.', '').length;
+
+export const getNSatoshis = (amount: number, randomSatoshis: boolean | number, satsPrecision: number): number => {
+  const amountDigits = amount.toFixed(satsPrecision).toString().replace('.', '').length;
   if (randomSatoshis === true) {
-    return Math.min(DEFAULT, amountDigits);
+    return Math.min(DEFAULT, amountDigits)
   } else if (randomSatoshis === false) {
-    throw new Error('Trying to randomize satoshis when not allowed.');
+    throw new Error("Trying to randomize satoshis when not allowed.")
   }
   if (randomSatoshis > MAX) {
-    randomSatoshis = MAX;
+    randomSatoshis = MAX
   }
-  return Math.min(randomSatoshis, amountDigits);
-};
+  return Math.min(randomSatoshis, amountDigits)
+}
 
 export const randomizeSatoshis = (amount: number, addressType: CryptoCurrency, randomSatoshis: boolean | number): number => {
   if (amount === 0) {
     return 0;
   }
-  let nSatoshis: number;
-  let random: number;
-  let randomizedAmount: number;
-  let ret: number;
+  let nSatoshis: number
+  let random: number
+  let randomizedAmount: number
+  let ret: number
   switch (addressType) {
     case 'BCH':
-      nSatoshis = getNSatoshis(amount, randomSatoshis, 8);
-      random = Math.floor(Math.random() * 10 ** nSatoshis) * 1e-8;
+      nSatoshis = getNSatoshis(amount, randomSatoshis, 8)
+      random = Math.floor(Math.random() * 10 ** nSatoshis) * 1e-8
 
       randomizedAmount =
         Math.max(0, +amount.toFixed(nSatoshis)) + // zero out the least-significant digits
-        random;
+        random
       ret = +randomizedAmount.toFixed(8);
-      break;
+      break
     case 'XEC':
-      nSatoshis = getNSatoshis(amount, randomSatoshis, 2);
-      random = Math.floor(Math.random() * 10 ** nSatoshis) * 1e-2;
+      nSatoshis = getNSatoshis(amount, randomSatoshis, 2)
+      random = Math.floor(Math.random() * 10 ** nSatoshis) * 1e-2
 
-      const multiplier = 10 ** (nSatoshis - 2);
-      randomizedAmount =
-        Math.max(0, +(Math.floor(amount / multiplier) * multiplier)) + // zero out the least-significant digits
-        random;
+        const multiplier = 10 ** (nSatoshis - 2)
+        randomizedAmount = Math.max(0, +(Math.floor(amount / multiplier) * multiplier)) + // zero out the least-significant digits
+        random
       ret = +randomizedAmount.toFixed(2);
-      break;
+      break
     default:
-      throw new Error(`Invalid currency: ${addressType}`);
+      throw new Error(`Invalid currency: ${addressType}`)
   }
-  return ret;
+  return ret
 };
 
 export default randomizeSatoshis;

react/package.json

@@ -19,12 +19,13 @@
   },
   "scripts": {
     "build": "tsc --p ./tsconfig-build.json && microbundle --jsx React.createElement --format modern,cjs",
-    "lint": "eslint 'lib/**/*.{js,jsx,ts,tsx,json,css,scss,md}' --fix",
-    "prettier": "prettier --write 'lib/**/*.{js,jsx,ts,tsx,json,css,scss,md}'",
+    "lint": "eslint 'lib/**/*.{ts,tsx}' --fix",
+    "prettier": "prettier --write 'lib/**/*.ts'",
     "dev": "concurrently yarn:watch yarn:storybook",
     "storybook": "start-storybook -p 6006",
     "watch": "microbundle watch --jsx React.createElement --no-compress --format modern,cjs",
-    "test": "jest"
+    "test": "jest",
+    "test:coverage": "jest --coverage"
   },
   "peerDependencies": {
     "react": "17.0.0",