Squashed commit of the following:

commit f2ccec2
Author: Vitalsine85 <rob@creative-element.net>
Date:   Mon Aug 7 12:51:42 2023 -0400

    Try to rollback fontawesome packages

commit 7ddda1c
Author: Vitalsine85 <rob@creative-element.net>
Date:   Fri Aug 4 15:54:02 2023 -0400

    fix tsconfig

commit 26919e1
Author: Vitalsine85 <rob@creative-element.net>
Date:   Fri Aug 4 15:49:32 2023 -0400

    fontawesome is borking build

commit 5c8e486
Author: Vitalsine85 <rob@creative-element.net>
Date:   Fri Aug 4 15:42:58 2023 -0400

    ...again

commit 3c48095
Author: Vitalsine85 <rob@creative-element.net>
Date:   Fri Aug 4 15:36:42 2023 -0400

    fix build error... again

commit 27029de
Author: Vitalsine85 <rob@creative-element.net>
Date:   Fri Aug 4 15:33:42 2023 -0400

    fix build error

commit 7578509
Author: Vitalsine85 <rob@creative-element.net>
Date:   Fri Aug 4 15:28:18 2023 -0400

    Remove unused files, fix build errors

commit f3c218b
Author: Vitalsine85 <rob@creative-element.net>
Date:   Fri Aug 4 14:11:12 2023 -0400

    update packages

commit 62c2547
Merge: ac24725 68f7b5a
Author: Vitalsine85 <rob@creative-element.net>
Date:   Thu Aug 3 11:00:45 2023 -0400

    Merge branch 'master' into staging

commit ac24725
Author: Vitalsine85 <rob@creative-element.net>
Date:   Wed Jul 12 11:13:51 2023 -0400

    fix connect-src header

commit 6c85813
Merge: 3081e62 f722ad8
Author: Vitalsine85 <rob@creative-element.net>
Date:   Wed Jul 12 10:30:51 2023 -0400

    Merge branch 'master' into staging

commit 3081e62
Author: Vitalsine85 <rob@creative-element.net>
Date:   Wed Jul 12 01:12:46 2023 -0400

    update img-src header

commit d5529be
Author: Vitalsine85 <rob@creative-element.net>
Date:   Wed Jul 12 01:04:01 2023 -0400

    fix walletconnect 2

package.json

@@ -1,11 +1,11 @@
 {
  "name": "bao-app",
- "version": "2.0.5",
+ "version": "2.1.0",
  "private": true,
  "scripts": {
  "analyze": "cross-env ANALYZE=true yarn build && serve .next -n",
  "dev": "cross-env NODE_OPTIONS='--inspect' next dev",
- "build": "npx next build && npm run export",
+ "build": "npx next build",
  "winBuild": "cross-env ANALYZE=true next build",
  "start": "npx next start",
  "export": "npx next export",
@@ -36,15 +36,13 @@
  ]
  },
  "devDependencies": {
- "@dethcrypto/eth-sdk": "^0.3.3",
- "@dethcrypto/eth-sdk-client": "^0.1.6",
  "@next/bundle-analyzer": "^12.2.4",
  "eslint": "8.21.0",
- "eslint-config-next": "12.2.4",
- "eslint-config-prettier": "^8.5.0",
- "eslint-plugin-prettier": "^4.2.1",
- "eslint-plugin-simple-import-sort": "^7.0.0",
- "eslint-plugin-unused-imports": "^2.0.0"
+ "eslint-config-next": "^12.2.4",
+ "eslint-config-prettier": "^8.10.0",
+ "eslint-plugin-prettier": "^5.0.0",
+ "eslint-plugin-simple-import-sort": "^10.0.0",
+ "eslint-plugin-unused-imports": "^3.0.0"
  },
  "next-unused": {
  "debug": true,
@@ -62,93 +60,76 @@
  "showDetails": true
  },
  "dependencies": {
- "@apollo/client": "^3.4.1",
+ "@apollo/client": "^3.7.17",
  "@enzoferey/ethers-error-parser": "^0.2.3",
- "@ethersproject/abstract-signer": "^5.7.0",
  "@ethersproject/contracts": "^5.7.0",
- "@ethersproject/providers": "^5.7.1",
+ "@ethersproject/providers": "^5.7.2",
  "@fortawesome/fontawesome-svg-core": "^6.1.1",
  "@fortawesome/free-brands-svg-icons": "^6.1.1",
  "@fortawesome/free-regular-svg-icons": "^6.2.0",
  "@fortawesome/free-solid-svg-icons": "^6.1.1",
  "@fortawesome/react-fontawesome": "^0.1.14",
- "@gnosis.pm/safe-apps-web3-react": "^1.5.1",
- "@headlessui/react": "^1.6.6",
- "@heroicons/react": "^2.0.10",
- "@material-tailwind/react": "^1.2.3",
- "@material-ui/pickers": "^3.3.10",
- "@metamask/providers": "^10.2.1",
- "@tailwindcss/forms": "^0.5.3",
- "@tanstack/react-query": "^4.3.4",
- "@tanstack/react-query-devtools": "^4.11.0",
- "@typechain/ethers-v5": "^10.1.0",
- "@types/bignumber.js": "^5.0.0",
- "@types/d3-array": "^3.0.3",
- "@types/jest": "^27.5.1",
- "@types/lodash": "^4.14.182",
- "@types/node": "18.6.4",
- "@types/react": "18.0.15",
- "@types/react-datepicker": "^4.4.2",
- "@types/react-dom": "18.0.6",
+ "@gnosis.pm/safe-apps-web3-react": "^1.5.3",
+ "@headlessui/react": "^1.7.16",
+ "@heroicons/react": "^2.0.18",
+ "@material-tailwind/react": "^2.0.8",
+ "@metamask/providers": "^11.1.0",
+ "@next/eslint-plugin-next": "^12.2.4",
+ "@tailwindcss/forms": "^0.5.4",
+ "@tanstack/react-query": "~4.3.4",
+ "@tanstack/react-query-devtools": "~4.3.4",
+ "@typechain/ethers-v5": "10.1.0",
+ "@types/d3-array": "^3.0.5",
+ "@types/jest": "^29.5.3",
+ "@types/lodash": "^4.14.196",
+ "@types/node": "^20.4.6",
+ "@types/react": "^18.2.18",
+ "@types/react-datepicker": "^4.15.0",
+ "@types/react-dom": "^18.2.7",
  "@typescript-eslint/eslint-plugin": "^5.26.0",
  "@typescript-eslint/parser": "^5.2.0",
- "@unstoppabledomains/resolution": "^8.3.3",
- "@visx/curve": "^2.1.0",
- "@visx/responsive": "^2.10.0",
- "@visx/scale": "^2.1.0",
- "@visx/shape": "^2.10.0",
- "@visx/visx": "^2.10.0",
+ "@unstoppabledomains/resolution": "^9.1.0",
+ "@visx/event": "^3.3.0",
+ "@visx/group": "^3.3.0",
+ "@visx/shape": "^3.3.0",
+ "@visx/text": "^3.3.0",
+ "@visx/visx": "^3.3.0",
  "@walletconnect/ethereum-provider": "^2.9.0",
  "@walletconnect/modal": "^2.5.9",
- "@web3-react/abstract-connector": "^6.0.7",
  "@web3-react/core": "^6.1.9",
  "@web3-react/injected-connector": "^6.0.7",
  "@web3-react/network-connector": "^6.2.9",
  "@web3-react/walletlink-connector": "^6.2.13",
  "animate.css": "^4.1.1",
- "autoprefixer": "^10.4.8",
- "bignumber.js": "^9.0.1",
- "chalk": "^5.1.2",
- "classnames": "^2.3.1",
+ "bignumber.js": "^9.1.1",
+ "classnames": "^2.3.2",
+ "clsx": "^2.0.0",
  "cross-env": "^7.0.3",
- "d3-array": "^3.0.1",
- "date-fns": "^2.29.3",
- "dayjs": "^1.11.6",
- "eth-ui": "^1.0.1",
- "ethereum-multicall": "^2.15.0",
+ "date-fns": "^2.30.0",
+ "ethereum-multicall": "^2.19.0",
  "ethers": "^5",
- "framer-motion": "^7.2.1",
+ "framer-motion": "^10.15.0",
  "graphql": "^16.7.1",
- "graphql-tag": "^2.12.6",
- "heroicons": "^2.0.10",
  "lodash": "^4.17.21",
- "lottie-react": "^2.3.1",
- "merkletreejs": "^0.3.0",
  "next": "^12.2.5",
- "next-seo": "^5.5.0",
+ "next-seo": "^6.1.0",
  "next-unused": "^0.0.6",
- "polished": "^4.1.3",
- "postcss": "^8.4.14",
+ "postcss": "^8.4.27",
  "postcss-flexbugs-fixes": "^5.0.2",
- "postcss-preset-env": "^7.7.2",
- "prettier": "^2.7.1",
+ "postcss-preset-env": "^9.1.0",
+ "prettier": "^3.0.1",
  "prettier-plugin-tailwindcss": "^0.1.13",
- "rc-slider": "^10.1.0",
+ "rc-slider": "^10.2.1",
  "react": "^18.1.0",
  "react-circular-progressbar": "^2.0.4",
- "react-datepicker": "^4.8.0",
- "react-device-detect": "^2.2.2",
+ "react-device-detect": "^2.2.3",
  "react-dom": "^18.1.0",
- "react-latex-next": "^2.2.0",
  "react-notifications-component": "^4.0.1",
- "react-responsive": "^9.0.0-beta.10",
- "react-scripts": "4.0.3",
- "react-spinners": "^0.13.4",
- "react-spring": "^9.2.4",
- "tailwindcss": "^3.3.1",
+ "react-spinners": "^0.13.8",
+ "react-spring": "^9.7.2",
+ "tailwindcss": "^3.3.3",
  "tailwindcss-text-fill-stroke": "^2.0.0-beta.1",
- "typechain": "^8.1.1",
- "typescript": "4.7.4",
- "urql": "^4.0.5"
+ "typechain": "8.1.1",
+ "typescript": "4.7.4"
  }
 }

src/bao/lib/config.ts

@@ -531,6 +531,8 @@ export default {
  aSUSD: '#1FC9A8',
  aDAI: '#F5AC37',
  aUSDC: '#2775CA',
+ DAI: '#F5AC37',
+ USDC: '#2775CA',
  },
  desc: 'Low risk stablecoin basket',
  swap: 'https://curve.fi/factory-crypto/61',