Merge branch 'main' into brave-browser

.gitignore

@@ -12,7 +12,6 @@
 /.nyc_output
 /reports
 
-
 /src/static/contracts/compiled/*.ts
 /src/static/compiled/*.json
 
@@ -35,10 +34,13 @@ cypress/screenshots
 cypress/videos
 cypress.env.json
 
+tsconfig.tsbuildinfo
+
 # vercel
 .now
 .vercel
 .env
+.env.local
 
 .eslintcache
 

README.md

@@ -6,7 +6,13 @@ Rari Capital's Web3 Portal.
 
 - Run `npm run dev` to start the development server.
 - Run `npm run build` to build a production bundle
-- Run `npm run bump-rari-components` to automatically install the latest version (i.e. most recent commit hash) of rari-components and update `package.json`.
+- Run `npm run bump-rari-components` to automatically install the latest version (i.e. most recent commit hash) of [rari-components](https://github.com/Rari-Capital/rari-components) and update `package.json`.
+- Run `npm run typecheck` to typecheck
+
+## Environment
+
+- Set `NEXT_PUBLIC_USE_MOCKS` to `true` to test the dapp with mock objects (e.g. `NEXT_PUBLIC_USE_MOCKS=true npm run dev`).
+  - Currently, this env var is only used in the Turbo code — <kbd>Ctrl+F</kbd> for `process.env.NEXT_PUBLIC_USE_MOCKS` to see the specific use sites.
 
 ## Requirements
 

next.config.js

@@ -24,11 +24,11 @@ module.exports = withBundleAnalyzer({
 
     config.module.rules.push({
       test: /\.tsx?/,
-      // Transpile rari-components, even though it is in node_modules
-      include: [/node_modules\/rari-components/],
+      // Transpile rari-components
+      include: [/rari-components/],
       use: "next-swc-loader",
     });
 
     return config;
   },
-});
+});

package.json

@@ -6,7 +6,7 @@
     "@0xsequence/multicall": "^0.35.5",
     "@aave/protocol-v2": "^1.0.1",
     "@chakra-ui/icons": "^1.0.0",
-    "@chakra-ui/react": "^1.8.1",
+    "@chakra-ui/react": "1.8.1",
     "@emotion/react": "^11.0.0",
     "@emotion/styled": "^11.0.0",
     "@walletconnect/web3-provider": "^1.4.1",
@@ -35,7 +35,7 @@
     "node-fetch": "^2.6.1",
     "node-vibrant": "^3.1.6",
     "polished": "^4.1.3",
-    "rari-components": "github:Rari-Capital/rari-components#1131c95058f26b36048d9cfe507abb15ae5adaa8",
+    "rari-components": "github:Rari-Capital/rari-components#144451807e8673b4586274adfb8e78346ab32fce",
     "rari-tokens-generator": "^2.0.0",
     "react": "^17.0.2",
     "react-apexcharts": "1.3.7",
@@ -45,6 +45,7 @@
     "react-error-boundary": "^3.0.2",
     "react-fast-marquee": "^1.1.3",
     "react-infinite-scroll-hook": "^4.0.1",
+    "react-intersection-observer": "^8.34.0",
     "react-jazzicon": "^0.1.3",
     "react-query": "^3.13.10",
     "react-responsive-carousel": "^3.2.18",
@@ -61,7 +62,7 @@
   },
   "scripts": {
     "bump-rari-components": "rm -rf .next && npm i \"git+https://github.com/Rari-Capital/rari-components#$(git ls-remote https://github.com/Rari-Capital/rari-components.git HEAD | awk '{ print $1}')\"",
-    "typecheck": "tsc --skipLibCheck -p ./tsconfig.json",
+    "typecheck": "tsc --noEmit",
     "postinstall": "rari-tokens-generator ./src/static/compiled/tokens.json",
     "start": "next start",
     "build": "next build",

src/components/pages/Fuse/FusePoolsPage/PoolRow.tsx

@@ -115,12 +115,12 @@ export const PoolRow = ({
               <Center height="100%" width="13%">
                 <b>{poolNumber}</b>
               </Center>
-              <Center height="100%" width="16%">
-                <b>{smallUsdFormatter(tvl)}</b>
-              </Center>
-              <Center height="100%" width="16%">
-                <b>{smallUsdFormatter(borrowed)}</b>
-              </Center>
+                <Center height="100%" width="16%">
+                  <b>{smallUsdFormatter(tvl)}</b>
+                </Center>
+                <Center height="100%" width="16%">
+                  <b>{smallUsdFormatter(borrowed)}</b>
+                </Center>
             </>
           )}
         </Row>