From c94e28259d1684ecf2ae08cf0c01729e5e1b2f26 Mon Sep 17 00:00:00 2001
From: retroboy <iberezkin90@gmail.com>
Date: Wed, 15 Nov 2023 18:04:55 +0100
Subject: [PATCH 01/19] added github configs

---
 .github/ISSUE_TEMPLATE/blank.yaml           |  12 +++
 .github/ISSUE_TEMPLATE/bug-report.yaml      |  80 +++++++++++++++
 .github/ISSUE_TEMPLATE/config.yml           |   8 ++
 .github/ISSUE_TEMPLATE/feature-request.yaml |  63 ++++++++++++
 .github/dependabot.yml                      |  12 +++
 .github/workflows/jediswap-mainnet.yml      | 107 ++++++++++++++++++++
 .github/workflows/jediswap-staging.yml      |  45 ++++++++
 .github/workflows/jediswap-testnet.yml      |  45 ++++++++
 8 files changed, 372 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/blank.yaml
 create mode 100644 .github/ISSUE_TEMPLATE/bug-report.yaml
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml
 create mode 100644 .github/ISSUE_TEMPLATE/feature-request.yaml
 create mode 100644 .github/dependabot.yml
 create mode 100644 .github/workflows/jediswap-mainnet.yml
 create mode 100644 .github/workflows/jediswap-staging.yml
 create mode 100644 .github/workflows/jediswap-testnet.yml

diff --git a/.github/ISSUE_TEMPLATE/blank.yaml b/.github/ISSUE_TEMPLATE/blank.yaml
new file mode 100644
index 00000000..c8228275
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/blank.yaml
@@ -0,0 +1,12 @@
+name: "Blank issue"
+description: Create a new blank issue.
+title: "Title"
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: "Description"
+      description: Please enter an explicit description of your issue
+      placeholder: Short and explicit description of your incident...
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yaml b/.github/ISSUE_TEMPLATE/bug-report.yaml
new file mode 100644
index 00000000..17ad80f1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yaml
@@ -0,0 +1,80 @@
+name: "🐛 Bug Report"
+description: Create a new ticket for a bug.
+title: "🐛 [BUG] - <title>"
+labels: [
+   "bug"
+]
+body:
+   - type: textarea
+     id: description
+     attributes:
+        label: "Description"
+        description: Please enter an explicit description of your issue
+        placeholder: Short and explicit description of your incident...
+     validations:
+        required: true
+   - type: input
+     id: reprod-url
+     attributes:
+        label: "Reproduction URL"
+        description: Please enter your GitHub URL to provide a reproduction of the issue
+        placeholder: ex. https://github.com/USERNAME/REPO-NAME
+     validations:
+        required: true
+   - type: textarea
+     id: reprod
+     attributes:
+        label: "Reproduction steps"
+        description: Please enter an explicit description of your issue
+        value: |
+           1. Go to '...'
+           2. Click on '....'
+           3. Scroll down to '....'
+           4. See error
+        render: bash
+     validations:
+        required: true
+   - type: textarea
+     id: screenshot
+     attributes:
+        label: "Screenshots"
+        description: If applicable, add screenshots to help explain your problem.
+        value: |
+           ![DESCRIPTION](LINK.png)
+        render: bash
+     validations:
+        required: false
+   - type: textarea
+     id: logs
+     attributes:
+        label: "Logs"
+        description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+        render: bash
+     validations:
+        required: false
+   - type: dropdown
+     id: browsers
+     attributes:
+        label: "Browsers"
+        description: What browsers are you seeing the problem on ?
+        multiple: true
+        options:
+           - Firefox
+           - Chrome
+           - Safari
+           - Microsoft Edge
+           - Opera
+     validations:
+        required: false
+   - type: dropdown
+     id: os
+     attributes:
+        label: "OS"
+        description: What is the impacted environment ?
+        multiple: true
+        options:
+           - Windows
+           - Linux
+           - Mac
+     validations:
+        required: false
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..5ffbb021
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Support
+    url: https://discord.com/invite/jediswap
+    about: Please ask and answer questions here
+  - name: List a token
+    url: https://github.com/jediswaplabs/default-token-list#adding-a-token
+    about: Any requests to add a token to Jediswap should go here
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yaml b/.github/ISSUE_TEMPLATE/feature-request.yaml
new file mode 100644
index 00000000..70c82dd3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.yaml
@@ -0,0 +1,63 @@
+name: "💡 Feature Request"
+description: Create a new ticket for a new feature request
+title: "💡 [REQUEST] - <title>"
+labels: [
+  "question"
+]
+body:
+  - type: input
+    id: start_date
+    attributes:
+      label: "Start Date"
+      description: Start of development
+      placeholder: "month/day/year"
+    validations:
+      required: false
+  - type: textarea
+    id: implementation_pr
+    attributes:
+      label: "Implementation PR"
+      description: Pull request used
+      placeholder: "#Pull Request ID"
+    validations:
+      required: false
+  - type: textarea
+    id: reference_issues
+    attributes:
+      label: "Reference Issues"
+      description: Common issues
+      placeholder: "#Issues IDs"
+    validations:
+      required: false
+  - type: textarea
+    id: summary
+    attributes:
+      label: "Summary"
+      description: Provide a brief explanation of the feature
+      placeholder: Describe in a few lines your feature request
+    validations:
+      required: true
+  - type: textarea
+    id: basic_example
+    attributes:
+      label: "Basic Example"
+      description: Indicate here some basic examples of your feature.
+      placeholder: A few specific words about your feature request.
+    validations:
+      required: true
+  - type: textarea
+    id: drawbacks
+    attributes:
+      label: "Drawbacks"
+      description: What are the drawbacks/impacts of your feature request ?
+      placeholder: Identify the drawbacks and impacts while being neutral on your feature request
+    validations:
+      required: true
+  - type: textarea
+    id: unresolved_question
+    attributes:
+      label: "Unresolved questions"
+      description: What questions still remain unresolved ?
+      placeholder: Identify any unresolved issues.
+    validations:
+      required: false
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..137b23d2
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,12 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+      day: "monday"
diff --git a/.github/workflows/jediswap-mainnet.yml b/.github/workflows/jediswap-mainnet.yml
new file mode 100644
index 00000000..f273d077
--- /dev/null
+++ b/.github/workflows/jediswap-mainnet.yml
@@ -0,0 +1,107 @@
+name: Release - Mainnet
+
+on:
+  workflow_dispatch:
+    inputs:
+      bumpType:
+        description: 'Bump version'
+        required: true
+        default: 'patch'
+        type: choice
+        options:
+          - 'patch'
+          - 'minor'
+          - 'major'
+jobs:
+  bump:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          persist-credentials: false
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+          cache: 'yarn'
+
+      - name: Automated Version Bump
+        uses: phips28/gh-action-bump-version@v9.1.4
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT }}
+        with:
+          version-type:  ${{ inputs.bumpType }}
+          tag-prefix:  'v'
+          target-branch: 'main'
+          commit-message: 'CI: bumps version to {{version}}'
+          bump-policy: 'last-commit'
+
+  cleanup:
+    runs-on: ubuntu-latest
+    needs: [bump]
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+
+      - name: Cleanup
+        run: |
+          gh extension install actions/gh-actions-cache
+          
+          REPO=${{ github.repository }}
+          BRANCH="refs/pull/${{ github.event.pull_request.number }}/merge"
+
+          echo "Fetching list of cache key"
+          cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH | cut -f 1 )
+
+          ## Setting this to not fail the workflow while deleting cache keys. 
+          set +e
+          echo "Deleting caches..."
+          for cacheKey in $cacheKeysForPR
+          do
+              gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm
+          done
+          echo "Done"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  build:
+    runs-on: ubuntu-latest
+    needs: [cleanup]
+    environment:
+      name: mainnet
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+          cache: 'yarn'
+
+      - name: Install dependencies
+        run: yarn install --immutable
+
+      - name: Build Project
+        run: yarn production-build
+        env:
+          CI: false
+          RELEASE_TYPE: 'PRODUCTION'
+
+      - name: Configure AWS
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets[format('AWS_ACCESS_KEY_ID_{0}', 'PRODUCTION')] }}
+          aws-secret-access-key: ${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', 'PRODUCTION')] }}
+          aws-region: us-east-1
+
+      - name: Deploy app build to S3 bucket
+        run: aws s3 sync ./dist/ s3://$BUCKET_NAME
+        env:
+          BUCKET_NAME: ${{ secrets[format('AWS_S3_BUCKET_NAME_{0}', 'PRODUCTION')] }}
+
+      - name: Run Cache Invalidation
+        run: aws cloudfront create-invalidation --distribution-id $CDN_DISTRIBUTION_ID --paths /\*
+        env:
+          CDN_DISTRIBUTION_ID: ${{ secrets[format('AWS_CDN_DISTRIBUTION_ID_{0}', 'PRODUCTION')] }}
diff --git a/.github/workflows/jediswap-staging.yml b/.github/workflows/jediswap-staging.yml
new file mode 100644
index 00000000..e7168665
--- /dev/null
+++ b/.github/workflows/jediswap-staging.yml
@@ -0,0 +1,45 @@
+name: Release - Staging
+
+on:
+  workflow_dispatch:
+    inputs:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    environment:
+      name: staging
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+          cache: 'yarn'
+
+      - name: Install dependencies
+        run: yarn install --immutable
+
+      - name: Build Project
+        run: yarn staging-build
+        env:
+          CI: false
+          RELEASE_TYPE: 'STAGING'
+
+      - name: Configure AWS
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets[format('AWS_ACCESS_KEY_ID_{0}', 'STAGING')] }}
+          aws-secret-access-key: ${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', 'STAGING')] }}
+          aws-region: us-east-1
+      - name: Deploy app build to S3 bucket
+        run: aws s3 sync ./dist/ s3://$BUCKET_NAME
+        env:
+          BUCKET_NAME: ${{ secrets[format('AWS_S3_BUCKET_NAME_{0}', 'STAGING')] }}
+
+      - name: Run Cache Invalidation
+        run: aws cloudfront create-invalidation --distribution-id $CDN_DISTRIBUTION_ID --paths /\*
+        env:
+          CDN_DISTRIBUTION_ID: ${{ secrets[format('AWS_CDN_DISTRIBUTION_ID_{0}', 'STAGING')] }}
diff --git a/.github/workflows/jediswap-testnet.yml b/.github/workflows/jediswap-testnet.yml
new file mode 100644
index 00000000..bf631ab1
--- /dev/null
+++ b/.github/workflows/jediswap-testnet.yml
@@ -0,0 +1,45 @@
+name: Release - Testnet
+
+on:
+  workflow_dispatch:
+    inputs:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    environment:
+      name: testnet
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+          cache: 'yarn'
+
+      - name: Install dependencies
+        run: yarn install --immutable
+
+      - name: Build Project
+        run: yarn testnet-build
+        env:
+          CI: false
+          RELEASE_TYPE: 'TESTNET'
+
+      - name: Configure AWS
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets[format('AWS_ACCESS_KEY_ID_{0}', 'TESTNET')] }}
+          aws-secret-access-key: ${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', 'TESTNET')] }}
+          aws-region: us-east-1
+      - name: Deploy app build to S3 bucket
+        run: aws s3 sync ./dist/ s3://$BUCKET_NAME
+        env:
+          BUCKET_NAME: ${{ secrets[format('AWS_S3_BUCKET_NAME_{0}', 'TESTNET')] }}
+
+      - name: Run Cache Invalidation
+        run: aws cloudfront create-invalidation --distribution-id $CDN_DISTRIBUTION_ID --paths /\*
+        env:
+          CDN_DISTRIBUTION_ID: ${{ secrets[format('AWS_CDN_DISTRIBUTION_ID_{0}', 'TESTNET')] }}

From fe686f884c1a4200fe0f49c5009f8cd5724be867 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Nov 2023 17:09:35 +0000
Subject: [PATCH 02/19] Bump serve from 11.3.2 to 14.2.1

Bumps [serve](https://github.com/vercel/serve) from 11.3.2 to 14.2.1.
- [Release notes](https://github.com/vercel/serve/releases)
- [Commits](https://github.com/vercel/serve/compare/11.3.2...14.2.1)

---
updated-dependencies:
- dependency-name: serve
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 362 ++++++++++++++++-----------------------------------
 2 files changed, 111 insertions(+), 253 deletions(-)

diff --git a/package.json b/package.json
index f958c839..7efd5195 100644
--- a/package.json
+++ b/package.json
@@ -138,7 +138,7 @@
     "process": "^0.11.10",
     "react-scripts": "^5.0.1",
     "resize-observer-polyfill": "^1.5.1",
-    "serve": "^11.3.2",
+    "serve": "^14.2.1",
     "source-map-explorer": "^2.5.3",
     "start-server-and-test": "^2.0.0",
     "swc-loader": "^0.2.3",
diff --git a/yarn.lock b/yarn.lock
index 2824dda5..b28e2e48 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7305,10 +7305,10 @@
   resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
   integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
 
-"@zeit/schemas@2.6.0":
-  version "2.6.0"
-  resolved "https://registry.npmjs.org/@zeit/schemas/-/schemas-2.6.0.tgz"
-  integrity sha512-uUrgZ8AxS+Lio0fZKAipJjAh415JyrOZowliZAzmnJSsf7piVL5w+G0+gFJ0KSu3QRhvui/7zuvpLz03YjXAhg==
+"@zeit/schemas@2.29.0":
+  version "2.29.0"
+  resolved "https://registry.yarnpkg.com/@zeit/schemas/-/schemas-2.29.0.tgz#a59ae6ebfdf4ddc66a876872dd736baa58b6696c"
+  integrity sha512-g5QiLIfbg3pLuYUJPlisNKY+epQJTcMDsOnVNkscrDP1oi7vmJnzOANYJI/1pZcVJ6umUkBv3aFtlg1UvUHGzA==
 
 JSONStream@^1.3.5:
   version "1.3.5"
@@ -7488,14 +7488,14 @@ ajv-keywords@^5.1.0:
   dependencies:
     fast-deep-equal "^3.1.3"
 
-ajv@6.5.3:
-  version "6.5.3"
-  resolved "https://registry.npmjs.org/ajv/-/ajv-6.5.3.tgz"
-  integrity sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==
+ajv@8.11.0:
+  version "8.11.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f"
+  integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==
   dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
+    fast-deep-equal "^3.1.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
 ajv@^6.10.0, ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5:
@@ -7518,12 +7518,12 @@ ajv@^8.0.0, ajv@^8.11.0, ajv@^8.6.0, ajv@^8.9.0:
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
-ansi-align@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz"
-  integrity sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=
+ansi-align@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59"
+  integrity sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==
   dependencies:
-    string-width "^2.0.0"
+    string-width "^4.1.0"
 
 ansi-colors@4.1.1, ansi-colors@^4.1.1:
   version "4.1.1"
@@ -7549,11 +7549,6 @@ ansi-html-community@^0.0.8:
   resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41"
   integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==
 
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
 ansi-regex@^5.0.0, ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
@@ -7606,26 +7601,21 @@ anymatch@^3.0.3, anymatch@~3.1.1, anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-arch@^2.1.0, arch@^2.2.0:
+arch@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11"
   integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==
 
-arg@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/arg/-/arg-2.0.0.tgz"
-  integrity sha512-XxNTUzKnz1ctK3ZIcI2XUPlD96wbHP2nGqkPKpvk/HNRlPveYrXIVSTk9m3LcqOgDPg3B1nMvdV/K8wZd7PG4w==
+arg@5.0.2, arg@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c"
+  integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==
 
 arg@^4.1.0:
   version "4.1.3"
   resolved "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz"
   integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
 
-arg@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c"
-  integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==
-
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -8372,18 +8362,19 @@ borsh@^0.7.0:
     bs58 "^4.0.0"
     text-encoding-utf-8 "^1.0.2"
 
-boxen@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz"
-  integrity sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==
-  dependencies:
-    ansi-align "^2.0.0"
-    camelcase "^4.0.0"
-    chalk "^2.0.1"
-    cli-boxes "^1.0.0"
-    string-width "^2.0.0"
-    term-size "^1.2.0"
-    widest-line "^2.0.0"
+boxen@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/boxen/-/boxen-7.0.0.tgz#9e5f8c26e716793fc96edcf7cf754cdf5e3fbf32"
+  integrity sha512-j//dBVuyacJbvW+tvZ9HuH03fZ46QcaKvvhZickZqtB271DxJ7SNRSNxrV/dZX0085m7hISRZWbzWlJvx/rHSg==
+  dependencies:
+    ansi-align "^3.0.1"
+    camelcase "^7.0.0"
+    chalk "^5.0.1"
+    cli-boxes "^3.0.0"
+    string-width "^5.1.2"
+    type-fest "^2.13.0"
+    widest-line "^4.0.1"
+    wrap-ansi "^8.0.1"
 
 brace-expansion@^1.1.7:
   version "1.1.11"
@@ -8648,11 +8639,6 @@ camelcase-css@^2.0.1:
   resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5"
   integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==
 
-camelcase@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz"
-  integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
-
 camelcase@^5.0.0, camelcase@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
@@ -8663,6 +8649,11 @@ camelcase@^6.0.0, camelcase@^6.2.0, camelcase@^6.2.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
+camelcase@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-7.0.1.tgz#f02e50af9fd7782bc8b88a3558c32fd3a388f048"
+  integrity sha512-xlx1yCK2Oc1APsPXDL2LdlNP6+uu8OCDdhOBSVT279M/S+y75O30C2VuD8T2ogdePBBl7PfPF4504tnLgX3zfw==
+
 camelize@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz"
@@ -8720,21 +8711,24 @@ catering@^2.1.0, catering@^2.1.1:
   resolved "https://registry.yarnpkg.com/catering/-/catering-2.1.1.tgz#66acba06ed5ee28d5286133982a927de9a04b510"
   integrity sha512-K7Qy8O9p76sL3/3m7/zLKbRkyOlSZAgzEaLhyj2mXS8PsCud2Eo4hAb8aLtZqHh0QGqLcb9dlJSu6lHRVENm1w==
 
-chalk@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz"
-  integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==
+chalk-template@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/chalk-template/-/chalk-template-0.4.0.tgz#692c034d0ed62436b9062c1707fadcd0f753204b"
+  integrity sha512-/ghrgmhfY8RaSdeo43hNXxpoHAtxdbskUHjPpfqUWGttFgycUhYPGx3YZBCnUCvOa7Doivn1IZec3DEGFoMgLg==
   dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
+    chalk "^4.1.2"
 
-chalk@5.3.0:
+chalk@5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.0.1.tgz#ca57d71e82bb534a296df63bbacc4a1c22b2a4b6"
+  integrity sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==
+
+chalk@5.3.0, chalk@^5.0.1:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385"
   integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.4.1, chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -8950,10 +8944,10 @@ clean-stack@^2.0.0:
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
   integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
 
-cli-boxes@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz"
-  integrity sha1-T6kXw+WclKAEzWH47lCdplFocUM=
+cli-boxes@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-3.0.0.tgz#71a10c716feeba005e4504f36329ef0b17cf3145"
+  integrity sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g==
 
 cli-cursor@^3.1.0:
   version "3.1.0"
@@ -9011,13 +9005,14 @@ cli-width@^3.0.0:
   resolved "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz"
   integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
 
-clipboardy@1.2.3:
-  version "1.2.3"
-  resolved "https://registry.npmjs.org/clipboardy/-/clipboardy-1.2.3.tgz"
-  integrity sha512-2WNImOvCRe6r63Gk9pShfkwXsVtKCroMAevIbiae021mS850UkWPbevxsBz3tnvjZIEGvlwaqCPsw+4ulzNgJA==
+clipboardy@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-3.0.0.tgz#f3876247404d334c9ed01b6f269c11d09a5e3092"
+  integrity sha512-Su+uU5sr1jkUy1sGRpLKjKrvEOVXgSgiSInwa/qeID6aJ07yh+5NWc3h2QfjHjBnfX4LhtFcuAWKUsJ3r+fjbg==
   dependencies:
-    arch "^2.1.0"
-    execa "^0.8.0"
+    arch "^2.2.0"
+    execa "^5.1.1"
+    is-wsl "^2.2.0"
 
 cliui@^6.0.0:
   version "6.0.0"
@@ -9235,27 +9230,14 @@ commondir@^1.0.1:
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
   integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
 
-compressible@~2.0.14, compressible@~2.0.16:
+compressible@~2.0.16:
   version "2.0.18"
   resolved "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz"
   integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
   dependencies:
     mime-db ">= 1.43.0 < 2"
 
-compression@1.7.3:
-  version "1.7.3"
-  resolved "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz"
-  integrity sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==
-  dependencies:
-    accepts "~1.3.5"
-    bytes "3.0.0"
-    compressible "~2.0.14"
-    debug "2.6.9"
-    on-headers "~1.0.1"
-    safe-buffer "5.1.2"
-    vary "~1.1.2"
-
-compression@^1.7.4:
+compression@1.7.4, compression@^1.7.4:
   version "1.7.4"
   resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
   integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
@@ -9470,15 +9452,6 @@ cross-fetch@^3.0.4, cross-fetch@^3.0.6, cross-fetch@^3.1.4, cross-fetch@^3.1.5:
   dependencies:
     node-fetch "2.6.7"
 
-cross-spawn@^5.0.1:
-  version "5.1.0"
-  resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz"
-  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
-  dependencies:
-    lru-cache "^4.0.1"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
 cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
@@ -11600,7 +11573,7 @@ execa@4.1.0:
     signal-exit "^3.0.2"
     strip-final-newline "^2.0.0"
 
-execa@5.1.1, execa@^5.0.0:
+execa@5.1.1, execa@^5.0.0, execa@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
   integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
@@ -11630,32 +11603,6 @@ execa@7.2.0:
     signal-exit "^3.0.7"
     strip-final-newline "^3.0.0"
 
-execa@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz"
-  integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=
-  dependencies:
-    cross-spawn "^5.0.1"
-    get-stream "^3.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
-execa@^0.8.0:
-  version "0.8.0"
-  resolved "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz"
-  integrity sha1-2NdrvBtVIX7RkP1t1J08d07PyNo=
-  dependencies:
-    cross-spawn "^5.0.1"
-    get-stream "^3.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
 executable@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c"
@@ -11807,11 +11754,6 @@ fast-decode-uri-component@^1.0.1:
   resolved "https://registry.yarnpkg.com/fast-decode-uri-component/-/fast-decode-uri-component-1.0.1.tgz#46f8b6c22b30ff7a81357d4f59abfae938202543"
   integrity sha512-WKgKWg5eUxvRZGwW8FvfbaH7AXSh2cL+3j5fMGzUMCxWBJ3dV3a7Wz8y2f/uQ0e3B6WmodD3oS54jTQ9HVTIIg==
 
-fast-deep-equal@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"
-  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
-
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
@@ -12368,11 +12310,6 @@ get-starknet-core@^3.2.0:
   resolved "https://registry.yarnpkg.com/get-starknet-core/-/get-starknet-core-3.2.0.tgz#44cabcbd573262340d575cb6b9a38e469a8029ed"
   integrity sha512-SZhxtLlKoPKLZ2H3l9WIU7CiNmkL3qLWGksALmvZdAXa/9PykYfLtvIB5B8A2UZMpf2ojTZlWLfuo1KhgmVobA==
 
-get-stream@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"
-  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
-
 get-stream@^5.0.0, get-stream@^5.1.0:
   version "5.2.0"
   resolved "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz"
@@ -13397,11 +13334,6 @@ is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
-
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
@@ -13525,6 +13457,11 @@ is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
+is-port-reachable@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-port-reachable/-/is-port-reachable-4.0.0.tgz#dac044091ef15319c8ab2f34604d8794181f8c2d"
+  integrity sha512-9UoipoxYmSk6Xy7QFgRv2HDyaysmgSG75TFQs6S+3pDM7ZhKTF/bskZV+0UlABHzKjNVhPjYCLfeZUEg1wXxig==
+
 is-potential-custom-element-name@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
@@ -13567,11 +13504,6 @@ is-shared-array-buffer@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
-is-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
-
 is-stream@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
@@ -15335,14 +15267,6 @@ lower-case@^2.0.2:
   dependencies:
     tslib "^2.0.3"
 
-lru-cache@^4.0.1:
-  version "4.1.5"
-  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz"
-  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
-  dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
-
 lru-cache@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
@@ -15656,20 +15580,13 @@ minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-"minimatch@2 || 3", minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.2:
+"minimatch@2 || 3", minimatch@3.1.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
 minimatch@4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-4.2.3.tgz#b4dcece1d674dee104bb0fb833ebb85a78cbbca6"
@@ -16039,13 +15956,6 @@ normalize-url@^6.0.1:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
   integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
 
-npm-run-path@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
-  dependencies:
-    path-key "^2.0.0"
-
 npm-run-path@^4.0.0, npm-run-path@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
@@ -16227,7 +16137,7 @@ on-finished@2.4.1:
   dependencies:
     ee-first "1.1.1"
 
-on-headers@~1.0.1, on-headers@~1.0.2:
+on-headers@~1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"
   integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
@@ -16349,11 +16259,6 @@ outdent@^0.8.0:
   resolved "https://registry.yarnpkg.com/outdent/-/outdent-0.8.0.tgz#2ebc3e77bf49912543f1008100ff8e7f44428eb0"
   integrity sha512-KiOAIsdpUTcAXuykya5fnVVT+/5uS0Q1mrkRHcF89tpieSmY33O/tmc54CqwA+bfhbtEfZUNLHaPUiB9X3jt1A==
 
-p-finally@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
-
 p-limit@3.1.0, p-limit@^3.0.2, p-limit@^3.1.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz"
@@ -16591,11 +16496,6 @@ path-is-inside@1.0.2:
   resolved "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz"
   integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
 
-path-key@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
-
 path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
@@ -17561,11 +17461,6 @@ pseudolocale@^2.0.0:
   dependencies:
     commander "^10.0.0"
 
-pseudomap@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"
-  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
-
 psl@^1.1.28, psl@^1.1.33:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
@@ -18884,16 +18779,16 @@ serialize-javascript@^6.0.0, serialize-javascript@^6.0.1:
   dependencies:
     randombytes "^2.1.0"
 
-serve-handler@6.1.3:
-  version "6.1.3"
-  resolved "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.3.tgz"
-  integrity sha512-FosMqFBNrLyeiIDvP1zgO6YoTzFYHxLDEIavhlmQ+knB2Z7l1t+kGLHkZIDN7UVWqQAmKI3D20A6F6jo3nDd4w==
+serve-handler@6.1.5:
+  version "6.1.5"
+  resolved "https://registry.yarnpkg.com/serve-handler/-/serve-handler-6.1.5.tgz#a4a0964f5c55c7e37a02a633232b6f0d6f068375"
+  integrity sha512-ijPFle6Hwe8zfmBxJdE+5fta53fdIY0lHISJvuikXB3VYFafRjMRpOffSPvCYsbKyBA7pvy9oYr/BT1O3EArlg==
   dependencies:
     bytes "3.0.0"
     content-disposition "0.5.2"
     fast-url-parser "1.1.3"
     mime-types "2.1.18"
-    minimatch "3.0.4"
+    minimatch "3.1.2"
     path-is-inside "1.0.2"
     path-to-regexp "2.2.1"
     range-parser "1.2.0"
@@ -18921,20 +18816,22 @@ serve-static@1.15.0:
     parseurl "~1.3.3"
     send "0.18.0"
 
-serve@^11.3.2:
-  version "11.3.2"
-  resolved "https://registry.npmjs.org/serve/-/serve-11.3.2.tgz"
-  integrity sha512-yKWQfI3xbj/f7X1lTBg91fXBP0FqjJ4TEi+ilES5yzH0iKJpN5LjNb1YzIfQg9Rqn4ECUS2SOf2+Kmepogoa5w==
-  dependencies:
-    "@zeit/schemas" "2.6.0"
-    ajv "6.5.3"
-    arg "2.0.0"
-    boxen "1.3.0"
-    chalk "2.4.1"
-    clipboardy "1.2.3"
-    compression "1.7.3"
-    serve-handler "6.1.3"
-    update-check "1.5.2"
+serve@^14.2.1:
+  version "14.2.1"
+  resolved "https://registry.yarnpkg.com/serve/-/serve-14.2.1.tgz#3f078d292ed5e7b2c5a64f957af2765b0459798b"
+  integrity sha512-48er5fzHh7GCShLnNyPBRPEjs2I6QBozeGr02gaacROiyS/8ARADlj595j39iZXAqBbJHH/ivJJyPRWY9sQWZA==
+  dependencies:
+    "@zeit/schemas" "2.29.0"
+    ajv "8.11.0"
+    arg "5.0.2"
+    boxen "7.0.0"
+    chalk "5.0.1"
+    chalk-template "0.4.0"
+    clipboardy "3.0.0"
+    compression "1.7.4"
+    is-port-reachable "4.0.0"
+    serve-handler "6.1.5"
+    update-check "1.5.4"
 
 set-blocking@^2.0.0:
   version "2.0.0"
@@ -18995,13 +18892,6 @@ shallowequal@^1.1.0:
   resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8"
   integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==
 
-shebang-command@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
-  dependencies:
-    shebang-regex "^1.0.0"
-
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -19009,11 +18899,6 @@ shebang-command@^2.0.0:
   dependencies:
     shebang-regex "^3.0.0"
 
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
-
 shebang-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
@@ -19033,7 +18918,7 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
+signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
@@ -19491,14 +19376,6 @@ string-natural-compare@^3.0.1:
   resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4"
   integrity sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==
 
-string-width@^2.0.0, string-width@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
-
 string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
@@ -19508,7 +19385,7 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string-width@^5.0.0, string-width@^5.0.1:
+string-width@^5.0.0, string-width@^5.0.1, string-width@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
   integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
@@ -19604,13 +19481,6 @@ stringify-object@^3.3.0:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-  dependencies:
-    ansi-regex "^3.0.0"
-
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -19640,11 +19510,6 @@ strip-comments@^2.0.1:
   resolved "https://registry.yarnpkg.com/strip-comments/-/strip-comments-2.0.1.tgz#4ad11c3fbcac177a67a40ac224ca339ca1c1ba9b"
   integrity sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==
 
-strip-eof@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
-
 strip-final-newline@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
@@ -19929,13 +19794,6 @@ tempy@^0.6.0:
     type-fest "^0.16.0"
     unique-string "^2.0.0"
 
-term-size@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz"
-  integrity sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=
-  dependencies:
-    execa "^0.7.0"
-
 terminal-link@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
@@ -20363,6 +20221,11 @@ type-fest@^1.0.2:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1"
   integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==
 
+type-fest@^2.13.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b"
+  integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==
+
 type-is@~1.6.18:
   version "1.6.18"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
@@ -20646,10 +20509,10 @@ update-browserslist-db@^1.0.11:
     escalade "^3.1.1"
     picocolors "^1.0.0"
 
-update-check@1.5.2:
-  version "1.5.2"
-  resolved "https://registry.npmjs.org/update-check/-/update-check-1.5.2.tgz"
-  integrity sha512-1TrmYLuLj/5ZovwUS7fFd1jMH3NnFDN1y1A8dboedIDt7zs/zJMo6TwwlhYKkSeEwzleeiSBV5/3c9ufAQWDaQ==
+update-check@1.5.4:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/update-check/-/update-check-1.5.4.tgz#5b508e259558f1ad7dbc8b4b0457d4c9d28c8743"
+  integrity sha512-5YHsflzHP4t1G+8WGPlvKbJEbAJGCgw+Em+dGR1KmBUbr1J36SJBqlHLjR7oob7sco5hWHGQVcr9B2poIVDDTQ==
   dependencies:
     registry-auth-token "3.3.2"
     registry-url "3.1.0"
@@ -21258,7 +21121,7 @@ which-typed-array@^1.1.2, which-typed-array@^1.1.9:
     has-tostringtag "^1.0.0"
     is-typed-array "^1.1.10"
 
-which@^1.2.9, which@^1.3.1:
+which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
@@ -21272,12 +21135,12 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-widest-line@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz"
-  integrity sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==
+widest-line@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-4.0.1.tgz#a0fc673aaba1ea6f0a0d35b3c2795c9a9cc2ebf2"
+  integrity sha512-o0cyEG0e8GPzT4iGHphIOh0cJOV8fivsXxddQasHPHfoZf1ZexrfeA21w2NaEN1RHE+fXlfISmOE8R9N3u3Qig==
   dependencies:
-    string-width "^2.1.1"
+    string-width "^5.0.1"
 
 wildcard@^2.0.0:
   version "2.0.1"
@@ -21640,11 +21503,6 @@ y18n@^5.0.5:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
   integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
-yallist@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"
-  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
-
 yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"

From 16eda6d316ebcf0b813857580e66043be46721d3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Nov 2023 17:10:00 +0000
Subject: [PATCH 03/19] Bump numbro from 2.3.6 to 2.4.0

Bumps [numbro](https://github.com/BenjaminVanRyseghem/numbro) from 2.3.6 to 2.4.0.
- [Release notes](https://github.com/BenjaminVanRyseghem/numbro/releases)
- [Changelog](https://github.com/BenjaminVanRyseghem/numbro/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/BenjaminVanRyseghem/numbro/compare/2.3.6...2.4.0)

---
updated-dependencies:
- dependency-name: numbro
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 23 +++++++++--------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index f958c839..429d3218 100644
--- a/package.json
+++ b/package.json
@@ -251,7 +251,7 @@
     "nock": "^13.3.3",
     "node-fetch": "^3.3.2",
     "node-vibrant": "^3.2.1-alpha.1",
-    "numbro": "^2.3.6",
+    "numbro": "^2.4.0",
     "polished": "^3.3.2",
     "polyfill-object.fromentries": "^1.0.1",
     "qrcode.react": "^3.1.0",
diff --git a/yarn.lock b/yarn.lock
index 2824dda5..9e9d1e51 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8254,15 +8254,10 @@ bigint-crypto-utils@^3.0.23:
   resolved "https://registry.yarnpkg.com/bigint-crypto-utils/-/bigint-crypto-utils-3.2.2.tgz#e30a49ec38357c6981cd3da5aaa6480b1f752ee4"
   integrity sha512-U1RbE3aX9ayCUVcIPHuPDPKcK3SFOXf93J1UK/iHlJuQB7bhagPIX06/CLpLEsDThJ7KA4Dhrnzynl+d2weTiw==
 
-bignumber.js@^8.1.1:
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-8.1.1.tgz#4b072ae5aea9c20f6730e4e5d529df1271c4d885"
-  integrity sha512-QD46ppGintwPGuL1KqmwhR0O+N2cZUg8JG/VzwI2e28sM9TqHjQB10lI4QAaMHVbLzwVLLAwEglpKPViWX+5NQ==
-
-bignumber.js@^9.0.1, bignumber.js@^9.0.2:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.0.tgz#8d340146107fe3a6cb8d40699643c302e8773b62"
-  integrity sha512-4LwHK4nfDOraBCtst+wOWIHbu1vhvAPJK8g8nROd4iuc3PSEjWif/qwbkh8jwCJz6yDBvtU4KPynETgrfh7y3A==
+"bignumber.js@^8 || ^9", bignumber.js@^9.0.1, bignumber.js@^9.0.2:
+  version "9.1.2"
+  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.2.tgz#b7c4242259c008903b13707983b5f4bbd31eda0c"
+  integrity sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==
 
 binary-extensions@^2.0.0:
   version "2.2.0"
@@ -16087,12 +16082,12 @@ number-to-bn@1.7.0:
     bn.js "4.11.6"
     strip-hex-prefix "1.0.0"
 
-numbro@^2.3.6:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/numbro/-/numbro-2.3.6.tgz#4bd622ebe59ccbc49dad365c5b9eed200781fa21"
-  integrity sha512-pxpoTT3hVxQGaOA2RTzXR/muonQNd1K1HPJbWo7QOmxPwiPmoFCFfsG9XXgW3uqjyzezJ0P9IvCPDXUtJexjwg==
+numbro@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/numbro/-/numbro-2.4.0.tgz#3cecae307ab2c2d9fd3e1c08249f4abd504bd577"
+  integrity sha512-t6rVkO1CcKvffvOJJu/zMo70VIcQSR6w3AmIhfHGvmk4vHbNe6zHgomB0aWFAPZWM9JBVWBM0efJv9DBiRoSTA==
   dependencies:
-    bignumber.js "^8.1.1"
+    bignumber.js "^8 || ^9"
 
 nwsapi@^2.2.0:
   version "2.2.0"

From 6d586a9325c2995e23ca670bcb00a2c39f8fd043 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Nov 2023 17:10:32 +0000
Subject: [PATCH 04/19] Bump @reach/portal from 0.10.5 to 0.18.0

Bumps [@reach/portal](https://github.com/reach/reach-ui/tree/HEAD/packages/portal) from 0.10.5 to 0.18.0.
- [Release notes](https://github.com/reach/reach-ui/releases)
- [Changelog](https://github.com/reach/reach-ui/blob/dev/packages/portal/CHANGELOG.md)
- [Commits](https://github.com/reach/reach-ui/commits/@reach/portal@0.18.0/packages/portal)

---
updated-dependencies:
- dependency-name: "@reach/portal"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index f958c839..b7fc05bb 100644
--- a/package.json
+++ b/package.json
@@ -174,7 +174,7 @@
     "@opensea/seaport-js": "^1.2.0",
     "@popperjs/core": "^2.4.4",
     "@reach/dialog": "^0.10.3",
-    "@reach/portal": "^0.10.3",
+    "@reach/portal": "^0.18.0",
     "@reduxjs/toolkit": "^1.9.3",
     "@sentry/react": "^7.45.0",
     "@sentry/tracing": "^7.45.0",
diff --git a/yarn.lock b/yarn.lock
index 2824dda5..cead648f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4181,7 +4181,7 @@
     react-remove-scroll "^2.3.0"
     tslib "^2.0.0"
 
-"@reach/portal@0.10.5", "@reach/portal@^0.10.3":
+"@reach/portal@0.10.5":
   version "0.10.5"
   resolved "https://registry.npmjs.org/@reach/portal/-/portal-0.10.5.tgz"
   integrity sha512-K5K8gW99yqDPDCWQjEfSNZAbGOQWSx5AN2lpuR1gDVoz4xyWpTJ0k0LbetYJTDVvLP/InEcR7AU42JaDYDCXQw==
@@ -4189,6 +4189,13 @@
     "@reach/utils" "0.10.5"
     tslib "^2.0.0"
 
+"@reach/portal@^0.18.0":
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/@reach/portal/-/portal-0.18.0.tgz#dd466f5110689d14a0e7491b3aa8a449e8cefb40"
+  integrity sha512-TImozRapd576ofRk30Le2L3lRTFXF1p47B182wnp5eMTdZa74JX138BtNGEPJFOyrMaVmguVF8SSwZ6a0fon1Q==
+  dependencies:
+    "@reach/utils" "0.18.0"
+
 "@reach/utils@0.10.5":
   version "0.10.5"
   resolved "https://registry.npmjs.org/@reach/utils/-/utils-0.10.5.tgz"
@@ -4198,6 +4205,11 @@
     tslib "^2.0.0"
     warning "^4.0.3"
 
+"@reach/utils@0.18.0":
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/@reach/utils/-/utils-0.18.0.tgz#4f3cebe093dd436eeaff633809bf0f68f4f9d2ee"
+  integrity sha512-KdVMdpTgDyK8FzdKO9SCpiibuy/kbv3pwgfXshTI6tEcQT1OOwj7BAksnzGC0rPz0UholwC+AgkqEl3EJX3M1A==
+
 "@react-spring/animated@~9.5.5":
   version "9.5.5"
   resolved "https://registry.yarnpkg.com/@react-spring/animated/-/animated-9.5.5.tgz#d3bfd0f62ed13a337463a55d2c93bb23c15bbf3e"

From ed01c1531f3c5dd08d99e3681a8d6cb6e53c7ab4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Nov 2023 17:10:54 +0000
Subject: [PATCH 05/19] Bump patch-package from 7.0.2 to 8.0.0

Bumps [patch-package](https://github.com/ds300/patch-package) from 7.0.2 to 8.0.0.
- [Release notes](https://github.com/ds300/patch-package/releases)
- [Changelog](https://github.com/ds300/patch-package/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ds300/patch-package/commits/v8.0.0)

---
updated-dependencies:
- dependency-name: patch-package
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 30 +++++++++++++++++-------------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index f958c839..37372166 100644
--- a/package.json
+++ b/package.json
@@ -130,7 +130,7 @@
     "jpeg-js": "^0.4.4",
     "lint-staged": "^14.0.0",
     "mini-css-extract-plugin": "^2.7.6",
-    "patch-package": "^7.0.0",
+    "patch-package": "^8.0.0",
     "path-browserify": "^1.0.1",
     "png-ts": "^0.0.3",
     "postinstall-postinstall": "^2.1.0",
diff --git a/yarn.lock b/yarn.lock
index 2824dda5..777de6ad 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14847,12 +14847,15 @@ json-stable-stringify-without-jsonify@^1.0.1:
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
 
-json-stable-stringify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"
-  integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=
+json-stable-stringify@^1.0.1, json-stable-stringify@^1.0.2:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.1.0.tgz#43d39c7c8da34bfaf785a61a56808b0def9f747d"
+  integrity sha512-zfA+5SuwYN2VWqN1/5HZaDzQKLJHaBVMZIIM+wuYjdptkaQsqzDdqjqf+lZZJUuJq1aanHiY8LhH8LmH+qBYJA==
   dependencies:
-    jsonify "~0.0.0"
+    call-bind "^1.0.5"
+    isarray "^2.0.5"
+    jsonify "^0.0.1"
+    object-keys "^1.1.1"
 
 json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
@@ -14907,10 +14910,10 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-jsonify@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"
-  integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
+jsonify@^0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.1.tgz#2aa3111dae3d34a0f151c63f3a45d995d9420978"
+  integrity sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==
 
 jsonparse@^1.2.0:
   version "1.3.1"
@@ -16538,10 +16541,10 @@ pascal-case@^3.1.2:
     no-case "^3.0.4"
     tslib "^2.0.3"
 
-patch-package@^7.0.0:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-7.0.2.tgz#c01589bb6964854b5210506a5845d47900641f5a"
-  integrity sha512-PMYfL8LXxGIRmxXLqlEaBxzKPu7/SdP13ld6GSfAUJUZRmBDPp8chZs0dpzaAFn9TSPnFiMwkC6PJt6pBiAl8Q==
+patch-package@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-8.0.0.tgz#d191e2f1b6e06a4624a0116bcb88edd6714ede61"
+  integrity sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA==
   dependencies:
     "@yarnpkg/lockfile" "^1.1.0"
     chalk "^4.1.2"
@@ -16549,6 +16552,7 @@ patch-package@^7.0.0:
     cross-spawn "^7.0.3"
     find-yarn-workspace-root "^2.0.0"
     fs-extra "^9.0.0"
+    json-stable-stringify "^1.0.2"
     klaw-sync "^6.0.0"
     minimist "^1.2.6"
     open "^7.4.2"

From b5c99cbc35b92d382b166e79300a6039b5ceee1d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Nov 2023 17:11:17 +0000
Subject: [PATCH 06/19] Bump @types/react-dom from 18.0.6 to 18.2.15

Bumps [@types/react-dom](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react-dom) from 18.0.6 to 18.2.15.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react-dom)

---
updated-dependencies:
- dependency-name: "@types/react-dom"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index f958c839..1b7fe87d 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
     "@types/node": "^13.13.5",
     "@types/qs": "^6.9.2",
     "@types/react": "^18.0.15",
-    "@types/react-dom": "^18.0.6",
+    "@types/react-dom": "^18.2.15",
     "@types/react-redux": "^7.1.24",
     "@types/react-table": "^7.7.12",
     "@types/react-virtualized-auto-sizer": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 2824dda5..823daf00 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5784,10 +5784,10 @@
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
   integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
 
-"@types/react-dom@^18.0.0", "@types/react-dom@^18.0.6":
-  version "18.0.6"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.6.tgz#36652900024842b74607a17786b6662dd1e103a1"
-  integrity sha512-/5OFZgfIPSwy+YuIBP/FgJnQnsxhZhjjrnxudMddeblOouIodEQ75X14Rr4wGSG/bknL+Omy9iWlLo1u/9GzAA==
+"@types/react-dom@^18.0.0", "@types/react-dom@^18.2.15":
+  version "18.2.15"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.15.tgz#921af67f9ee023ac37ea84b1bc0cc40b898ea522"
+  integrity sha512-HWMdW+7r7MR5+PZqJF6YFNSCtjz1T0dsvo/f1BV6HkV+6erD/nA7wd9NM00KVG83zf2nJ7uATPO9ttdIPvi3gg==
   dependencies:
     "@types/react" "*"
 

From 787aa76bebaa685f884b918ad0b70746c2115578 Mon Sep 17 00:00:00 2001
From: retroboy <109076629+retroboydev@users.noreply.github.com>
Date: Thu, 16 Nov 2023 21:13:42 +0100
Subject: [PATCH 07/19] Update jediswap-mainnet.yml

---
 .github/workflows/jediswap-mainnet.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/jediswap-mainnet.yml b/.github/workflows/jediswap-mainnet.yml
index f273d077..b2e180b8 100644
--- a/.github/workflows/jediswap-mainnet.yml
+++ b/.github/workflows/jediswap-mainnet.yml
@@ -15,6 +15,9 @@ on:
 jobs:
   bump:
     runs-on: ubuntu-latest
+    environment:
+      name: mainnet
+      url: https://e2.jediswap.xyz/
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -84,7 +87,7 @@ jobs:
         run: yarn install --immutable
 
       - name: Build Project
-        run: yarn production-build
+        run: yarn build
         env:
           CI: false
           RELEASE_TYPE: 'PRODUCTION'
@@ -92,16 +95,15 @@ jobs:
       - name: Configure AWS
         uses: aws-actions/configure-aws-credentials@v1
         with:
-          aws-access-key-id: ${{ secrets[format('AWS_ACCESS_KEY_ID_{0}', 'PRODUCTION')] }}
-          aws-secret-access-key: ${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', 'PRODUCTION')] }}
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: us-east-1
-
       - name: Deploy app build to S3 bucket
-        run: aws s3 sync ./dist/ s3://$BUCKET_NAME
+        run: aws s3 sync ./build/ s3://$BUCKET_NAME
         env:
-          BUCKET_NAME: ${{ secrets[format('AWS_S3_BUCKET_NAME_{0}', 'PRODUCTION')] }}
+          BUCKET_NAME: ${{ secrets.AWS_S3_BUCKET_NAME }}
 
       - name: Run Cache Invalidation
         run: aws cloudfront create-invalidation --distribution-id $CDN_DISTRIBUTION_ID --paths /\*
         env:
-          CDN_DISTRIBUTION_ID: ${{ secrets[format('AWS_CDN_DISTRIBUTION_ID_{0}', 'PRODUCTION')] }}
+          CDN_DISTRIBUTION_ID: ${{ secrets.AWS_CDN_DISTRIBUTION_ID }}

From 5aeebbd808a538d9aeb3f0f2791fbca41e5e5ea4 Mon Sep 17 00:00:00 2001
From: retroboy <109076629+retroboydev@users.noreply.github.com>
Date: Thu, 16 Nov 2023 21:14:41 +0100
Subject: [PATCH 08/19] Update jediswap-staging.yml

---
 .github/workflows/jediswap-staging.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/jediswap-staging.yml b/.github/workflows/jediswap-staging.yml
index e7168665..553eb93d 100644
--- a/.github/workflows/jediswap-staging.yml
+++ b/.github/workflows/jediswap-staging.yml
@@ -9,6 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     environment:
       name: staging
+      url: https://staging.e2.jediswap.xyz/
 
     steps:
       - name: Checkout
@@ -23,7 +24,7 @@ jobs:
         run: yarn install --immutable
 
       - name: Build Project
-        run: yarn staging-build
+        run: yarn build
         env:
           CI: false
           RELEASE_TYPE: 'STAGING'
@@ -31,15 +32,15 @@ jobs:
       - name: Configure AWS
         uses: aws-actions/configure-aws-credentials@v1
         with:
-          aws-access-key-id: ${{ secrets[format('AWS_ACCESS_KEY_ID_{0}', 'STAGING')] }}
-          aws-secret-access-key: ${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', 'STAGING')] }}
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: us-east-1
       - name: Deploy app build to S3 bucket
-        run: aws s3 sync ./dist/ s3://$BUCKET_NAME
+        run: aws s3 sync ./build/ s3://$BUCKET_NAME
         env:
-          BUCKET_NAME: ${{ secrets[format('AWS_S3_BUCKET_NAME_{0}', 'STAGING')] }}
+          BUCKET_NAME: ${{ secrets.AWS_S3_BUCKET_NAME }}
 
       - name: Run Cache Invalidation
         run: aws cloudfront create-invalidation --distribution-id $CDN_DISTRIBUTION_ID --paths /\*
         env:
-          CDN_DISTRIBUTION_ID: ${{ secrets[format('AWS_CDN_DISTRIBUTION_ID_{0}', 'STAGING')] }}
+          CDN_DISTRIBUTION_ID: ${{ secrets.AWS_CDN_DISTRIBUTION_ID }}

From b2a561fb386b50fc5cb429a2afc94fbe51c9addc Mon Sep 17 00:00:00 2001
From: retroboy <109076629+retroboydev@users.noreply.github.com>
Date: Thu, 16 Nov 2023 21:15:00 +0100
Subject: [PATCH 09/19] Update jediswap-testnet.yml

---
 .github/workflows/jediswap-testnet.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/jediswap-testnet.yml b/.github/workflows/jediswap-testnet.yml
index bf631ab1..5338fdcf 100644
--- a/.github/workflows/jediswap-testnet.yml
+++ b/.github/workflows/jediswap-testnet.yml
@@ -9,6 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     environment:
       name: testnet
+      url: https://testnet.e2.jediswap.xyz/
 
     steps:
       - name: Checkout
@@ -23,7 +24,7 @@ jobs:
         run: yarn install --immutable
 
       - name: Build Project
-        run: yarn testnet-build
+        run: yarn build
         env:
           CI: false
           RELEASE_TYPE: 'TESTNET'
@@ -31,15 +32,15 @@ jobs:
       - name: Configure AWS
         uses: aws-actions/configure-aws-credentials@v1
         with:
-          aws-access-key-id: ${{ secrets[format('AWS_ACCESS_KEY_ID_{0}', 'TESTNET')] }}
-          aws-secret-access-key: ${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', 'TESTNET')] }}
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: us-east-1
       - name: Deploy app build to S3 bucket
-        run: aws s3 sync ./dist/ s3://$BUCKET_NAME
+        run: aws s3 sync ./build/ s3://$BUCKET_NAME
         env:
-          BUCKET_NAME: ${{ secrets[format('AWS_S3_BUCKET_NAME_{0}', 'TESTNET')] }}
+          BUCKET_NAME: ${{ secrets.AWS_S3_BUCKET_NAME }}
 
       - name: Run Cache Invalidation
         run: aws cloudfront create-invalidation --distribution-id $CDN_DISTRIBUTION_ID --paths /\*
         env:
-          CDN_DISTRIBUTION_ID: ${{ secrets[format('AWS_CDN_DISTRIBUTION_ID_{0}', 'TESTNET')] }}
+          CDN_DISTRIBUTION_ID: ${{ secrets.AWS_CDN_DISTRIBUTION_ID }}

From a7d9558a447e48729d46f956abaa24ec54dc7064 Mon Sep 17 00:00:00 2001
From: retroboy <109076629+retroboydev@users.noreply.github.com>
Date: Thu, 16 Nov 2023 21:15:40 +0100
Subject: [PATCH 10/19] Update package.json

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index e63ac4fa..797c66fd 100644
--- a/package.json
+++ b/package.json
@@ -296,7 +296,6 @@
   },
   "engines": {
     "npm": "please-use-yarn",
-    "node": "18.x",
     "yarn": ">=1.22"
   }
 }

From 53059c5e4c0d375f9721c0265f30f837e2f7c409 Mon Sep 17 00:00:00 2001
From: Automated Version Bump <gh-action-bump-version@users.noreply.github.com>
Date: Thu, 16 Nov 2023 20:16:03 +0000
Subject: [PATCH 11/19] CI: bumps version to v6.0.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 797c66fd..fa06ee33 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jediswap/interface",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "Jediswap Interface",
   "homepage": ".",
   "scripts": {

From a913f734bbbaeafcd6488a0e26a42e80c72a9950 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 04:42:52 +0000
Subject: [PATCH 12/19] Bump react-is from 17.0.2 to 18.2.0

Bumps [react-is](https://github.com/facebook/react/tree/HEAD/packages/react-is) from 17.0.2 to 18.2.0.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v18.2.0/packages/react-is)

---
updated-dependencies:
- dependency-name: react-is
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index fa06ee33..ef36209f 100644
--- a/package.json
+++ b/package.json
@@ -262,7 +262,7 @@
     "react-feather": "^2.0.8",
     "react-helmet": "^6.1.0",
     "react-infinite-scroll-component": "^6.1.0",
-    "react-is": "^17.0.2",
+    "react-is": "^18.2.0",
     "react-markdown": "^4.3.1",
     "react-popper": "^2.2.3",
     "react-query": "^3.39.1",
diff --git a/yarn.lock b/yarn.lock
index 6485d4aa..8523a694 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17762,12 +17762,12 @@ react-is@^16.12.0, react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.6:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
-react-is@^17.0.1, react-is@^17.0.2:
+react-is@^17.0.1:
   version "17.0.2"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
-react-is@^18.0.0:
+react-is@^18.0.0, react-is@^18.2.0:
   version "18.2.0"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
   integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==

From 777d7e1406899740ce2c3df4d0fc2acd4441535c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 04:43:28 +0000
Subject: [PATCH 13/19] Bump nock from 13.3.3 to 13.3.8

Bumps [nock](https://github.com/nock/nock) from 13.3.3 to 13.3.8.
- [Release notes](https://github.com/nock/nock/releases)
- [Changelog](https://github.com/nock/nock/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nock/nock/compare/v13.3.3...v13.3.8)

---
updated-dependencies:
- dependency-name: nock
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index fa06ee33..38549aaf 100644
--- a/package.json
+++ b/package.json
@@ -248,7 +248,7 @@
     "ms": "^2.1.3",
     "multicodec": "^3.0.1",
     "multihashes": "^4.0.2",
-    "nock": "^13.3.3",
+    "nock": "^13.3.8",
     "node-fetch": "^3.3.2",
     "node-vibrant": "^3.2.1-alpha.1",
     "numbro": "^2.4.0",
diff --git a/yarn.lock b/yarn.lock
index 6485d4aa..57a780ae 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15856,14 +15856,13 @@ no-case@^3.0.4:
     lower-case "^2.0.2"
     tslib "^2.0.3"
 
-nock@^13.3.3:
-  version "13.3.3"
-  resolved "https://registry.yarnpkg.com/nock/-/nock-13.3.3.tgz#179759c07d3f88ad3e794ace885629c1adfd3fe7"
-  integrity sha512-z+KUlILy9SK/RjpeXDiDUEAq4T94ADPHE3qaRkf66mpEhzc/ytOMm3Bwdrbq6k1tMWkbdujiKim3G2tfQARuJw==
+nock@^13.3.8:
+  version "13.3.8"
+  resolved "https://registry.yarnpkg.com/nock/-/nock-13.3.8.tgz#7adf3c66f678b02ef0a78d5697ae8bc2ebde0142"
+  integrity sha512-96yVFal0c/W1lG7mmfRe7eO+hovrhJYd2obzzOZ90f6fjpeU/XNvd9cYHZKZAQJumDfhXgoTpkpJ9pvMj+hqHw==
   dependencies:
     debug "^4.1.0"
     json-stringify-safe "^5.0.1"
-    lodash "^4.17.21"
     propagate "^2.0.0"
 
 node-abi@^3.3.0:

From 2b4751b9c87b15f76525b1eb20be65498d7a1fea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 04:44:06 +0000
Subject: [PATCH 14/19] Bump multicodec from 3.0.1 to 3.2.1

Bumps [multicodec](https://github.com/multiformats/js-multicodec) from 3.0.1 to 3.2.1.
- [Release notes](https://github.com/multiformats/js-multicodec/releases)
- [Changelog](https://github.com/multiformats/js-multicodec/blob/master/CHANGELOG.md)
- [Commits](https://github.com/multiformats/js-multicodec/compare/v3.0.1...v3.2.1)

---
updated-dependencies:
- dependency-name: multicodec
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index fa06ee33..799f18a4 100644
--- a/package.json
+++ b/package.json
@@ -246,7 +246,7 @@
     "localforage": "^1.10.0",
     "make-plural": "^7.0.0",
     "ms": "^2.1.3",
-    "multicodec": "^3.0.1",
+    "multicodec": "^3.2.1",
     "multihashes": "^4.0.2",
     "nock": "^13.3.3",
     "node-fetch": "^3.3.2",
diff --git a/yarn.lock b/yarn.lock
index 6485d4aa..e3c0710c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15741,13 +15741,13 @@ multicast-dns@^7.2.5:
     dns-packet "^5.2.2"
     thunky "^1.0.2"
 
-multicodec@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/multicodec/-/multicodec-3.0.1.tgz"
-  integrity sha512-Y6j3wiPojvkF/z6KFIGt84KdJdP2oILEdzc/3YbD3qQ3EerhqtYlfsZTPPNVoCCxNZZdzIpCKrdYFSav17sIrQ==
+multicodec@^3.0.1, multicodec@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/multicodec/-/multicodec-3.2.1.tgz#82de3254a0fb163a107c1aab324f2a91ef51efb2"
+  integrity sha512-+expTPftro8VAW8kfvcuNNNBgb9gPeNYV9dn+z1kJRWF2vih+/S79f2RVeIwmrJBUJ6NT9IUPWnZDQvegEh5pw==
   dependencies:
-    uint8arrays "^2.1.3"
-    varint "^5.0.2"
+    uint8arrays "^3.0.0"
+    varint "^6.0.0"
 
 multiformats@^9.4.2:
   version "9.9.0"
@@ -20692,6 +20692,11 @@ varint@^5.0.2:
   resolved "https://registry.npmjs.org/varint/-/varint-5.0.2.tgz"
   integrity sha512-lKxKYG6H03yCZUpAGOPOsMcGxd1RHCu1iKvEHYDPmTyq2HueGhD73ssNBqqQWfvYs04G9iUFRvmAVLW20Jw6ow==
 
+varint@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/varint/-/varint-6.0.0.tgz#9881eb0ce8feaea6512439d19ddf84bf551661d0"
+  integrity sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==
+
 vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"

From 1ffe18a55ca5cee58e51b422ea0a75adf769245c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 04:44:54 +0000
Subject: [PATCH 15/19] Bump hardhat from 2.14.0 to 2.19.1

Bumps [hardhat](https://github.com/nomiclabs/hardhat) from 2.14.0 to 2.19.1.
- [Release notes](https://github.com/nomiclabs/hardhat/releases)
- [Commits](https://github.com/nomiclabs/hardhat/compare/hardhat@2.14.0...hardhat@2.19.1)

---
updated-dependencies:
- dependency-name: hardhat
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 205 +++++++++++++++++++++++++--------------------------
 2 files changed, 100 insertions(+), 107 deletions(-)

diff --git a/package.json b/package.json
index fa06ee33..e641e1bf 100644
--- a/package.json
+++ b/package.json
@@ -120,7 +120,7 @@
     "eslint-plugin-import": "^2.27",
     "eslint-plugin-jsx-a11y": "^6.7.1",
     "eslint-plugin-rulesdir": "^0.2.2",
-    "hardhat": "^2.14.0",
+    "hardhat": "^2.19.1",
     "husky": "^8.0.3",
     "jest": "^29.6.1",
     "jest-extended": "^4.0.1",
diff --git a/yarn.lock b/yarn.lock
index 6485d4aa..a105838d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3815,31 +3815,31 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@nomicfoundation/ethereumjs-block@5.0.1":
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-block/-/ethereumjs-block-5.0.1.tgz#6f89664f55febbd723195b6d0974773d29ee133d"
-  integrity sha512-u1Yioemi6Ckj3xspygu/SfFvm8vZEO8/Yx5a1QLzi6nVU0jz3Pg2OmHKJ5w+D9Ogk1vhwRiqEBAqcb0GVhCyHw==
-  dependencies:
-    "@nomicfoundation/ethereumjs-common" "4.0.1"
-    "@nomicfoundation/ethereumjs-rlp" "5.0.1"
-    "@nomicfoundation/ethereumjs-trie" "6.0.1"
-    "@nomicfoundation/ethereumjs-tx" "5.0.1"
-    "@nomicfoundation/ethereumjs-util" "9.0.1"
+"@nomicfoundation/ethereumjs-block@5.0.2":
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-block/-/ethereumjs-block-5.0.2.tgz#13a7968f5964f1697da941281b7f7943b0465d04"
+  integrity sha512-hSe6CuHI4SsSiWWjHDIzWhSiAVpzMUcDRpWYzN0T9l8/Rz7xNn3elwVOJ/tAyS0LqL6vitUD78Uk7lQDXZun7Q==
+  dependencies:
+    "@nomicfoundation/ethereumjs-common" "4.0.2"
+    "@nomicfoundation/ethereumjs-rlp" "5.0.2"
+    "@nomicfoundation/ethereumjs-trie" "6.0.2"
+    "@nomicfoundation/ethereumjs-tx" "5.0.2"
+    "@nomicfoundation/ethereumjs-util" "9.0.2"
     ethereum-cryptography "0.1.3"
     ethers "^5.7.1"
 
-"@nomicfoundation/ethereumjs-blockchain@7.0.1":
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-blockchain/-/ethereumjs-blockchain-7.0.1.tgz#80e0bd3535bfeb9baa29836b6f25123dab06a726"
-  integrity sha512-NhzndlGg829XXbqJEYrF1VeZhAwSPgsK/OB7TVrdzft3y918hW5KNd7gIZ85sn6peDZOdjBsAXIpXZ38oBYE5A==
-  dependencies:
-    "@nomicfoundation/ethereumjs-block" "5.0.1"
-    "@nomicfoundation/ethereumjs-common" "4.0.1"
-    "@nomicfoundation/ethereumjs-ethash" "3.0.1"
-    "@nomicfoundation/ethereumjs-rlp" "5.0.1"
-    "@nomicfoundation/ethereumjs-trie" "6.0.1"
-    "@nomicfoundation/ethereumjs-tx" "5.0.1"
-    "@nomicfoundation/ethereumjs-util" "9.0.1"
+"@nomicfoundation/ethereumjs-blockchain@7.0.2":
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-blockchain/-/ethereumjs-blockchain-7.0.2.tgz#45323b673b3d2fab6b5008535340d1b8fea7d446"
+  integrity sha512-8UUsSXJs+MFfIIAKdh3cG16iNmWzWC/91P40sazNvrqhhdR/RtGDlFk2iFTGbBAZPs2+klZVzhRX8m2wvuvz3w==
+  dependencies:
+    "@nomicfoundation/ethereumjs-block" "5.0.2"
+    "@nomicfoundation/ethereumjs-common" "4.0.2"
+    "@nomicfoundation/ethereumjs-ethash" "3.0.2"
+    "@nomicfoundation/ethereumjs-rlp" "5.0.2"
+    "@nomicfoundation/ethereumjs-trie" "6.0.2"
+    "@nomicfoundation/ethereumjs-tx" "5.0.2"
+    "@nomicfoundation/ethereumjs-util" "9.0.2"
     abstract-level "^1.0.3"
     debug "^4.3.3"
     ethereum-cryptography "0.1.3"
@@ -3847,103 +3847,103 @@
     lru-cache "^5.1.1"
     memory-level "^1.0.0"
 
-"@nomicfoundation/ethereumjs-common@4.0.1":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-common/-/ethereumjs-common-4.0.1.tgz#4702d82df35b07b5407583b54a45bf728e46a2f0"
-  integrity sha512-OBErlkfp54GpeiE06brBW/TTbtbuBJV5YI5Nz/aB2evTDo+KawyEzPjBlSr84z/8MFfj8wS2wxzQX1o32cev5g==
+"@nomicfoundation/ethereumjs-common@4.0.2":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-common/-/ethereumjs-common-4.0.2.tgz#a15d1651ca36757588fdaf2a7d381a150662a3c3"
+  integrity sha512-I2WGP3HMGsOoycSdOTSqIaES0ughQTueOsddJ36aYVpI3SN8YSusgRFLwzDJwRFVIYDKx/iJz0sQ5kBHVgdDwg==
   dependencies:
-    "@nomicfoundation/ethereumjs-util" "9.0.1"
+    "@nomicfoundation/ethereumjs-util" "9.0.2"
     crc-32 "^1.2.0"
 
-"@nomicfoundation/ethereumjs-ethash@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-ethash/-/ethereumjs-ethash-3.0.1.tgz#65ca494d53e71e8415c9a49ef48bc921c538fc41"
-  integrity sha512-KDjGIB5igzWOp8Ik5I6QiRH5DH+XgILlplsHR7TEuWANZA759G6krQ6o8bvj+tRUz08YygMQu/sGd9mJ1DYT8w==
+"@nomicfoundation/ethereumjs-ethash@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-ethash/-/ethereumjs-ethash-3.0.2.tgz#da77147f806401ee996bfddfa6487500118addca"
+  integrity sha512-8PfoOQCcIcO9Pylq0Buijuq/O73tmMVURK0OqdjhwqcGHYC2PwhbajDh7GZ55ekB0Px197ajK3PQhpKoiI/UPg==
   dependencies:
-    "@nomicfoundation/ethereumjs-block" "5.0.1"
-    "@nomicfoundation/ethereumjs-rlp" "5.0.1"
-    "@nomicfoundation/ethereumjs-util" "9.0.1"
+    "@nomicfoundation/ethereumjs-block" "5.0.2"
+    "@nomicfoundation/ethereumjs-rlp" "5.0.2"
+    "@nomicfoundation/ethereumjs-util" "9.0.2"
     abstract-level "^1.0.3"
     bigint-crypto-utils "^3.0.23"
     ethereum-cryptography "0.1.3"
 
-"@nomicfoundation/ethereumjs-evm@2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-evm/-/ethereumjs-evm-2.0.1.tgz#f35681e203363f69ce2b3d3bf9f44d4e883ca1f1"
-  integrity sha512-oL8vJcnk0Bx/onl+TgQOQ1t/534GKFaEG17fZmwtPFeH8S5soiBYPCLUrvANOl4sCp9elYxIMzIiTtMtNNN8EQ==
+"@nomicfoundation/ethereumjs-evm@2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-evm/-/ethereumjs-evm-2.0.2.tgz#4c2f4b84c056047102a4fa41c127454e3f0cfcf6"
+  integrity sha512-rBLcUaUfANJxyOx9HIdMX6uXGin6lANCulIm/pjMgRqfiCRMZie3WKYxTSd8ZE/d+qT+zTedBF4+VHTdTSePmQ==
   dependencies:
     "@ethersproject/providers" "^5.7.1"
-    "@nomicfoundation/ethereumjs-common" "4.0.1"
-    "@nomicfoundation/ethereumjs-tx" "5.0.1"
-    "@nomicfoundation/ethereumjs-util" "9.0.1"
+    "@nomicfoundation/ethereumjs-common" "4.0.2"
+    "@nomicfoundation/ethereumjs-tx" "5.0.2"
+    "@nomicfoundation/ethereumjs-util" "9.0.2"
     debug "^4.3.3"
     ethereum-cryptography "0.1.3"
     mcl-wasm "^0.7.1"
     rustbn.js "~0.2.0"
 
-"@nomicfoundation/ethereumjs-rlp@5.0.1":
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-rlp/-/ethereumjs-rlp-5.0.1.tgz#0b30c1cf77d125d390408e391c4bb5291ef43c28"
-  integrity sha512-xtxrMGa8kP4zF5ApBQBtjlSbN5E2HI8m8FYgVSYAnO6ssUoY5pVPGy2H8+xdf/bmMa22Ce8nWMH3aEW8CcqMeQ==
+"@nomicfoundation/ethereumjs-rlp@5.0.2":
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-rlp/-/ethereumjs-rlp-5.0.2.tgz#4fee8dc58a53ac6ae87fb1fca7c15dc06c6b5dea"
+  integrity sha512-QwmemBc+MMsHJ1P1QvPl8R8p2aPvvVcKBbvHnQOKBpBztEo0omN0eaob6FeZS/e3y9NSe+mfu3nNFBHszqkjTA==
 
-"@nomicfoundation/ethereumjs-statemanager@2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-statemanager/-/ethereumjs-statemanager-2.0.1.tgz#8824a97938db4471911e2d2f140f79195def5935"
-  integrity sha512-B5ApMOnlruVOR7gisBaYwFX+L/AP7i/2oAahatssjPIBVDF6wTX1K7Qpa39E/nzsH8iYuL3krkYeUFIdO3EMUQ==
+"@nomicfoundation/ethereumjs-statemanager@2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-statemanager/-/ethereumjs-statemanager-2.0.2.tgz#3ba4253b29b1211cafe4f9265fee5a0d780976e0"
+  integrity sha512-dlKy5dIXLuDubx8Z74sipciZnJTRSV/uHG48RSijhgm1V7eXYFC567xgKtsKiVZB1ViTP9iFL4B6Je0xD6X2OA==
   dependencies:
-    "@nomicfoundation/ethereumjs-common" "4.0.1"
-    "@nomicfoundation/ethereumjs-rlp" "5.0.1"
+    "@nomicfoundation/ethereumjs-common" "4.0.2"
+    "@nomicfoundation/ethereumjs-rlp" "5.0.2"
     debug "^4.3.3"
     ethereum-cryptography "0.1.3"
     ethers "^5.7.1"
     js-sdsl "^4.1.4"
 
-"@nomicfoundation/ethereumjs-trie@6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-trie/-/ethereumjs-trie-6.0.1.tgz#662c55f6b50659fd4b22ea9f806a7401cafb7717"
-  integrity sha512-A64It/IMpDVODzCgxDgAAla8jNjNtsoQZIzZUfIV5AY6Coi4nvn7+VReBn5itlxMiL2yaTlQr9TRWp3CSI6VoA==
+"@nomicfoundation/ethereumjs-trie@6.0.2":
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-trie/-/ethereumjs-trie-6.0.2.tgz#9a6dbd28482dca1bc162d12b3733acab8cd12835"
+  integrity sha512-yw8vg9hBeLYk4YNg5MrSJ5H55TLOv2FSWUTROtDtTMMmDGROsAu+0tBjiNGTnKRi400M6cEzoFfa89Fc5k8NTQ==
   dependencies:
-    "@nomicfoundation/ethereumjs-rlp" "5.0.1"
-    "@nomicfoundation/ethereumjs-util" "9.0.1"
+    "@nomicfoundation/ethereumjs-rlp" "5.0.2"
+    "@nomicfoundation/ethereumjs-util" "9.0.2"
     "@types/readable-stream" "^2.3.13"
     ethereum-cryptography "0.1.3"
     readable-stream "^3.6.0"
 
-"@nomicfoundation/ethereumjs-tx@5.0.1":
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-tx/-/ethereumjs-tx-5.0.1.tgz#7629dc2036b4a33c34e9f0a592b43227ef4f0c7d"
-  integrity sha512-0HwxUF2u2hrsIM1fsasjXvlbDOq1ZHFV2dd1yGq8CA+MEYhaxZr8OTScpVkkxqMwBcc5y83FyPl0J9MZn3kY0w==
+"@nomicfoundation/ethereumjs-tx@5.0.2":
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-tx/-/ethereumjs-tx-5.0.2.tgz#117813b69c0fdc14dd0446698a64be6df71d7e56"
+  integrity sha512-T+l4/MmTp7VhJeNloMkM+lPU3YMUaXdcXgTGCf8+ZFvV9NYZTRLFekRwlG6/JMmVfIfbrW+dRRJ9A6H5Q/Z64g==
   dependencies:
     "@chainsafe/ssz" "^0.9.2"
     "@ethersproject/providers" "^5.7.2"
-    "@nomicfoundation/ethereumjs-common" "4.0.1"
-    "@nomicfoundation/ethereumjs-rlp" "5.0.1"
-    "@nomicfoundation/ethereumjs-util" "9.0.1"
+    "@nomicfoundation/ethereumjs-common" "4.0.2"
+    "@nomicfoundation/ethereumjs-rlp" "5.0.2"
+    "@nomicfoundation/ethereumjs-util" "9.0.2"
     ethereum-cryptography "0.1.3"
 
-"@nomicfoundation/ethereumjs-util@9.0.1":
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-util/-/ethereumjs-util-9.0.1.tgz#530cda8bae33f8b5020a8f199ed1d0a2ce48ec89"
-  integrity sha512-TwbhOWQ8QoSCFhV/DDfSmyfFIHjPjFBj957219+V3jTZYZ2rf9PmDtNOeZWAE3p3vlp8xb02XGpd0v6nTUPbsA==
+"@nomicfoundation/ethereumjs-util@9.0.2":
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-util/-/ethereumjs-util-9.0.2.tgz#16bdc1bb36f333b8a3559bbb4b17dac805ce904d"
+  integrity sha512-4Wu9D3LykbSBWZo8nJCnzVIYGvGCuyiYLIJa9XXNVt1q1jUzHdB+sJvx95VGCpPkCT+IbLecW6yfzy3E1bQrwQ==
   dependencies:
     "@chainsafe/ssz" "^0.10.0"
-    "@nomicfoundation/ethereumjs-rlp" "5.0.1"
+    "@nomicfoundation/ethereumjs-rlp" "5.0.2"
     ethereum-cryptography "0.1.3"
 
-"@nomicfoundation/ethereumjs-vm@7.0.1":
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-vm/-/ethereumjs-vm-7.0.1.tgz#7d035e0993bcad10716c8b36e61dfb87fa3ca05f"
-  integrity sha512-rArhyn0jPsS/D+ApFsz3yVJMQ29+pVzNZ0VJgkzAZ+7FqXSRtThl1C1prhmlVr3YNUlfpZ69Ak+RUT4g7VoOuQ==
-  dependencies:
-    "@nomicfoundation/ethereumjs-block" "5.0.1"
-    "@nomicfoundation/ethereumjs-blockchain" "7.0.1"
-    "@nomicfoundation/ethereumjs-common" "4.0.1"
-    "@nomicfoundation/ethereumjs-evm" "2.0.1"
-    "@nomicfoundation/ethereumjs-rlp" "5.0.1"
-    "@nomicfoundation/ethereumjs-statemanager" "2.0.1"
-    "@nomicfoundation/ethereumjs-trie" "6.0.1"
-    "@nomicfoundation/ethereumjs-tx" "5.0.1"
-    "@nomicfoundation/ethereumjs-util" "9.0.1"
+"@nomicfoundation/ethereumjs-vm@7.0.2":
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-vm/-/ethereumjs-vm-7.0.2.tgz#3b0852cb3584df0e18c182d0672a3596c9ca95e6"
+  integrity sha512-Bj3KZT64j54Tcwr7Qm/0jkeZXJMfdcAtRBedou+Hx0dPOSIgqaIr0vvLwP65TpHbak2DmAq+KJbW2KNtIoFwvA==
+  dependencies:
+    "@nomicfoundation/ethereumjs-block" "5.0.2"
+    "@nomicfoundation/ethereumjs-blockchain" "7.0.2"
+    "@nomicfoundation/ethereumjs-common" "4.0.2"
+    "@nomicfoundation/ethereumjs-evm" "2.0.2"
+    "@nomicfoundation/ethereumjs-rlp" "5.0.2"
+    "@nomicfoundation/ethereumjs-statemanager" "2.0.2"
+    "@nomicfoundation/ethereumjs-trie" "6.0.2"
+    "@nomicfoundation/ethereumjs-tx" "5.0.2"
+    "@nomicfoundation/ethereumjs-util" "9.0.2"
     debug "^4.3.3"
     ethereum-cryptography "0.1.3"
     mcl-wasm "^0.7.1"
@@ -12610,28 +12610,27 @@ hardhat-watcher@^2.1.1:
   dependencies:
     chokidar "^3.4.3"
 
-hardhat@^2.14.0:
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/hardhat/-/hardhat-2.14.0.tgz#b60c74861494aeb1b50803cf04cc47865a42b87a"
-  integrity sha512-73jsInY4zZahMSVFurSK+5TNCJTXMv+vemvGia0Ac34Mm19fYp6vEPVGF3sucbumszsYxiTT2TbS8Ii2dsDSoQ==
+hardhat@^2.19.1:
+  version "2.19.1"
+  resolved "https://registry.yarnpkg.com/hardhat/-/hardhat-2.19.1.tgz#5e09e8070ecfc6109ba9d3a4a117ec2b0643032a"
+  integrity sha512-bsWa63g1GB78ZyMN08WLhFElLPA+J+pShuKD1BFO2+88g3l+BL3R07vj9deIi9dMbssxgE714Gof1dBEDGqnCw==
   dependencies:
     "@ethersproject/abi" "^5.1.2"
     "@metamask/eth-sig-util" "^4.0.0"
-    "@nomicfoundation/ethereumjs-block" "5.0.1"
-    "@nomicfoundation/ethereumjs-blockchain" "7.0.1"
-    "@nomicfoundation/ethereumjs-common" "4.0.1"
-    "@nomicfoundation/ethereumjs-evm" "2.0.1"
-    "@nomicfoundation/ethereumjs-rlp" "5.0.1"
-    "@nomicfoundation/ethereumjs-statemanager" "2.0.1"
-    "@nomicfoundation/ethereumjs-trie" "6.0.1"
-    "@nomicfoundation/ethereumjs-tx" "5.0.1"
-    "@nomicfoundation/ethereumjs-util" "9.0.1"
-    "@nomicfoundation/ethereumjs-vm" "7.0.1"
+    "@nomicfoundation/ethereumjs-block" "5.0.2"
+    "@nomicfoundation/ethereumjs-blockchain" "7.0.2"
+    "@nomicfoundation/ethereumjs-common" "4.0.2"
+    "@nomicfoundation/ethereumjs-evm" "2.0.2"
+    "@nomicfoundation/ethereumjs-rlp" "5.0.2"
+    "@nomicfoundation/ethereumjs-statemanager" "2.0.2"
+    "@nomicfoundation/ethereumjs-trie" "6.0.2"
+    "@nomicfoundation/ethereumjs-tx" "5.0.2"
+    "@nomicfoundation/ethereumjs-util" "9.0.2"
+    "@nomicfoundation/ethereumjs-vm" "7.0.2"
     "@nomicfoundation/solidity-analyzer" "^0.1.0"
     "@sentry/node" "^5.18.1"
     "@types/bn.js" "^5.1.0"
     "@types/lru-cache" "^5.1.0"
-    abort-controller "^3.0.0"
     adm-zip "^0.4.16"
     aggregate-error "^3.0.0"
     ansi-escapes "^4.3.0"
@@ -12654,7 +12653,6 @@ hardhat@^2.14.0:
     mnemonist "^0.38.0"
     mocha "^10.0.0"
     p-map "^4.0.0"
-    qs "^6.7.0"
     raw-body "^2.4.1"
     resolve "1.17.0"
     semver "^6.3.0"
@@ -13054,12 +13052,7 @@ immer@^9.0.21, immer@^9.0.6, immer@^9.0.7:
   resolved "https://registry.npmjs.org/immer/-/immer-9.0.21.tgz#1e025ea31a40f24fb064f1fef23e931496330176"
   integrity sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==
 
-immutable@^4.0.0-rc.12:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.0.tgz#eb1738f14ffb39fd068b1dbe1296117484dd34be"
-  integrity sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg==
-
-immutable@^4.3.4:
+immutable@^4.0.0-rc.12, immutable@^4.3.4:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.4.tgz#2e07b33837b4bb7662f288c244d1ced1ef65a78f"
   integrity sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==
@@ -17539,7 +17532,7 @@ qs@6.11.0:
   dependencies:
     side-channel "^1.0.4"
 
-qs@^6.10.3, qs@^6.7.0, qs@^6.9.4:
+qs@^6.10.3, qs@^6.9.4:
   version "6.11.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.1.tgz#6c29dff97f0c0060765911ba65cbc9764186109f"
   integrity sha512-0wsrzgTz/kAVIeuxSjnpGC56rzYtr6JT/2BwEvMaPhFIoYa1aGO8LbzuU1R0uUYQkLpWBTOj0l/CLAJB64J6nQ==

From 588d971ac55d42062742cc63fa566d9a3711529a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 04:46:47 +0000
Subject: [PATCH 16/19] Bump @starknet-react/chains from 0.1.0-next.0 to 0.1.0

Bumps [@starknet-react/chains](https://github.com/apibara/starknet-react) from 0.1.0-next.0 to 0.1.0.
- [Release notes](https://github.com/apibara/starknet-react/releases)
- [Commits](https://github.com/apibara/starknet-react/commits/@starknet-react/chains@0.1.0)

---
updated-dependencies:
- dependency-name: "@starknet-react/chains"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index fa06ee33..4001da4c 100644
--- a/package.json
+++ b/package.json
@@ -179,7 +179,7 @@
     "@sentry/react": "^7.45.0",
     "@sentry/tracing": "^7.45.0",
     "@sentry/types": "^7.45.0",
-    "@starknet-react/chains": "^0.1.0-next.0",
+    "@starknet-react/chains": "^0.1.0",
     "@starknet-react/core": "^2.0.0-next.3",
     "@types/react-helmet": "^6.1.7",
     "@types/react-window-infinite-loader": "^1.0.6",
diff --git a/yarn.lock b/yarn.lock
index 6485d4aa..45485dfc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4823,10 +4823,10 @@
     "@stablelib/random" "^1.0.2"
     "@stablelib/wipe" "^1.0.1"
 
-"@starknet-react/chains@^0.1.0-next.0":
-  version "0.1.0-next.0"
-  resolved "https://registry.yarnpkg.com/@starknet-react/chains/-/chains-0.1.0-next.0.tgz#c9e5e1c1788e4166292852287769a980306cfb91"
-  integrity sha512-g5wxh8yoD1upym0onHFifODpw1Eb0TF+C3J/Kso+hopTIIq3goRw7uQ1i4dBlrIlx9uP8iNA/yKdED24uwvWJQ==
+"@starknet-react/chains@^0.1.0", "@starknet-react/chains@^0.1.0-next.0":
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/@starknet-react/chains/-/chains-0.1.0.tgz#3728f0c5d391b8ce34526a47c975d0b648ff7ca9"
+  integrity sha512-tzhLuNbFLWUGKYDZC2mbWuyO/bohQW1Q9D7Q0dCDDvowXgG1/Z0WykVusuCl0Pe4iVVrjqkiFKJRR717FzsPUQ==
 
 "@starknet-react/core@^2.0.0-next.3":
   version "2.0.0-next.3"

From 855ee4075e0ad6ad366e5374198fa91f7a05128a Mon Sep 17 00:00:00 2001
From: ishagoyal <iamishagoyal@gmail.com>
Date: Tue, 21 Nov 2023 18:22:06 +0530
Subject: [PATCH 17/19] Styling for mobile devices

---
 src/pages/Pool/index.tsx | 137 +++++++++++++++++++++++++++------------
 1 file changed, 94 insertions(+), 43 deletions(-)

diff --git a/src/pages/Pool/index.tsx b/src/pages/Pool/index.tsx
index 916d0299..9f425274 100644
--- a/src/pages/Pool/index.tsx
+++ b/src/pages/Pool/index.tsx
@@ -47,8 +47,31 @@ const TitleRow = styled(RowBetween)`
     flex-wrap: wrap;
     gap: 12px;
     width: 100%;
+    padding-left: 12px;
   }
 `
+const PoolStats = styled.div`
+  @media (max-width: ${({ theme }) => `${theme.breakpoint.md}px`}) {
+    > div {
+      display: flex;
+      flex-direction: column;
+      > div {
+        padding-bottom: 12px;
+      }
+    }
+  }
+
+  @media (max-width: ${({ theme }) => `${theme.breakpoint.sm}px`}) {
+    > div {
+      display: flex;
+      flex-direction: column;
+      > div {
+        padding-bottom: 12px;
+      }
+    }
+  }
+`
+
 const PoolsCard = styled.div`
   margin-right: 16px;
   align-items: center;
@@ -64,6 +87,15 @@ const PoolsCard = styled.div`
     0px -63.12132px 52.3445px -49.26542px rgba(96, 68, 144, 0.3) inset, 0px 5.38841px 8.46749px -3.07909px #fff inset,
     0px 30.02111px 43.10724px -27.7118px rgba(255, 255, 255, 0.5) inset;
   backdrop-filter: blur(38.48860168457031px);
+  @media (max-width: ${({ theme }) => `${theme.breakpoint.md}px`}) {
+    width: 364px;
+    margin-right: 0px;
+  }
+
+  @media (max-width: ${({ theme }) => `${theme.breakpoint.sm}px`}) {
+    width: 364px;
+    margin-right: 0px;
+  }
 `
 const PoolsCardHeader = styled.div`
   color: ${({ theme }) => theme.notice};
@@ -146,21 +178,21 @@ const PositionsText = styled.div`
   line-height: 100%; /* 20px */
 `
 const ButtonRow = styled(RowFixed)`
-  & > *:not(:last-child) {
-    margin-left: 8px;
+  width: 902px;
+  @media (max-width: ${({ theme }) => `${theme.breakpoint.md}px`}) {
+    width: 374px;
+    padding-left: 12px;
   }
 
   @media (max-width: ${({ theme }) => `${theme.breakpoint.sm}px`}) {
-    width: 100%;
-    flex-direction: row;
-    justify-content: space-between;
+    width: 374px;
+    padding-left: 12px;
   }
 `
 const PoolMenu = styled(Menu)`
   margin-left: 0;
   @media (max-width: ${({ theme }) => `${theme.breakpoint.sm}px`}) {
     flex: 1 1 auto;
-    width: 50%;
   }
 
   a {
@@ -196,6 +228,13 @@ const ErrorContainer = styled.div`
   justify-content: center;
   margin: auto;
   min-height: 25vh;
+  @media (max-width: ${({ theme }) => `${theme.breakpoint.md}px`}) {
+    padding: 0px 52px;
+  }
+
+  @media (max-width: ${({ theme }) => `${theme.breakpoint.sm}px`}) {
+    padding: 0px 52px;
+  }
 `
 
 const IconStyle = css`
@@ -228,8 +267,7 @@ const ResponsiveButtonPrimary = styled(ButtonPrimary)`
   margin-left: auto;
   height: 38px;
   @media (max-width: ${({ theme }) => `${theme.breakpoint.sm}px`}) {
-    flex: 1 1 auto;
-    width: 50%;
+    width: 132px;
   }
 `
 
@@ -249,6 +287,15 @@ const MainContentWrapper = styled.main<{ isWalletConnected?: boolean; filteredPo
         0px 75.43767px 76.9772px -36.94907px rgba(202, 172, 255, 0.3) inset,
         0px -63.12132px 52.3445px -49.26542px rgba(96, 68, 144, 0.3) inset`
       : ''};
+  @media (max-width: ${({ theme }) => `${theme.breakpoint.md}px`}) {
+    width: 368px;
+    margin-left: 8px;
+  }
+
+  @media (max-width: ${({ theme }) => `${theme.breakpoint.sm}px`}) {
+    margin-left: 8px;
+    width: 368px;
+  }
 `
 
 const PositionWrapper = styled.div``
@@ -306,7 +353,7 @@ function WrongNetworkCard() {
 
 export default function Pool() {
   const { account, chainId } = useWeb3React()
-  const [isWalletConnected, setIsWalletConnected] = useState(true)
+  const [isWalletConnected, setIsWalletConnected] = useState()
   const networkSupportsV2 = useNetworkSupportsV2()
   const toggleWalletDrawer = useToggleAccountDrawer()
 
@@ -398,46 +445,48 @@ export default function Pool() {
                 </ResponsiveButtonPrimary>
               </ButtonRow> */}
             </TitleRow>
-            <Row style={{ marginTop: '20px', marginBottom: '20px' }}>
-              <AutoColumn>
-                <PoolsCard>
-                  <PoolsCardHeader>Total Liquidity</PoolsCardHeader>
-                  <PoolsCardDetails>
-                    <PoolsCardNumbers>US$16,006,030</PoolsCardNumbers>
-                    <PoolsCardPercent>+0.70%</PoolsCardPercent>
-                  </PoolsCardDetails>
-                </PoolsCard>
-              </AutoColumn>
-              <AutoColumn>
-                <PoolsCard>
-                  <PoolsCardHeader>Total Volume (24hr)</PoolsCardHeader>
-                  <PoolsCardDetails>
-                    <PoolsCardNumbers>US$3,001,359</PoolsCardNumbers>
-                    <PoolsCardPercent>+40.09%</PoolsCardPercent>
-                  </PoolsCardDetails>
-                </PoolsCard>
-              </AutoColumn>
-              <AutoColumn>
-                <PoolsCard>
-                  <PoolsCardHeader>Total Fees (24hr)</PoolsCardHeader>
-                  <PoolsCardDetails>
-                    <PoolsCardNumbers>US$16,006,030</PoolsCardNumbers>
-                    <PoolsCardPercentNegative>-1.96%</PoolsCardPercentNegative>
-                  </PoolsCardDetails>
-                </PoolsCard>
-              </AutoColumn>
-            </Row>
-
-            <Row>
+            <PoolStats>
+              <Row style={{ marginTop: '20px', marginBottom: '20px' }}>
+                <AutoColumn>
+                  <PoolsCard>
+                    <PoolsCardHeader>Total Liquidity</PoolsCardHeader>
+                    <PoolsCardDetails>
+                      <PoolsCardNumbers>US$16,006,030</PoolsCardNumbers>
+                      <PoolsCardPercent>+0.70%</PoolsCardPercent>
+                    </PoolsCardDetails>
+                  </PoolsCard>
+                </AutoColumn>
+                <AutoColumn>
+                  <PoolsCard>
+                    <PoolsCardHeader>Total Volume (24hr)</PoolsCardHeader>
+                    <PoolsCardDetails>
+                      <PoolsCardNumbers>US$3,001,359</PoolsCardNumbers>
+                      <PoolsCardPercent>+40.09%</PoolsCardPercent>
+                    </PoolsCardDetails>
+                  </PoolsCard>
+                </AutoColumn>
+                <AutoColumn>
+                  <PoolsCard>
+                    <PoolsCardHeader>Total Fees (24hr)</PoolsCardHeader>
+                    <PoolsCardDetails>
+                      <PoolsCardNumbers>US$16,006,030</PoolsCardNumbers>
+                      <PoolsCardPercentNegative>-1.96%</PoolsCardPercentNegative>
+                    </PoolsCardDetails>
+                  </PoolsCard>
+                </AutoColumn>
+              </Row>
+            </PoolStats>
+
+            <ButtonRow>
               <PositionsText>My Positions</PositionsText>
               <ResponsiveButtonPrimary data-cy="join-pool-button" id="join-pool-button" as={Link} to="/add/ETH">
                 + <Trans>New position</Trans>
               </ResponsiveButtonPrimary>
-            </Row>
+            </ButtonRow>
 
             <MainContentWrapper isWalletConnected={isWalletConnected} filteredPositions={filteredPositions.length}>
               {isWalletConnected ? (
-                !filteredPositions.length ? (
+                !filteredPositions.length && !positionsLoading ? (
                   <NoPositions>
                     <IconWrapper>
                       <img src={NoPositionsIcon} alt={'Icon'} />
@@ -449,6 +498,8 @@ export default function Pool() {
                       + <Trans>New position</Trans>
                     </ResponsiveButtonPrimary>
                   </NoPositions>
+                ) : positionsLoading ? (
+                  <PositionsLoadingPlaceholder />
                 ) : (
                   <PositionList
                     positions={filteredPositions}
@@ -492,7 +543,7 @@ export default function Pool() {
                 </ErrorContainer>
               )}
             </MainContentWrapper>
-            <HideSmall>{filteredPositions.length ? null : <CTACards />}</HideSmall>
+            {filteredPositions.length ? null : <CTACards />}
           </AutoColumn>
         </AutoColumn>
       </PageWrapper>

From 4c38cfe3964eb5ba3a721f6935a4ffa6c12e545d Mon Sep 17 00:00:00 2001
From: ishagoyal <iamishagoyal@gmail.com>
Date: Tue, 21 Nov 2023 19:39:43 +0530
Subject: [PATCH 18/19] Mobile styling for pools table ui

---
 src/components/Badge/RangeBadge.tsx       | 14 +++++++
 src/components/PositionList/index.tsx     |  8 ++--
 src/components/PositionListItem/index.tsx | 45 +++++++++++++++++++++++
 src/pages/Pool/index.tsx                  |  2 +-
 4 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/src/components/Badge/RangeBadge.tsx b/src/components/Badge/RangeBadge.tsx
index 2db343f5..c09d8bae 100644
--- a/src/components/Badge/RangeBadge.tsx
+++ b/src/components/Badge/RangeBadge.tsx
@@ -16,6 +16,13 @@ const BadgeText = styled.div`
   font-size: 12px;
   line-height: 14px;
   margin-right: 8px;
+  @media (max-width: ${({ theme }) => `${theme.breakpoint.md}px`}) {
+    margin-left: auto;
+  }
+
+  @media (max-width: ${({ theme }) => `${theme.breakpoint.sm}px`}) {
+    margin-left: auto;
+  }
 `
 
 const ActiveDot = styled.span`
@@ -31,6 +38,13 @@ const LabelText = styled.div<{ color: string }>`
   display: flex;
   flex-direction: row;
   justify-content: flex-end;
+  @media (max-width: ${({ theme }) => `${theme.breakpoint.md}px`}) {
+    width: 154px;
+  }
+
+  @media (max-width: ${({ theme }) => `${theme.breakpoint.sm}px`}) {
+    width: 154px;
+  }
 `
 
 export default function RangeBadge({ removed, inRange }: { removed?: boolean; inRange?: boolean }) {
diff --git a/src/components/PositionList/index.tsx b/src/components/PositionList/index.tsx
index 923bb3dc..01b46c29 100644
--- a/src/components/PositionList/index.tsx
+++ b/src/components/PositionList/index.tsx
@@ -32,8 +32,7 @@ const MobileHeader = styled.div`
   justify-content: space-between;
   align-items: center;
   padding: 16px;
-  border-bottom: 1px solid ${({ theme }) => theme.surface3};
-
+  background-color: rgba(255, 255, 255, 0.2);
   @media screen and (min-width: ${MEDIA_WIDTHS.deprecated_upToSmall}px) {
     display: none;
   }
@@ -101,7 +100,10 @@ export default function PositionList({
         </ToggleLabel>
       </DesktopHeader>
       <MobileHeader>
-        <Trans>Your positions</Trans>
+        <div>
+          <Trans>My positions</Trans>
+          {positions && ' (' + positions.length + ')'}
+        </div>
         <ToggleWrap>
           <ToggleLabel
             onClick={() => {
diff --git a/src/components/PositionListItem/index.tsx b/src/components/PositionListItem/index.tsx
index 613783da..1c5cb6a3 100644
--- a/src/components/PositionListItem/index.tsx
+++ b/src/components/PositionListItem/index.tsx
@@ -55,6 +55,13 @@ const PositionListItemWrapper = styled.div`
   gap: 1em;
   grid-template-columns: 1.5fr 0.5fr 0.5fr 1fr;
   align-items: center;
+  @media (max-width: ${({ theme }) => `${theme.breakpoint.md}px`}) {
+    display: flex;
+  }
+
+  @media (max-width: ${({ theme }) => `${theme.breakpoint.md}px`}) {
+    display: flex;
+  }
 `
 
 const DataLineItem = styled.div`
@@ -92,6 +99,13 @@ const PositionListItemText = styled.div`
   font-size: 14px;
   font-family: 'DM Sans';
   font-weight: 700;
+  @media (max-width: ${({ theme }) => `${theme.breakpoint.md}px`}) {
+    display: none;
+  }
+
+  @media (max-width: ${({ theme }) => `${theme.breakpoint.sm}px`}) {
+    display: none;
+  }
 `
 
 const FeeTierText = styled(ThemedText.UtilityBadge)`
@@ -117,6 +131,27 @@ const PrimaryPositionIdData = styled.div`
     margin-right: 8px;
   }
 `
+const PositionListItemHeading = styled.div`
+  color: ${({ theme }) => theme.neutral2};
+  font-family: DM Sans;
+  font-size: 12px;
+  font-style: normal;
+  font-weight: 500;
+  line-height: 12px;
+  flex: 0.3;
+`
+const PositionListItemMobileWrapper = styled.div`
+  display: flex;
+`
+const PositionListItemMobile = styled.div`
+  font-family: DM Sans;
+  font-size: 14px;
+  font-style: normal;
+  font-weight: 500;
+  line-height: 12px;
+  flex: 0.3;
+  margin-top: 4px;
+`
 
 interface PositionListItemProps {
   token0: string
@@ -287,6 +322,16 @@ export default function PositionListItem({
       ) : (
         <Loader />
       )}
+      <SmallOnly>
+        <PositionListItemMobileWrapper>
+          <PositionListItemHeading>Liquidity</PositionListItemHeading>
+          <PositionListItemHeading>Fees earned</PositionListItemHeading>
+        </PositionListItemMobileWrapper>
+        <PositionListItemMobileWrapper>
+          <PositionListItemMobile>$16.89</PositionListItemMobile>
+          <PositionListItemMobile>$3467.26</PositionListItemMobile>
+        </PositionListItemMobileWrapper>
+      </SmallOnly>
     </LinkRow>
   )
 }
diff --git a/src/pages/Pool/index.tsx b/src/pages/Pool/index.tsx
index 9f425274..b807344e 100644
--- a/src/pages/Pool/index.tsx
+++ b/src/pages/Pool/index.tsx
@@ -353,7 +353,7 @@ function WrongNetworkCard() {
 
 export default function Pool() {
   const { account, chainId } = useWeb3React()
-  const [isWalletConnected, setIsWalletConnected] = useState()
+  const [isWalletConnected, setIsWalletConnected] = useState(true)
   const networkSupportsV2 = useNetworkSupportsV2()
   const toggleWalletDrawer = useToggleAccountDrawer()
 

From ba8aa1be4609b4de79c45daf03ee2a8bd6eee67d Mon Sep 17 00:00:00 2001
From: retroboy <iberezkin90@gmail.com>
Date: Fri, 24 Nov 2023 21:06:41 +0100
Subject: [PATCH 19/19] ui fixes for mobile view

---
 src/components/PositionList/index.tsx     | 127 ++++-----
 src/components/PositionListItem/index.tsx | 181 ++++++------
 src/components/swap/constants.ts          |  17 +-
 src/pages/Pool/index.tsx                  | 323 +++++++++-------------
 4 files changed, 281 insertions(+), 367 deletions(-)

diff --git a/src/components/PositionList/index.tsx b/src/components/PositionList/index.tsx
index 01b46c29..096b1ddd 100644
--- a/src/components/PositionList/index.tsx
+++ b/src/components/PositionList/index.tsx
@@ -1,54 +1,50 @@
-import { Trans } from '@lingui/macro'
-import PositionListItem from 'components/PositionListItem'
-import React from 'react'
-import styled from 'styled-components'
-import { MEDIA_WIDTHS } from 'theme'
-import { PositionDetails } from 'types/position'
+import { Trans } from '@lingui/macro';
+import React from 'react';
+import styled from 'styled-components';
+import { PositionDetails } from 'types/position';
 
-const DesktopHeader = styled.div`
-  display: none;
-  font-size: 14px;
+import PositionListItem from 'components/PositionListItem';
+
+const Header = styled.div`
+  display: grid;
+  grid-template-columns: 1.5fr 0.5fr 0.5fr 1fr;
+  grid-template-areas: "MyPositions Liqidity Fee Toggle";
+  gap: 12px;
   padding: 16px;
-  font-family: 'DM Sans';
-  font-weight: 700;
-  background-color: rgba(255, 255, 255, 0.2);
-  @media screen and (min-width: ${MEDIA_WIDTHS.deprecated_upToSmall}px) {
-    display: grid;
-    gap: 1em;
-    grid-template-columns: 1.5fr 0.5fr 0.5fr 1fr;
-    & > div:last-child {
-      text-align: right;
-      margin-right: 12px;
-    }
+  text-align: right;
+
+  @media (max-width: ${({ theme }) => `${theme.breakpoint.md}px`}) {
+    grid-template-areas: "MyPositions MyPositions Toggle Toggle";
   }
-`
+`;
 
-const MobileHeader = styled.div`
-  font-weight: medium;
-  padding: 8px;
-  font-weight: 535;
-  padding: 16px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 16px;
-  background-color: rgba(255, 255, 255, 0.2);
-  @media screen and (min-width: ${MEDIA_WIDTHS.deprecated_upToSmall}px) {
+const HeaderMyPositionCell = styled.div`
+  text-align: left;
+  grid-area: MyPositions;
+`;
+const HeaderLiquidityCell = styled.div`
+  grid-area: Liqidity;
+  
+  @media (max-width: ${({ theme }) => `${theme.breakpoint.md}px`}) {
     display: none;
   }
-
-  @media screen and (max-width: ${MEDIA_WIDTHS.deprecated_upToExtraSmall}px) {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
+`;
+const HeaderFeeCell = styled.div`
+  grid-area: Fee;
+  
+  @media (max-width: ${({ theme }) => `${theme.breakpoint.md}px`}) {
+    display: none;
   }
-`
+`;
+const HeaderToggleLabelCell = styled.div`
+  grid-area: Toggle;
+`;
 
 const ToggleWrap = styled.div`
   display: flex;
   flex-direction: row;
   align-items: center;
-`
+`;
 
 const ToggleLabel = styled.button`
   cursor: pointer;
@@ -59,11 +55,11 @@ const ToggleLabel = styled.button`
   font-style: normal;
   font-weight: 700;
   margin-left: auto;
-`
+`;
 const Divider = styled.div`
   height: 1px;
   background-color: ${({ theme }) => theme.divider};
-`
+`;
 
 type PositionListProps = React.PropsWithChildren<{
   positions: PositionDetails[]
@@ -71,49 +67,34 @@ type PositionListProps = React.PropsWithChildren<{
   userHideClosedPositions: boolean
 }>
 
-export default function PositionList({
-  positions,
+export default function PositionList({ positions,
   setUserHideClosedPositions,
-  userHideClosedPositions,
-}: PositionListProps) {
+  userHideClosedPositions }: PositionListProps) {
   return (
     <>
-      <DesktopHeader>
-        <div>
+      <Header>
+        <HeaderMyPositionCell>
           <Trans>My positions</Trans>
-          {positions && ' (' + positions.length + ')'}
-        </div>
-        <div>
+          {positions && ` (${positions.length})`}
+        </HeaderMyPositionCell>
+        <HeaderLiquidityCell>
           <Trans>Liquidity</Trans>
-        </div>
-        <div>
+        </HeaderLiquidityCell>
+        <HeaderFeeCell>
           <Trans>Fees earned</Trans>
-        </div>
-
-        <ToggleLabel
-          id="desktop-hide-closed-positions"
-          onClick={() => {
-            setUserHideClosedPositions(!userHideClosedPositions)
-          }}
-        >
-          {userHideClosedPositions ? <Trans>Show closed positions</Trans> : <Trans>Hide closed positions</Trans>}
-        </ToggleLabel>
-      </DesktopHeader>
-      <MobileHeader>
-        <div>
-          <Trans>My positions</Trans>
-          {positions && ' (' + positions.length + ')'}
-        </div>
-        <ToggleWrap>
+        </HeaderFeeCell>
+        <HeaderToggleLabelCell>
           <ToggleLabel
+            id="desktop-hide-closed-positions"
             onClick={() => {
-              setUserHideClosedPositions(!userHideClosedPositions)
+              setUserHideClosedPositions(!userHideClosedPositions);
             }}
           >
             {userHideClosedPositions ? <Trans>Show closed positions</Trans> : <Trans>Hide closed positions</Trans>}
           </ToggleLabel>
-        </ToggleWrap>
-      </MobileHeader>
+        </HeaderToggleLabelCell>
+      </Header>
+
       {positions.map((p, index) => (
         <>
           <PositionListItem key={p.tokenId.toString()} {...p} />
@@ -121,5 +102,5 @@ export default function PositionList({
         </>
       ))}
     </>
-  )
+  );
 }
diff --git a/src/components/PositionListItem/index.tsx b/src/components/PositionListItem/index.tsx
index 1c5cb6a3..2475af32 100644
--- a/src/components/PositionListItem/index.tsx
+++ b/src/components/PositionListItem/index.tsx
@@ -1,25 +1,25 @@
-import { BigNumber } from '@ethersproject/bignumber'
-import { Trans } from '@lingui/macro'
-import { Percent, Price, Token } from '@uniswap/sdk-core'
-import { Position } from '@uniswap/v3-sdk'
-import RangeBadge from 'components/Badge/RangeBadge'
-import DoubleCurrencyLogo from 'components/DoubleLogo'
-import HoverInlineText from 'components/HoverInlineText'
-import Loader from 'components/Icons/LoadingSpinner'
-import { RowBetween } from 'components/Row'
-import { useToken } from 'hooks/Tokens'
-import useIsTickAtLimit from 'hooks/useIsTickAtLimit'
-import { usePool } from 'hooks/usePools'
-import { useMemo } from 'react'
-import { Link } from 'react-router-dom'
-import { Bound } from 'state/mint/v3/actions'
-import styled from 'styled-components'
-import { MEDIA_WIDTHS } from 'theme'
-import { HideSmall, SmallOnly, ThemedText } from 'theme/components'
-import { useFormatter } from 'utils/formatNumbers'
-import { unwrappedToken } from 'utils/unwrappedToken'
-
-import { DAI, USDC_MAINNET, USDT, WBTC, WRAPPED_NATIVE_CURRENCY } from '../../constants/tokens'
+import { BigNumber } from '@ethersproject/bignumber';
+import { Trans } from '@lingui/macro';
+import { Percent, Price, Token } from '@uniswap/sdk-core';
+import { Position } from '@uniswap/v3-sdk';
+import { useMemo } from 'react';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+
+import RangeBadge from 'components/Badge/RangeBadge';
+import DoubleCurrencyLogo from 'components/DoubleLogo';
+import HoverInlineText from 'components/HoverInlineText';
+import Loader from 'components/Icons/LoadingSpinner';
+import { RowBetween } from 'components/Row';
+import { useToken } from 'hooks/Tokens';
+import useIsTickAtLimit from 'hooks/useIsTickAtLimit';
+import { usePool } from 'hooks/usePools';
+import { Bound } from 'state/mint/v3/actions';
+import { MEDIA_WIDTHS } from 'theme';
+import { HideSmall, MediumOnly, SmallOnly, ThemedText } from 'theme/components';
+import { useFormatter } from 'utils/formatNumbers';
+import { unwrappedToken } from 'utils/unwrappedToken';
+import { DAI, USDC_MAINNET, USDT, WBTC, WRAPPED_NATIVE_CURRENCY } from '../../constants/tokens';
 
 const LinkRow = styled(Link)`
   display: flex;
@@ -48,30 +48,27 @@ const LinkRow = styled(Link)`
     flex-direction: column;
     row-gap: 8px;
   `};
-`
+`;
 
 const PositionListItemWrapper = styled.div`
   display: grid;
-  gap: 1em;
   grid-template-columns: 1.5fr 0.5fr 0.5fr 1fr;
-  align-items: center;
-  @media (max-width: ${({ theme }) => `${theme.breakpoint.md}px`}) {
-    display: flex;
-  }
+  grid-template-areas: "MyPositions Liqidity Fee Range";
+  text-align: right;
 
   @media (max-width: ${({ theme }) => `${theme.breakpoint.md}px`}) {
-    display: flex;
+    grid-template-areas: "MyPositions MyPositions MyPositions Range";
   }
-`
+`;
 
 const DataLineItem = styled.div`
   font-size: 14px;
-`
+`;
 const CurrencyText = styled.div`
   font-size: 14px;
   font-family: 'DM Sans';
   font-weight: 700;
-`
+`;
 
 const RangeLineItem = styled(DataLineItem)`
   display: flex;
@@ -79,13 +76,13 @@ const RangeLineItem = styled(DataLineItem)`
   align-items: center;
   margin-top: 4px;
   width: 100%;
-`
+`;
 
 const DoubleArrow = styled.span`
   font-size: 12px;
   margin: 0 2px;
   color: ${({ theme }) => theme.neutral1};
-`
+`;
 
 const RangeText = styled(ThemedText.BodySmall)`
   font-size: 12px !important;
@@ -94,25 +91,27 @@ const RangeText = styled(ThemedText.BodySmall)`
   border-radius: 8px;
   font-family: 'DM Sans';
   font-weight: 400;
-`
+`;
 const PositionListItemText = styled.div`
-  font-size: 14px;
-  font-family: 'DM Sans';
-  font-weight: 700;
+  grid-area: Liqidity;
+
   @media (max-width: ${({ theme }) => `${theme.breakpoint.md}px`}) {
     display: none;
   }
+`;
+
+const PositionListItemFee = styled.div`
+  grid-area: Fee;
 
-  @media (max-width: ${({ theme }) => `${theme.breakpoint.sm}px`}) {
+  @media (max-width: ${({ theme }) => `${theme.breakpoint.md}px`}) {
     display: none;
   }
-`
+`;
+
+const RangeBadgeWrapper = styled.div`
+  grid-area: Range;
+`;
 
-const FeeTierText = styled(ThemedText.UtilityBadge)`
-  font-size: 16px !important;
-  margin-left: 8px !important;
-  color: ${({ theme }) => theme.neutral3};
-`
 const ExtentsText = styled(ThemedText.BodySmall)`
   color: ${({ theme }) => theme.neutral2};
   display: inline-block;
@@ -121,16 +120,18 @@ const ExtentsText = styled(ThemedText.BodySmall)`
   ${({ theme }) => theme.deprecated_mediaWidth.deprecated_upToSmall`
     display: none;
   `};
-`
+`;
 
 const PrimaryPositionIdData = styled.div`
+  grid-area: MyPositions;
+  
   display: flex;
   flex-direction: row;
   align-items: center;
   > * {
     margin-right: 8px;
   }
-`
+`;
 const PositionListItemHeading = styled.div`
   color: ${({ theme }) => theme.neutral2};
   font-family: DM Sans;
@@ -139,10 +140,10 @@ const PositionListItemHeading = styled.div`
   font-weight: 500;
   line-height: 12px;
   flex: 0.3;
-`
+`;
 const PositionListItemMobileWrapper = styled.div`
   display: flex;
-`
+`;
 const PositionListItemMobile = styled.div`
   font-family: DM Sans;
   font-size: 14px;
@@ -151,7 +152,11 @@ const PositionListItemMobile = styled.div`
   line-height: 12px;
   flex: 0.3;
   margin-top: 4px;
-`
+`;
+
+const FeeTierText = styled(ThemedText.UtilityBadge)`
+
+`;
 
 interface PositionListItemProps {
   token0: string
@@ -170,32 +175,32 @@ export function getPriceOrderingFromPositionForUI(position?: Position): {
   base?: Token
 } {
   if (!position) {
-    return {}
+    return {};
   }
 
-  const token0 = position.amount0.currency
-  const token1 = position.amount1.currency
+  const token0 = position.amount0.currency;
+  const token1 = position.amount1.currency;
 
   // if token0 is a dollar-stable asset, set it as the quote token
-  const stables = [DAI, USDC_MAINNET, USDT]
+  const stables = [DAI, USDC_MAINNET, USDT];
   if (stables.some((stable) => stable.equals(token0))) {
     return {
       priceLower: position.token0PriceUpper.invert(),
       priceUpper: position.token0PriceLower.invert(),
       quote: token0,
       base: token1,
-    }
+    };
   }
 
   // if token1 is an ETH-/BTC-stable asset, set it as the base token
-  const bases = [...Object.values(WRAPPED_NATIVE_CURRENCY), WBTC]
+  const bases = [...Object.values(WRAPPED_NATIVE_CURRENCY), WBTC];
   if (bases.some((base) => base && base.equals(token1))) {
     return {
       priceLower: position.token0PriceUpper.invert(),
       priceUpper: position.token0PriceLower.invert(),
       quote: token0,
       base: token1,
-    }
+    };
   }
 
   // if both prices are below 1, invert
@@ -205,7 +210,7 @@ export function getPriceOrderingFromPositionForUI(position?: Position): {
       priceUpper: position.token0PriceLower.invert(),
       quote: token0,
       base: token1,
-    }
+    };
   }
 
   // otherwise, just return the default
@@ -214,50 +219,48 @@ export function getPriceOrderingFromPositionForUI(position?: Position): {
     priceUpper: position.token0PriceUpper,
     quote: token1,
     base: token0,
-  }
+  };
 }
 
-export default function PositionListItem({
-  token0: token0Address,
+export default function PositionListItem({ token0: token0Address,
   token1: token1Address,
   tokenId,
   fee: feeAmount,
   liquidity,
   tickLower,
-  tickUpper,
-}: PositionListItemProps) {
-  const { formatTickPrice } = useFormatter()
+  tickUpper }: PositionListItemProps) {
+  const { formatTickPrice } = useFormatter();
 
-  const token0 = useToken(token0Address)
-  const token1 = useToken(token1Address)
+  const token0 = useToken(token0Address);
+  const token1 = useToken(token1Address);
 
-  const currency0 = token0 ? unwrappedToken(token0) : undefined
-  const currency1 = token1 ? unwrappedToken(token1) : undefined
+  const currency0 = token0 ? unwrappedToken(token0) : undefined;
+  const currency1 = token1 ? unwrappedToken(token1) : undefined;
 
   // construct Position from details returned
-  const [, pool] = usePool(currency0 ?? undefined, currency1 ?? undefined, feeAmount)
+  const [, pool] = usePool(currency0 ?? undefined, currency1 ?? undefined, feeAmount);
 
   const position = useMemo(() => {
     if (pool) {
-      return new Position({ pool, liquidity: liquidity.toString(), tickLower, tickUpper })
+      return new Position({ pool, liquidity: liquidity.toString(), tickLower, tickUpper });
     }
-    return undefined
-  }, [liquidity, pool, tickLower, tickUpper])
+    return undefined;
+  }, [liquidity, pool, tickLower, tickUpper]);
 
-  const tickAtLimit = useIsTickAtLimit(feeAmount, tickLower, tickUpper)
+  const tickAtLimit = useIsTickAtLimit(feeAmount, tickLower, tickUpper);
 
   // prices
-  const { priceLower, priceUpper, quote, base } = getPriceOrderingFromPositionForUI(position)
+  const { priceLower, priceUpper, quote, base } = getPriceOrderingFromPositionForUI(position);
 
-  const currencyQuote = quote && unwrappedToken(quote)
-  const currencyBase = base && unwrappedToken(base)
+  const currencyQuote = quote && unwrappedToken(quote);
+  const currencyBase = base && unwrappedToken(base);
 
   // check if price is within range
-  const outOfRange: boolean = pool ? pool.tickCurrent < tickLower || pool.tickCurrent >= tickUpper : false
+  const outOfRange: boolean = pool ? pool.tickCurrent < tickLower || pool.tickCurrent >= tickUpper : false;
 
-  const positionSummaryLink = '/pools/' + tokenId
+  const positionSummaryLink = `/pools/${tokenId}`;
 
-  const removed = liquidity?.eq(0)
+  const removed = liquidity?.eq(0);
 
   return (
     <LinkRow to={positionSummaryLink}>
@@ -269,14 +272,12 @@ export default function PositionListItem({
               &nbsp;{currencyQuote?.symbol}&nbsp;/&nbsp;{currencyBase?.symbol}
             </CurrencyText>
           </ThemedText.SubHeader>
-
-          <FeeTierText>
-            <Trans>{new Percent(feeAmount, 1_000_000).toSignificant()}%</Trans>
-          </FeeTierText>
         </PrimaryPositionIdData>
         <PositionListItemText>$16.89</PositionListItemText>
-        <PositionListItemText>$0</PositionListItemText>
-        <RangeBadge removed={removed} inRange={!outOfRange} />
+        <PositionListItemFee>$0</PositionListItemFee>
+        <RangeBadgeWrapper>
+          <RangeBadge removed={removed} inRange={!outOfRange} />
+        </RangeBadgeWrapper>
       </PositionListItemWrapper>
 
       {priceLower && priceUpper ? (
@@ -299,9 +300,9 @@ export default function PositionListItem({
           <HideSmall>
             <DoubleArrow>↔</DoubleArrow>{' '}
           </HideSmall>
-          <SmallOnly>
+          <MediumOnly>
             <DoubleArrow>↔</DoubleArrow>{' '}
-          </SmallOnly>
+          </MediumOnly>
           <RangeText>
             <ExtentsText>
               <Trans>Max:</Trans>
@@ -322,7 +323,7 @@ export default function PositionListItem({
       ) : (
         <Loader />
       )}
-      <SmallOnly>
+      <MediumOnly>
         <PositionListItemMobileWrapper>
           <PositionListItemHeading>Liquidity</PositionListItemHeading>
           <PositionListItemHeading>Fees earned</PositionListItemHeading>
@@ -331,7 +332,7 @@ export default function PositionListItem({
           <PositionListItemMobile>$16.89</PositionListItemMobile>
           <PositionListItemMobile>$3467.26</PositionListItemMobile>
         </PositionListItemMobileWrapper>
-      </SmallOnly>
+      </MediumOnly>
     </LinkRow>
-  )
+  );
 }
diff --git a/src/components/swap/constants.ts b/src/components/swap/constants.ts
index 17e191ab..c9442931 100644
--- a/src/components/swap/constants.ts
+++ b/src/components/swap/constants.ts
@@ -1,14 +1,15 @@
-import { LDO, USDT as USDT_MAINNET } from 'constants/tokens'
+// @ts-nocheck
+import { InjectedConnector } from '@starknet-react/core';
 
-import { argentX, braavosWallet, argentWebWallet } from '../../connectors'
-import ARGENTX_ICON from '../../assets/wallets/argentx.png'
-import EMAIL_ICON from '../../assets/images/mail.png'
-import BRAAVOS_ICON from '../../assets/wallets/Braavos.svg'
-import { InjectedConnector } from '@starknet-react/core'
+import { LDO, USDT as USDT_MAINNET } from 'constants/tokens';
+import { argentX, braavosWallet, argentWebWallet } from '../../connectors';
+import ARGENTX_ICON from '../../assets/wallets/argentx.png';
+import EMAIL_ICON from '../../assets/images/mail.png';
+import BRAAVOS_ICON from '../../assets/wallets/Braavos.svg';
 
 // List of tokens that require existing allowance to be reset before approving the new amount (mainnet only).
 // See the `approve` function here: https://etherscan.io/address/0xdAC17F958D2ee523a2206206994597C13D831ec7#code
-export const RESET_APPROVAL_TOKENS = [USDT_MAINNET, LDO]
+export const RESET_APPROVAL_TOKENS = [USDT_MAINNET, LDO];
 
 export interface WalletInfo {
   connector?: InjectedConnector
@@ -58,4 +59,4 @@ export const SUPPORTED_WALLETS: { [key: string]: WalletInfo } = {
     mobile: true,
     id: 'braavos',
   },
-}
+};
diff --git a/src/pages/Pool/index.tsx b/src/pages/Pool/index.tsx
index b807344e..7a9292cb 100644
--- a/src/pages/Pool/index.tsx
+++ b/src/pages/Pool/index.tsx
@@ -1,46 +1,40 @@
-import { Trans } from '@lingui/macro'
-import { BrowserEvent, InterfaceElementName, InterfaceEventName, InterfacePageName } from '@uniswap/analytics-events'
-import { useWeb3React } from '@web3-react/core'
-import { useMemo, useState } from 'react'
-import { AlertTriangle, BookOpen, ChevronDown, ChevronsRight, Inbox, Layers } from 'react-feather'
-import { Link } from 'react-router-dom'
-import styled, { css, useTheme } from 'styled-components'
-import { PositionDetails } from 'types/position'
-
-import { Trace, TraceEvent } from 'analytics'
-import { useToggleAccountDrawer } from 'components/AccountDrawer'
-import { ButtonGray, ButtonPrimary, ButtonText } from 'components/Button'
-import { AutoColumn } from 'components/Column'
-import { FlyoutAlignment, Menu } from 'components/Menu'
-import PositionList from 'components/PositionList'
-import Row, { RowBetween, RowFixed } from 'components/Row'
-import { SwitchLocaleLink } from 'components/SwitchLocaleLink'
-import { isSupportedChain } from 'constants/chains'
-import { useFilterPossiblyMaliciousPositions } from 'hooks/useFilterPossiblyMaliciousPositions'
-import { useNetworkSupportsV2 } from 'hooks/useNetworkSupportsV2'
-import { useV3Positions } from 'hooks/useV3Positions'
-import { useUserHideClosedPositions } from 'state/user/hooks'
-import { HideSmall, ThemedText } from 'theme/components'
-import CTACards from './CTACards'
-import { LoadingRows } from './styled'
-import WalletIcon from '../../assets/wallets/Wallet.png'
-import NoPositionsIcon from '../../assets/images/noPosition.png'
+import { Trans } from '@lingui/macro';
+import { BrowserEvent, InterfaceElementName, InterfaceEventName, InterfacePageName } from '@uniswap/analytics-events';
+import { useWeb3React } from '@web3-react/core';
+import { useMemo, useState } from 'react';
+import { AlertTriangle, BookOpen, ChevronDown, ChevronsRight, Inbox, Layers } from 'react-feather';
+import { Link } from 'react-router-dom';
+import styled, { css, useTheme } from 'styled-components';
+import { PositionDetails } from 'types/position';
+
+import { Trace, TraceEvent } from 'analytics';
+import { useToggleAccountDrawer } from 'components/AccountDrawer';
+import { ButtonGray, ButtonPrimary, ButtonText } from 'components/Button';
+import { AutoColumn } from 'components/Column';
+import { FlyoutAlignment, Menu } from 'components/Menu';
+import PositionList from 'components/PositionList';
+import Row, { AutoRow, RowBetween, RowFixed } from 'components/Row';
+import { SwitchLocaleLink } from 'components/SwitchLocaleLink';
+import { isSupportedChain } from 'constants/chains';
+import { useFilterPossiblyMaliciousPositions } from 'hooks/useFilterPossiblyMaliciousPositions';
+import { useNetworkSupportsV2 } from 'hooks/useNetworkSupportsV2';
+import { useV3Positions } from 'hooks/useV3Positions';
+import { useUserHideClosedPositions } from 'state/user/hooks';
+import { HideSmall, ThemedText } from 'theme/components';
+import CTACards from './CTACards';
+import { LoadingRows } from './styled';
+import WalletIcon from '../../assets/wallets/Wallet.png';
+import NoPositionsIcon from '../../assets/images/noPosition.png';
 
 const PageWrapper = styled(AutoColumn)`
-  padding: 68px 8px 0px;
-  max-width: 870px;
+  padding: 70px 8px 0px;
+  max-width: 920px;
   width: 100%;
 
   @media (max-width: ${({ theme }) => `${theme.breakpoint.md}px`}) {
-    max-width: 800px;
-    padding-top: 48px;
-  }
-
-  @media (max-width: ${({ theme }) => `${theme.breakpoint.sm}px`}) {
-    max-width: 500px;
     padding-top: 20px;
   }
-`
+`;
 const TitleRow = styled(RowBetween)`
   color: ${({ theme }) => theme.neutral2};
   @media (max-width: ${({ theme }) => `${theme.breakpoint.sm}px`}) {
@@ -49,54 +43,24 @@ const TitleRow = styled(RowBetween)`
     width: 100%;
     padding-left: 12px;
   }
-`
+`;
 const PoolStats = styled.div`
+  display: grid;
+  gap: 12px;
+  grid-template-columns: repeat(3, 1fr);
   @media (max-width: ${({ theme }) => `${theme.breakpoint.md}px`}) {
-    > div {
-      display: flex;
-      flex-direction: column;
-      > div {
-        padding-bottom: 12px;
-      }
-    }
-  }
-
-  @media (max-width: ${({ theme }) => `${theme.breakpoint.sm}px`}) {
-    > div {
-      display: flex;
-      flex-direction: column;
-      > div {
-        padding-bottom: 12px;
-      }
-    }
+    grid-template-columns: 1fr;
   }
-`
+`;
 
 const PoolsCard = styled.div`
-  margin-right: 16px;
-  align-items: center;
-  width: 290px;
-  height: 101px;
-  display: grid;
-  border-radius: 8px;
   padding: 20px;
-  background: rgba(196, 196, 196, 0.01);
-  box-shadow: 0px 0.76977px 30.79088px 0px rgba(227, 222, 255, 0.2) inset,
-    0px 3.07909px 13.8559px 0px rgba(154, 146, 210, 0.3) inset,
-    0px 75.43767px 76.9772px -36.94907px rgba(202, 172, 255, 0.3) inset,
-    0px -63.12132px 52.3445px -49.26542px rgba(96, 68, 144, 0.3) inset, 0px 5.38841px 8.46749px -3.07909px #fff inset,
-    0px 30.02111px 43.10724px -27.7118px rgba(255, 255, 255, 0.5) inset;
-  backdrop-filter: blur(38.48860168457031px);
-  @media (max-width: ${({ theme }) => `${theme.breakpoint.md}px`}) {
-    width: 364px;
-    margin-right: 0px;
-  }
-
-  @media (max-width: ${({ theme }) => `${theme.breakpoint.sm}px`}) {
-    width: 364px;
-    margin-right: 0px;
-  }
-`
+  border-radius: 8px;
+  backdrop-filter: blur(38px);
+  background-color: rgba(196, 196, 196, 0.01);
+  box-shadow: 0px 0.76977px 30.79088px 0px rgba(227, 222, 255, 0.20) inset, 0px 3.07909px 13.8559px 0px rgba(154, 146, 210, 0.30) inset, 0px 75.43767px 76.9772px -36.94907px rgba(202, 172, 255, 0.30) inset, 0px -63.12132px 52.3445px -49.26542px rgba(96, 68, 144, 0.30) inset, 0px 5.38841px 8.46749px -3.07909px #FFF inset, 0px 30.02111px 43.10724px -27.7118px rgba(255, 255, 255, 0.50) inset;
+  color: ${({ theme }) => theme.jediWhite};
+`;
 const PoolsCardHeader = styled.div`
   color: ${({ theme }) => theme.notice};
   font-family: DM Sans;
@@ -104,18 +68,17 @@ const PoolsCardHeader = styled.div`
   font-style: normal;
   font-weight: 700;
   line-height: 20px;
-`
+  margin-bottom: 20px;
+  
+   @media (max-width: ${({ theme }) => `${theme.breakpoint.lg}px`}) {
+     font-size: 14px;
+   }
+`;
 const PoolsCardDetails = styled.div`
   display: flex;
   align-items: center;
-  color: ${({ theme }) => theme.jediWhite};
-  font-family: DM Sans;
-  font-size: 24px;
-  font-style: normal;
-  font-weight: 500;
-  line-height: 20px;
-  margin-top: 20px;
-`
+  
+`;
 
 const PoolsCardNumbers = styled.div`
   color: ${({ theme }) => theme.jediWhite};
@@ -124,7 +87,11 @@ const PoolsCardNumbers = styled.div`
   font-style: normal;
   font-weight: 500;
   line-height: 20px;
-`
+
+  @media (max-width: ${({ theme }) => `${theme.breakpoint.lg}px`}) {
+    font-size: 18px;
+  }
+`;
 
 const PoolsCardPercent = styled.div`
   color: ${({ theme }) => theme.signalGreen};
@@ -135,17 +102,14 @@ const PoolsCardPercent = styled.div`
   font-style: normal;
   font-weight: 500;
   line-height: 100%;
-`
-const PoolsCardPercentNegative = styled.div`
+
+  @media (max-width: ${({ theme }) => `${theme.breakpoint.lg}px`}) {
+    font-size: 12px;
+  }
+`;
+const PoolsCardPercentNegative = styled(PoolsCardPercent)`
   color: ${({ theme }) => theme.signalRed};
-  text-align: right;
-  margin-left: auto;
-  font-family: DM Sans;
-  font-size: 16px;
-  font-style: normal;
-  font-weight: 500;
-  line-height: 100%;
-`
+`;
 
 const NoPositions = styled.div`
   align-items: center;
@@ -155,12 +119,12 @@ const NoPositions = styled.div`
   margin: auto;
   min-height: 25vh;
   height: 240px;
-`
+`;
 
 const NewPositionText = styled.div`
   margin-top: 12px;
   margin-bottom: 20px;
-`
+`;
 
 const PoolsHeading = styled.div`
   color: ${({ theme }) => theme.jediWhite};
@@ -168,7 +132,7 @@ const PoolsHeading = styled.div`
   text-transform: uppercase;
   font-size: 24px;
   font-weight: 750;
-`
+`;
 const PositionsText = styled.div`
   color: ${({ theme }) => theme.jediWhite};
   font-family: DM Sans;
@@ -176,19 +140,9 @@ const PositionsText = styled.div`
   font-style: normal;
   font-weight: 500;
   line-height: 100%; /* 20px */
-`
-const ButtonRow = styled(RowFixed)`
-  width: 902px;
-  @media (max-width: ${({ theme }) => `${theme.breakpoint.md}px`}) {
-    width: 374px;
-    padding-left: 12px;
-  }
+`;
+const ButtonRow = styled(AutoRow)``;
 
-  @media (max-width: ${({ theme }) => `${theme.breakpoint.sm}px`}) {
-    width: 374px;
-    padding-left: 12px;
-  }
-`
 const PoolMenu = styled(Menu)`
   margin-left: 0;
   @media (max-width: ${({ theme }) => `${theme.breakpoint.sm}px`}) {
@@ -198,14 +152,14 @@ const PoolMenu = styled(Menu)`
   a {
     width: 100%;
   }
-`
+`;
 const PoolMenuItem = styled.div`
   align-items: center;
   display: flex;
   justify-content: space-between;
   width: 100%;
   font-weight: 535;
-`
+`;
 const MoreOptionsButton = styled(ButtonGray)`
   border-radius: 12px;
   flex: 1 1 auto;
@@ -214,12 +168,12 @@ const MoreOptionsButton = styled(ButtonGray)`
   background-color: ${({ theme }) => theme.surface1};
   border: 1px solid ${({ theme }) => theme.surface3};
   margin-right: 8px;
-`
+`;
 
 const MoreOptionsText = styled(ThemedText.BodyPrimary)`
   align-items: center;
   display: flex;
-`
+`;
 
 const ErrorContainer = styled.div`
   align-items: center;
@@ -235,13 +189,13 @@ const ErrorContainer = styled.div`
   @media (max-width: ${({ theme }) => `${theme.breakpoint.sm}px`}) {
     padding: 0px 52px;
   }
-`
+`;
 
 const IconStyle = css`
   width: 48px;
   height: 48px;
   margin-bottom: 0.5rem;
-`
+`;
 
 const IconWrapper = styled.div`
   display: flex;
@@ -249,15 +203,15 @@ const IconWrapper = styled.div`
   align-items: center;
   justify-content: center;
   margin-top: 20px;
-`
+`;
 
 const NetworkIcon = styled(AlertTriangle)`
   ${IconStyle}
-`
+`;
 
 const InboxIcon = styled(Inbox)`
   ${IconStyle}
-`
+`;
 
 const ResponsiveButtonPrimary = styled(ButtonPrimary)`
   border-radius: 8px;
@@ -269,36 +223,21 @@ const ResponsiveButtonPrimary = styled(ButtonPrimary)`
   @media (max-width: ${({ theme }) => `${theme.breakpoint.sm}px`}) {
     width: 132px;
   }
-`
+`;
 
 const MainContentWrapper = styled.main<{ isWalletConnected?: boolean; filteredPositions?: any }>`
-  background-color: ${({ theme, isWalletConnected, filteredPositions }) =>
-    isWalletConnected && filteredPositions ? 'rgba(196, 196, 196, 0.01)' : theme.jediNavyBlue};
-  padding: 0;
+  background-color: ${({ theme, isWalletConnected, filteredPositions }) => (isWalletConnected && filteredPositions ? 'rgba(196, 196, 196, 0.01)' : theme.jediNavyBlue)};
   border-radius: 8px;
-  display: flex;
-  flex-direction: column;
-  overflow: hidden;
-  width: 902px;
-  box-shadow: ${({ isWalletConnected, filteredPositions }) =>
-    isWalletConnected && filteredPositions
-      ? `0px 0.76977px 30.79088px 0px rgba(227, 222, 255, 0.2) inset,
+  box-shadow: ${({ isWalletConnected, filteredPositions }) => (isWalletConnected && filteredPositions
+    ? `0px 0.76977px 30.79088px 0px rgba(227, 222, 255, 0.2) inset,
         0px 3.07909px 13.8559px 0px rgba(154, 146, 210, 0.3) inset,
         0px 75.43767px 76.9772px -36.94907px rgba(202, 172, 255, 0.3) inset,
         0px -63.12132px 52.3445px -49.26542px rgba(96, 68, 144, 0.3) inset`
-      : ''};
-  @media (max-width: ${({ theme }) => `${theme.breakpoint.md}px`}) {
-    width: 368px;
-    margin-left: 8px;
-  }
-
-  @media (max-width: ${({ theme }) => `${theme.breakpoint.sm}px`}) {
-    margin-left: 8px;
-    width: 368px;
-  }
-`
+    : '')};
+  @media (max-width: ${({ theme }) => `${theme.breakpoint.md}px`}) {  }
+`;
 
-const PositionWrapper = styled.div``
+const PositionWrapper = styled.div``;
 
 function PositionsLoadingPlaceholder() {
   return (
@@ -316,11 +255,11 @@ function PositionsLoadingPlaceholder() {
       <div />
       <div />
     </LoadingRows>
-  )
+  );
 }
 
 function WrongNetworkCard() {
-  const theme = useTheme()
+  const theme = useTheme();
 
   return (
     <>
@@ -348,40 +287,40 @@ function WrongNetworkCard() {
       </PageWrapper>
       <SwitchLocaleLink />
     </>
-  )
+  );
 }
 
 export default function Pool() {
-  const { account, chainId } = useWeb3React()
-  const [isWalletConnected, setIsWalletConnected] = useState(true)
-  const networkSupportsV2 = useNetworkSupportsV2()
-  const toggleWalletDrawer = useToggleAccountDrawer()
+  const { account, chainId } = useWeb3React();
+  const [isWalletConnected, setIsWalletConnected] = useState(true);
+  const networkSupportsV2 = useNetworkSupportsV2();
+  const toggleWalletDrawer = useToggleAccountDrawer();
 
-  const theme = useTheme()
-  const [userHideClosedPositions, setUserHideClosedPositions] = useUserHideClosedPositions()
+  const theme = useTheme();
+  const [userHideClosedPositions, setUserHideClosedPositions] = useUserHideClosedPositions();
 
-  const { positions, loading: positionsLoading } = useV3Positions(account)
+  const { positions, loading: positionsLoading } = useV3Positions(account);
 
   const [openPositions, closedPositions] = positions?.reduce<[PositionDetails[], PositionDetails[]]>(
     (acc, p) => {
-      acc[p.liquidity?.isZero() ? 1 : 0].push(p)
-      return acc
+      acc[p.liquidity?.isZero() ? 1 : 0].push(p);
+      return acc;
     },
-    [[], []]
-  ) ?? [[], []]
+    [[], []],
+  ) ?? [[], []];
 
   const userSelectedPositionSet = useMemo(
     () => [...openPositions, ...(userHideClosedPositions ? [] : closedPositions)],
-    [closedPositions, openPositions, userHideClosedPositions]
-  )
+    [closedPositions, openPositions, userHideClosedPositions],
+  );
 
-  const filteredPositions = useFilterPossiblyMaliciousPositions(userSelectedPositionSet)
+  const filteredPositions = useFilterPossiblyMaliciousPositions(userSelectedPositionSet);
 
   if (!isSupportedChain(chainId)) {
-    return <WrongNetworkCard />
+    return <WrongNetworkCard />;
   }
 
-  const showConnectAWallet = Boolean(!account)
+  const showConnectAWallet = Boolean(!account);
 
   const menuItems = [
     {
@@ -414,7 +353,7 @@ export default function Pool() {
       link: 'https://support.uniswap.org/hc/en-us/categories/8122334631437-Providing-Liquidity-',
       external: true,
     },
-  ]
+  ];
 
   return (
     <Trace page={InterfacePageName.POOL_PAGE} shouldLogImpression>
@@ -446,38 +385,30 @@ export default function Pool() {
               </ButtonRow> */}
             </TitleRow>
             <PoolStats>
-              <Row style={{ marginTop: '20px', marginBottom: '20px' }}>
-                <AutoColumn>
-                  <PoolsCard>
-                    <PoolsCardHeader>Total Liquidity</PoolsCardHeader>
-                    <PoolsCardDetails>
-                      <PoolsCardNumbers>US$16,006,030</PoolsCardNumbers>
-                      <PoolsCardPercent>+0.70%</PoolsCardPercent>
-                    </PoolsCardDetails>
-                  </PoolsCard>
-                </AutoColumn>
-                <AutoColumn>
-                  <PoolsCard>
-                    <PoolsCardHeader>Total Volume (24hr)</PoolsCardHeader>
-                    <PoolsCardDetails>
-                      <PoolsCardNumbers>US$3,001,359</PoolsCardNumbers>
-                      <PoolsCardPercent>+40.09%</PoolsCardPercent>
-                    </PoolsCardDetails>
-                  </PoolsCard>
-                </AutoColumn>
-                <AutoColumn>
-                  <PoolsCard>
-                    <PoolsCardHeader>Total Fees (24hr)</PoolsCardHeader>
-                    <PoolsCardDetails>
-                      <PoolsCardNumbers>US$16,006,030</PoolsCardNumbers>
-                      <PoolsCardPercentNegative>-1.96%</PoolsCardPercentNegative>
-                    </PoolsCardDetails>
-                  </PoolsCard>
-                </AutoColumn>
-              </Row>
+              <PoolsCard>
+                <PoolsCardHeader>Total Liquidity</PoolsCardHeader>
+                <PoolsCardDetails>
+                  <PoolsCardNumbers>US$16,006,030</PoolsCardNumbers>
+                  <PoolsCardPercent>+0.70%</PoolsCardPercent>
+                </PoolsCardDetails>
+              </PoolsCard>
+              <PoolsCard>
+                <PoolsCardHeader>Total Volume (24hr)</PoolsCardHeader>
+                <PoolsCardDetails>
+                  <PoolsCardNumbers>US$3,001,359</PoolsCardNumbers>
+                  <PoolsCardPercent>+40.09%</PoolsCardPercent>
+                </PoolsCardDetails>
+              </PoolsCard>
+              <PoolsCard>
+                <PoolsCardHeader>Total Fees (24hr)</PoolsCardHeader>
+                <PoolsCardDetails>
+                  <PoolsCardNumbers>US$16,006,030</PoolsCardNumbers>
+                  <PoolsCardPercentNegative>-1.96%</PoolsCardPercentNegative>
+                </PoolsCardDetails>
+              </PoolsCard>
             </PoolStats>
 
-            <ButtonRow>
+            <ButtonRow justifyContent={'space-between'}>
               <PositionsText>My Positions</PositionsText>
               <ResponsiveButtonPrimary data-cy="join-pool-button" id="join-pool-button" as={Link} to="/add/ETH">
                 + <Trans>New position</Trans>
@@ -549,5 +480,5 @@ export default function Pool() {
       </PageWrapper>
       <SwitchLocaleLink />
     </Trace>
-  )
+  );
 }