Merge pull request #335 from reflexer-labs/develop

Develop
reflexer-labs · Mar 17, 2023 · 412e903 · 412e903
2 parents 1848472 + cbfd9f2
commit 412e903
Show file tree

Hide file tree

Showing 33 changed files with 153 additions and 99 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -46,7 +46,7 @@ jobs:
  - name: Set up node
  uses: actions/setup-node@v2
  with:
- node-version: 14
+ node-version: 16
  registry-url: https://registry.npmjs.org
 
  - name: Install dependencies

diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -28,7 +28,7 @@ jobs:
  - name: Set up node
  uses: actions/setup-node@v1
  with:
- node-version: 14
+ node-version: 16
  registry-url: https://registry.npmjs.org
 
  - name: Install dependencies

diff --git a/package.json b/package.json
@@ -47,13 +47,13 @@
  "react-i18next": "^11.7.2",
  "react-lottie-player": "^1.4.1",
  "react-paginate": "^6.5.0",
- "react-router-dom": "^5.2.0",
- "react-scripts": "3.4.3",
+ "react-router-dom": "^5.3.0",
+ "react-scripts": "4.0.3",
  "react-toastify": "^6.0.9",
  "react-tooltip": "^4.2.21",
  "react-transition-group": "^4.4.1",
  "styled-components": "^5.2.0",
- "typescript": "3.8.3",
+ "typescript": "^4.4.3",
  "walletlink": "^2.1.0",
  "web3-react-types": "npm:@web3-react/types@^6.0.7"
  },
@@ -66,7 +66,11 @@
  "eject": "react-scripts eject"
  },
  "eslintConfig": {
- "extends": "react-app"
+ "extends": "react-app",
+ "rules": {
+ "@typescript-eslint/no-redeclare": "off",
+ "no-redeclare": "off"
+ }
  },
  "browserslist": {
  "production": [
@@ -89,7 +93,7 @@
  "@types/react-copy-to-clipboard": "^4.3.0",
  "@types/react-custom-scrollbars": "^4.0.7",
  "@types/react-paginate": "^6.2.1",
- "@types/react-router-dom": "^5.1.5",
+ "@types/react-router-dom": "^5.3.0",
  "@types/react-slider": "^1.1.2",
  "@types/react-transition-group": "^4.4.0",
  "@types/styled-components": "^5.1.3",
@@ -109,7 +113,8 @@
  },
  "resolutions": {
  "@types/react": "17.0.2",
- "@types/react-dom": "17.0.2"
+ "@types/react-dom": "17.0.2",
+ "react-error-overlay": "6.0.9"
  },
  "husky": {
  "hooks": {

diff --git a/src/ErrorBoundary.tsx b/src/ErrorBoundary.tsx
@@ -26,7 +26,10 @@ class ErrorBoundary extends React.Component<Props, State> {
  return (
  <Container>
  <Content>
- <img src={require('./assets/error.svg')} alt="" />
+ <img
+ src={require('./assets/error.svg').default}
+ alt=""
+ />
  <h2>Something went wrong.</h2>
  <Details>
  {this.state.error && this.state.error.toString()}

diff --git a/src/GlobalStyle.tsx b/src/GlobalStyle.tsx
@@ -8,7 +8,7 @@ const GlobalStyle = createGlobalStyle`
  body {
  color: ${(props) => props.theme.colors.primary};
  background-color:${(props) => props.theme.colors.background};
- background-image: url(${require('./assets/boxes.svg')});
+ background-image: url(${require('./assets/boxes.svg').default});
  background-size: contain;
  background-position: center 100px;
  background-repeat: no-repeat;

diff --git a/src/components/ApproveToken.tsx b/src/components/ApproveToken.tsx
@@ -141,7 +141,7 @@ const ApproveToken = ({
  await txResponse.wait()
  await timeout(10000)
  setIsPaid(true)
- } catch (e) {
+ } catch (e: any) {
  popupsActions.setBlockBackdrop(false)
  if (e?.code === 4001) {
  setTextPayload({

diff --git a/src/components/AuctionBlock.tsx b/src/components/AuctionBlock.tsx
@@ -213,11 +213,13 @@ const AuctionBlock = (auction: Props) => {
  <Header onClick={() => setCollapse(!collapse)}>
  <LeftAucInfo type={eventType.toLowerCase()}>
  <img
- src={require(`../assets/${
- eventType === 'STAKED_TOKEN'
- ? 'flx_uni_eth'
- : eventType.toLowerCase()
- }.svg`)}
+ src={
+ require(`../assets/${
+ eventType === 'STAKED_TOKEN'
+ ? 'flx_uni_eth'
+ : eventType.toLowerCase()
+ }.svg`).default
+ }
  alt="debt type auction"
  />
 

diff --git a/src/components/AuctionsFAQ.tsx b/src/components/AuctionsFAQ.tsx
@@ -27,51 +27,51 @@ const AuctionsFAQ = ({ type }: Props) => {
  {
  title: t('debt_auction_minting_flx_header'),
  desc: t('debt_auction_minting_flx_desc'),
- image: require('../assets/mine.svg'),
+ image: require('../assets/mine.svg').default,
  },
  {
  title: t('debt_auction_how_to_bid'),
  desc: t('debt_auction_how_to_bid_desc'),
- image: require('../assets/bid.svg'),
+ image: require('../assets/bid.svg').default,
  },
  {
  title: t('debt_auction_claim_tokens'),
  desc: t('debt_auction_claim_tokens_desc'),
- image: require('../assets/claim.svg'),
+ image: require('../assets/claim.svg').default,
  },
  ],
  surplus: [
  {
  title: t('surplus_auction_minting_flx_header'),
  desc: t('surplus_auction_minting_flx_desc'),
- image: require('../assets/sell-rai.svg'),
+ image: require('../assets/sell-rai.svg').default,
  },
  {
  title: t('surplus_auction_how_to_bid'),
  desc: t('surplus_auction_how_to_bid_desc'),
- image: require('../assets/bid.svg'),
+ image: require('../assets/bid.svg').default,
  },
  {
  title: t('surplus_auction_claim_tokens'),
  desc: t('surplus_auction_claim_tokens_desc'),
- image: require('../assets/claim.svg'),
+ image: require('../assets/claim.svg').default,
  },
  ],
  staked_token: [
  {
  title: t('staked_auction_minting_flx_header'),
  desc: t('staked_auction_minting_flx_desc'),
- image: require('../assets/sell-rai.svg'),
+ image: require('../assets/sell-rai.svg').default,
  },
  {
  title: t('staked_auction_how_to_bid'),
  desc: t('staked_auction_how_to_bid_desc'),
- image: require('../assets/bid.svg'),
+ image: require('../assets/bid.svg').default,
  },
  {
  title: t('staked_auction_claim_tokens'),
  desc: t('staked_auction_claim_tokens_desc'),
- image: require('../assets/claim.svg'),
+ image: require('../assets/claim.svg').default,
  },
  ],
  }

diff --git a/src/components/AuctionsOperations/AuctionsPayment.tsx b/src/components/AuctionsOperations/AuctionsPayment.tsx
@@ -296,9 +296,6 @@ const AuctionsPayment = () => {
  }
 
  const returnClaimValues = () => {
- if (Number(internalBalance) > 0) {
- return { amount: internalBalance, symbol: 'RAI' }
- }
  if (Number(protInternalBalance) > 0) {
  return { amount: protInternalBalance, symbol: 'FLX' }
  }

diff --git a/src/components/Button.tsx b/src/components/Button.tsx
@@ -59,15 +59,15 @@ const Button = ({
  <DimmedBtn {...rest} disabled={disabled} onClick={onClick}>
  {arrowPlacement === 'left' ? (
  <img
- src={require('../assets/dark-arrow.svg')}
+ src={require('../assets/dark-arrow.svg').default}
  alt={''}
  />
  ) : null}
  {text && t(text)}
  {arrowPlacement === 'right' ? (
  <img
  className="rotate"
- src={require('../assets/dark-arrow.svg')}
+ src={require('../assets/dark-arrow.svg').default}
  alt={''}
  />
  ) : null}

diff --git a/src/components/ConnectedWalletIcon.tsx b/src/components/ConnectedWalletIcon.tsx
@@ -22,7 +22,10 @@ const ConnectedWalletIcon = ({ size }: Props) => {
  return (
  <IconWrapper size={size || 16}>
  <img
- src={require('../assets/connectors/walletConnectIcon.svg')}
+ src={
+ require('../assets/connectors/walletConnectIcon.svg')
+ .default
+ }
  alt={'wallet connect logo'}
  />
  </IconWrapper>
@@ -31,7 +34,10 @@ const ConnectedWalletIcon = ({ size }: Props) => {
  return (
  <IconWrapper size={size || 16}>
  <img
- src={require('../assets/connectors/coinbaseWalletIcon.svg')}
+ src={
+ require('../assets/connectors/coinbaseWalletIcon.svg')
+ .default
+ }
  alt={'coinbase wallet logo'}
  />
  </IconWrapper>

diff --git a/src/components/CookieBanner.tsx b/src/components/CookieBanner.tsx
@@ -16,7 +16,7 @@ const CookieBanner = () => {
  }}
  >
  <CookiesText>
- <img src={require('../assets/cookie.svg')} alt="" />
+ <img src={require('../assets/cookie.svg').default} alt="" />
  This website uses cookies to enhance the user experience. By
  continuing to browse the site you're agreeing to our
  <CustomLink

diff --git a/src/components/ImagePreloader.tsx b/src/components/ImagePreloader.tsx
@@ -1,30 +1,30 @@
 import React from 'react'
 
 const INITIAL_STATE = [
- require('../assets/brand-white.svg'),
- require('../assets/dark-arrow.svg'),
- require('../assets/connectors/walletConnectIcon.svg'),
- require('../assets/connectors/coinbaseWalletIcon.svg'),
- require('../assets/cookie.svg'),
- require('../assets/caret.png'),
- require('../assets/caret-up.svg'),
- require('../assets/arrow-up.svg'),
- require('../assets/LogoIcon.png'),
- require('../assets/arrow.svg'),
- require('../assets/uniswap-icon.svg'),
- require('../assets/logo192.png'),
- require('../assets/connectors/metamask.png'),
- require('../assets/saviour.svg'),
- require('../assets/account-img.png'),
- require('../assets/wallet-img.png'),
- require('../assets/safe-img.png'),
+ require('../assets/brand-white.svg').default,
+ require('../assets/dark-arrow.svg').default,
+ require('../assets/connectors/walletConnectIcon.svg').default,
+ require('../assets/connectors/coinbaseWalletIcon.svg').default,
+ require('../assets/cookie.svg').default,
+ require('../assets/caret.png').default,
+ require('../assets/caret-up.svg').default,
+ require('../assets/arrow-up.svg').default,
+ require('../assets/LogoIcon.png').default,
+ require('../assets/arrow.svg').default,
+ require('../assets/uniswap-icon.svg').default,
+ require('../assets/logo192.png').default,
+ require('../assets/connectors/metamask.png').default,
+ require('../assets/saviour.svg').default,
+ require('../assets/account-img.png').default,
+ require('../assets/wallet-img.png').default,
+ require('../assets/safe-img.png').default,
 ]
 
 const ImagePreloader = () => {
  return (
  <div style={{ display: 'none' }}>
- {INITIAL_STATE.map((img: string) => (
- <img src={img} alt="" key={img} />
+ {INITIAL_STATE.map((img: string, i: number) => (
+ <img src={img} alt="" key={img + i} />
  ))}
  </div>
  )

diff --git a/src/components/Modals/LoadingModal.tsx b/src/components/Modals/LoadingModal.tsx
@@ -16,7 +16,10 @@ const LoadingModal = () => {
  backDropColor={'rgba(255,255,255)'}
  >
  <LoaderContainer>
- <img src={require('../../assets/logo192.png')} alt={''} />
+ <img
+ src={require('../../assets/logo192.png').default}
+ alt={''}
+ />
  {popupsState.isLoadingModalOpen.text ? (
  <Text>{popupsState.isLoadingModalOpen.text}</Text>
  ) : null}

diff --git a/src/components/NavLinks.tsx b/src/components/NavLinks.tsx
@@ -107,7 +107,7 @@ const NavLinks = () => {
  >
  Staking{' '}
  <img
- src={require('../assets/dark-arrow.svg')}
+ src={require('../assets/dark-arrow.svg').default}
  alt="arrow"
  />
  </IntLink>
@@ -117,7 +117,7 @@ const NavLinks = () => {
  >
  Money God League{' '}
  <img
- src={require('../assets/dark-arrow.svg')}
+ src={require('../assets/dark-arrow.svg').default}
  alt="arrow"
  />
  </IntLink> */}
@@ -127,7 +127,7 @@ const NavLinks = () => {
  >
  Incentives{' '}
  <img
- src={require('../assets/dark-arrow.svg')}
+ src={require('../assets/dark-arrow.svg').default}
  alt="arrow"
  />
  </IntLink>
@@ -147,7 +147,7 @@ const NavLinks = () => {
  >
  Nexus Mutual{' '}
  <img
- src={require('../assets/dark-arrow.svg')}
+ src={require('../assets/dark-arrow.svg').default}
  alt="arrow"
  />
  </ExtLink>
@@ -157,7 +157,7 @@ const NavLinks = () => {
  >
  InsurAce{' '}
  <img
- src={require('../assets/dark-arrow.svg')}
+ src={require('../assets/dark-arrow.svg').default}
  alt="arrow"
  />
  </ExtLink>

diff --git a/src/components/NotificationPopup.tsx b/src/components/NotificationPopup.tsx
@@ -33,7 +33,7 @@ const NotificationPopup = () => {
  </BellBtn>
  {isOpen ? (
  <>
- <CaretImg src={require('../assets/caret-up.svg')} />
+ <CaretImg src={require('../assets/caret-up.svg').default} />
 
  <Menu>
  <Scrollbars
@@ -53,7 +53,10 @@ const NotificationPopup = () => {
  <ExternalLink href="">
  Etherscan{' '}
  <img
- src={require('../assets/arrow-up.svg')}
+ src={
+ require('../assets/arrow-up.svg')
+ .default
+ }
  alt=""
  />
  </ExternalLink>

diff --git a/src/components/SafeHistory.tsx b/src/components/SafeHistory.tsx
@@ -43,7 +43,10 @@ const SafeHistory = ({ hideHistory }: Props) => {
  <Col>
  <ExternalLink href={link} target="_blank">
  {returnWalletAddress(txHash)}{' '}
- <img src={require('../assets/arrow-up.svg')} alt="" />
+ <img
+ src={require('../assets/arrow-up.svg').default}
+ alt=""
+ />
  </ExternalLink>
  </Col>
  </Row>