fix: move currencies to common package

0xflair · Dec 24, 2022 · 4f8375d · 4f8375d
1 parent db6173c
commit 4f8375d
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 33 deletions.
diff --git a/...e/crypto-currency/constants/currencies.ts → packages/common/src/constants/currencies.ts b/...e/crypto-currency/constants/currencies.ts → packages/common/src/constants/currencies.ts
@@ -1,6 +1,5 @@
-import { ChainId } from '@flair-sdk/common';
-
-import { BaseCurrency, CryptoCurrency } from '../types';
+import { BaseCurrency, CryptoCurrency } from '../types/currencies';
+import { ChainId } from './chain-id';
 
 export const KNOWN_BASE_CURRENCIES: BaseCurrency[] = ['USD'];
 

diff --git a/packages/common/src/constants/index.ts b/packages/common/src/constants/index.ts
@@ -1,2 +1,3 @@
 export * from './chain-id';
+export * from './currencies';
 export * from './erc20s';
diff --git a/...s/react/src/core/crypto-currency/types.ts → packages/common/src/types/currencies.ts b/...s/react/src/core/crypto-currency/types.ts → packages/common/src/types/currencies.ts
@@ -1,4 +1,4 @@
-import { ChainId } from '@flair-sdk/common';
+import { ChainId } from '../constants/chain-id';
 
 export type CryptoSymbol = 'ETH' | 'MATIC' | string;
 

diff --git a/packages/common/src/types/index.ts b/packages/common/src/types/index.ts
@@ -1,3 +1,4 @@
+export * from './currencies';
 export * from './env';
 export * from './error';
 export * from './transactions';

diff --git a/packages/react/src/core/crypto-currency/components/CryptoPrice/CryptoPrice.test.tsx b/packages/react/src/core/crypto-currency/components/CryptoPrice/CryptoPrice.test.tsx
diff --git a/packages/react/src/core/crypto-currency/components/CryptoPrice/CryptoPrice.tsx b/packages/react/src/core/crypto-currency/components/CryptoPrice/CryptoPrice.tsx
@@ -1,8 +1,8 @@
+import { BaseCurrency, CryptoSymbol, CryptoUnits } from '@flair-sdk/common';
 import { BigNumberish, ethers } from 'ethers';
 import { useMemo } from 'react';
 
 import { useCryptoCurrency } from '../../hooks';
-import { BaseCurrency, CryptoSymbol, CryptoUnits } from '../../types';
 
 type Props = {
   value?: string | BigNumberish;

diff --git a/packages/react/src/core/crypto-currency/components/CryptoValue/CryptoValue.tsx b/packages/react/src/core/crypto-currency/components/CryptoValue/CryptoValue.tsx
@@ -1,8 +1,8 @@
+import { CryptoSymbol, CryptoUnits } from '@flair-sdk/common';
 import { BigNumber, BigNumberish, ethers } from 'ethers';
 import { ReactNode, useMemo } from 'react';
 
 import { useCryptoCurrency } from '../../hooks';
-import { CryptoSymbol, CryptoUnits } from '../../types';
 import { CryptoPrice } from '../CryptoPrice/CryptoPrice';
 
 type Props = {

diff --git a/packages/react/src/core/crypto-currency/constants/index.ts b/packages/react/src/core/crypto-currency/constants/index.ts
diff --git a/packages/react/src/core/crypto-currency/hooks/useCryptoCurrency.ts b/packages/react/src/core/crypto-currency/hooks/useCryptoCurrency.ts
@@ -1,6 +1,9 @@
-import { DOLLAR_STABLECOIN_SYMBOLS } from '@flair-sdk/common';
+import {
+  BaseCurrency,
+  CryptoSymbol,
+  DOLLAR_STABLECOIN_SYMBOLS,
+} from '@flair-sdk/common';
 
-import { BaseCurrency, CryptoSymbol } from '../types';
 import { useCryptoInfo } from './useCryptoInfo';
 import { useCryptoPrice } from './useCryptoPrice';
 

diff --git a/packages/react/src/core/crypto-currency/hooks/useCryptoInfo.ts b/packages/react/src/core/crypto-currency/hooks/useCryptoInfo.ts
@@ -1,4 +1,4 @@
-import { KNOWN_CRYPTO_CURRENCIES } from '../constants/currencies';
+import { KNOWN_CRYPTO_CURRENCIES } from '@flair-sdk/common';
 
 export const useCryptoInfo = (symbol?: string) => {
   return KNOWN_CRYPTO_CURRENCIES.find((c) =>

diff --git a/packages/react/src/core/crypto-currency/hooks/useCryptoPrice.ts b/packages/react/src/core/crypto-currency/hooks/useCryptoPrice.ts
@@ -1,7 +1,7 @@
+import { BaseCurrency, CryptoSymbol } from '@flair-sdk/common';
 import { BigNumberish, ethers } from 'ethers';
 
 import { useCryptoPricesContext } from '../providers';
-import { BaseCurrency, CryptoSymbol } from '../types';
 
 type Config = {
   amount?: BigNumberish;

diff --git a/packages/react/src/core/crypto-currency/index.ts b/packages/react/src/core/crypto-currency/index.ts
@@ -1,5 +1,3 @@
 export * from './components';
-export * from './constants';
 export * from './hooks';
 export * from './providers';
-export * from './types';
diff --git a/packages/react/src/core/crypto-currency/providers/coingecko.tsx b/packages/react/src/core/crypto-currency/providers/coingecko.tsx
@@ -1,17 +1,14 @@
-import { DOLLAR_STABLECOIN_SYMBOLS } from '@flair-sdk/common';
-import axios from 'axios';
-import React from 'react';
-
-import {
-  KNOWN_BASE_CURRENCIES,
-  KNOWN_CRYPTO_CURRENCIES,
-} from '../constants/currencies';
 import {
   BaseCurrency,
   CryptoCurrency,
   CryptoPriceDictionary,
   CryptoSymbol,
-} from '../types';
+  DOLLAR_STABLECOIN_SYMBOLS,
+  KNOWN_BASE_CURRENCIES,
+  KNOWN_CRYPTO_CURRENCIES,
+} from '@flair-sdk/common';
+import axios from 'axios';
+import React from 'react';
 
 type PricesDictionariesBySymbol = Record<CryptoSymbol, CryptoPriceDictionary>;
 

diff --git a/packages/react/src/modules/finance/tiered-sales/components/TieredSalesSelector.tsx b/packages/react/src/modules/finance/tiered-sales/components/TieredSalesSelector.tsx
@@ -1,4 +1,4 @@
-import { classNames } from '@flair-sdk/common';
+import { classNames, CryptoSymbol } from '@flair-sdk/common';
 import { RadioGroup } from '@headlessui/react';
 import { CheckCircleIcon } from '@heroicons/react/solid/esm/index.js';
 import { Chain } from '@wagmi/chains';
@@ -7,7 +7,6 @@ import { ReactNode, useEffect } from 'react';
 
 import { useChainInfo } from '../../../../common';
 import {
-  CryptoSymbol,
   CryptoValue,
   IfWalletConnected,
   useRemoteJsonReader,