Fetch upstream updates

.bundlemonrc.json

@@ -0,0 +1,29 @@
+{
+  "baseDir": "build",
+  "files": [
+    {
+      "path": "index.html"
+    },
+    {
+      "path": "**/*.<hash>.chunk.{js,css}"
+    }
+  ],
+  "groups": [
+    {
+      "path": "**/*.<hash>.{png,jpg,gif,svg}"
+    },
+    {
+      "path": "**/*.<hash>.{eot,ttf,woff,woff2}"
+    }
+  ],
+  "reportOutput": [
+    [
+      "github",
+      {
+        "checkRun": true,
+        "commitStatus": true,
+        "prComment": false
+      }
+    ]
+  ]
+}

.env.production

@@ -1,2 +1,3 @@
 REACT_APP_GOOGLE_ANALYTICS_MEASUREMENT_ID="G-8JBQYLS8HB"
 REACT_APP_NETWORK_URL="https://mainnet.infura.io/v3/28e6f2ed0e5747e6bef772f27372f62d"
+REACT_APP_INFURA_API_KEY="28e6f2ed0e5747e6bef772f27372f62d"

.eslintrc

@@ -1,4 +1,3 @@
-
 {
   "extends": [
     "eslint:recommended",
@@ -30,8 +29,16 @@
   "rules": {
     "@typescript-eslint/no-unused-vars": ["error"],
     "@typescript-eslint/ban-ts-comment": "off",
-    "no-invalid-this": 0,
     "no-unused-vars": "off",
     "sort-imports": "error"
-  }
+  },
+  "overrides": [
+    {
+      "files": ["*.ts", "*.mts", "*.cts", "*.tsx", "**/*.stories.*"],
+      "rules": {
+        "no-undef": "off",
+        "import/no-anonymous-default-export": "off"
+      }
+    }
+  ]
 }

.github/workflows/ci.yml

@@ -7,72 +7,68 @@ on:
     branches: [master]
 
 jobs:
-  lint:
+  build:
     runs-on: ubuntu-latest
-
-    env:
-      REACT_APP_NOTIFY_DAPP_ID: ${{ secrets.REACT_APP_NOTIFY_DAPP_ID }}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: "12"
+          node-version: "16.15.0"
+          cache: "npm"
       # fix for forcing git to use https when pulling deps
       - run: 'git config --global --replace-all url."https://github.com/".insteadOf ssh://[email protected]/'
       - run: npm ci
       - run: npm run build --if-present
+      - name: Run BundleMon
+        run: npm run bundlemon
+        env:
+          BUNDLEMON_PROJECT_ID: 62325f451d1b50bea48f41fb
+          CI_COMMIT_SHA: ${{github.event.pull_request.head.sha || github.sha}} # important!
+      # Keeping in case we ever want to save build artifacts
+      # - name: Zip artifact
+      #   run: zip build-artifact -r ./build
+      # - uses: actions/upload-artifact@v3
+      #   with:
+      #     name: build-artifact
+      #     path: ./build-artifact.zip
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: "16.15.0"
+          cache: "npm"
+      # fix for forcing git to use https when pulling deps
+      - run: 'git config --global --replace-all url."https://github.com/".insteadOf ssh://[email protected]/'
+      - run: npm ci
       - run: npm run lint
 
   test:
     runs-on: ubuntu-latest
-
-    env:
-      REACT_APP_NOTIFY_DAPP_ID: ${{ secrets.REACT_APP_NOTIFY_DAPP_ID }}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: "12"
+          node-version: "16.15.0"
+          cache: "npm"
       # fix for forcing git to use https when pulling deps
       - run: 'git config --global --replace-all url."https://github.com/".insteadOf ssh://[email protected]/'
       - run: npm ci
-      - run: npm run build --if-present
       - run: npm test
         env:
           CI: true
 
   coverage:
     runs-on: ubuntu-latest
-
-    env:
-      REACT_APP_NOTIFY_DAPP_ID: ${{ secrets.REACT_APP_NOTIFY_DAPP_ID }}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: "12"
+          node-version: "16.15.0"
       # fix for forcing git to use https when pulling deps
       - run: 'git config --global --replace-all url."https://github.com/".insteadOf ssh://[email protected]/'
       - run: npm ci
-      - run: npm run build --if-present
       - run: npm test -- --coverage
         env:
           CI: true
@@ -81,26 +77,31 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
 
   coverage-cypress:
+    env:
+      REACT_APP_NOTIFY_DAPP_ID: ${{ secrets.REACT_APP_NOTIFY_DAPP_ID }}
     runs-on: ubuntu-latest
     services:
       saddle-contract:
         image: saddlefinance/contracts:latest
         ports:
           - 8545:8545
-
-    env:
-      REACT_APP_NOTIFY_DAPP_ID: ${{ secrets.REACT_APP_NOTIFY_DAPP_ID }}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
-      - uses: actions/setup-node@v2
+          node-version: "16.15.0"
+          cache: "npm"
+      - name: Cache Cypress
+        id: cache-cypress
+        uses: actions/cache@v3
         with:
-          node-version: "12"
+          path: ~/.cache/Cypress
+          key: cypress-${{ runner.os }}-${{ hashFiles('package-lock.json') }}
+      # - uses: actions/download-artifact@v2
+      #   with:
+      #     name: build-artifact
+      # - name: Unzip artifact
+      #   run: unzip -qq build-artifact.zip -d .
       # fix for forcing git to use https when pulling deps
       - run: 'git config --global --replace-all url."https://github.com/".insteadOf ssh://[email protected]/'
       - run: npm ci
@@ -111,3 +112,8 @@ jobs:
       - uses: codecov/codecov-action@v1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
+      - uses: actions/upload-artifact@v3
+        if: failure()
+        with:
+          name: E2E Failures
+          path: cypress/screenshots/

.gitignore

@@ -25,10 +25,14 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+.ignore
 
 # typechain
 types/ethers-contracts
 
 # vscode
 .vscode
 .vscode/settings.json
+
+# idea
+.idea

.husky/_/husky.sh

@@ -1,10 +1,12 @@
-#!/bin/sh
+#!/usr/bin/env sh
 if [ -z "$husky_skip_init" ]; then
   debug () {
-    [ "$HUSKY_DEBUG" = "1" ] && echo "husky (debug) - $1"
+    if [ "$HUSKY_DEBUG" = "1" ]; then
+      echo "husky (debug) - $1"
+    fi
   }
 
-  readonly hook_name="$(basename "$0")"
+  readonly hook_name="$(basename -- "$0")"
   debug "starting $hook_name..."
 
   if [ "$HUSKY" = "0" ]; then
@@ -17,14 +19,18 @@ if [ -z "$husky_skip_init" ]; then
     . ~/.huskyrc
   fi
 
-  export readonly husky_skip_init=1
+  readonly husky_skip_init=1
+  export husky_skip_init
   sh -e "$0" "$@"
   exitCode="$?"
 
   if [ $exitCode != 0 ]; then
     echo "husky - $hook_name hook exited with code $exitCode (error)"
-    exit $exitCode
   fi
 
-  exit 0
+  if [ $exitCode = 127 ]; then
+    echo "husky - command not found in PATH=$PATH"
+  fi
+
+  exit $exitCode
 fi

.storybook/main.js

@@ -1,28 +1,5 @@
-const path = require("path")
-
-const toPath = (_path) => path.join(process.cwd(), _path)
-
 module.exports = {
-  "stories": [
-    "../src/**/*.stories.mdx",
-    "../src/**/*.stories.@(js|jsx|ts|tsx)"
-  ],
-  "addons": [
-    "@storybook/addon-links",
-    "@storybook/addon-essentials",
-    "@storybook/preset-create-react-app",
-  ],
-  webpackFinal: async (config) => {
-    return {
-      ...config,
-      resolve: {
-        ...config.resolve,
-        alias: {
-          ...config.resolve.alias,
-          "@emotion/core": toPath("node_modules/@emotion/react"),
-          "emotion-theming": toPath("node_modules/@emotion/react"),
-        },
-      },
-    }
-  },
-}
+  stories: ["../src/**/*.stories.mdx", "../src/**/*.stories.@(js|jsx|ts|tsx)"],
+  addons: ["@storybook/addon-links", "@storybook/addon-essentials"],
+  framework: "@storybook/react",
+}

.storybook/preview.js

@@ -0,0 +1,20 @@
+import { Divider, Paper, Typography } from "@mui/material"
+import StoryLayout from "./story-layout"
+
+export const parameters = {
+  actions: { argTypesRegex: "^on[A-Z].*" },
+  controls: {
+    matchers: {
+      color: /(background|color)$/i,
+      date: /Date$/,
+    },
+  },
+}
+
+export const decorators = [
+  (Story) => (
+    <div>
+      <StoryLayout>{Story()}</StoryLayout>
+    </div>
+  ),
+]