Merge branch 'main' into remove-nft-and-airdrop-related-modals

DarkFlorist · Jan 2, 2024 · a3f4cfd · a3f4cfd
2 parents 5aab108 + 634753c
commit a3f4cfd
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 179 deletions.
diff --git a/src/components/Button/LoadingButtonSpinner.tsx b/src/components/Button/LoadingButtonSpinner.tsx
diff --git a/src/components/Button/index.tsx b/src/components/Button/index.tsx
@@ -6,8 +6,6 @@ import styled, { DefaultTheme, useTheme } from 'styled-components'
 
 import { RowBetween } from '../Row'
 
-export { default as LoadingButtonSpinner } from './LoadingButtonSpinner'
-
 type ButtonProps = Omit<ButtonPropsOriginal, 'css'>
 
 const ButtonOverlay = styled.div`

diff --git a/src/components/swap/__snapshots__/SwapBuyFiatButton.test.tsx.snap b/src/components/swap/__snapshots__/SwapBuyFiatButton.test.tsx.snap
diff --git a/src/constants/tokens.ts b/src/constants/tokens.ts
@@ -96,13 +96,6 @@ export const DAI_OPTIMISM = new Token(
   'DAI',
   'Dai stable coin'
 )
-export const MATIC = new Token(
-  ChainId.MAINNET,
-  '0x7d1afa7b718fb893db30a3abc0cfc608aacfebb0',
-  18,
-  'MATIC',
-  'Polygon Matic'
-)
 export const DAI_POLYGON = new Token(
   ChainId.POLYGON,
   '0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063',

diff --git a/src/hooks/useIsNotOriginCountry.ts b/src/hooks/useIsNotOriginCountry.ts