release: v1.0.0-beta.21.0

.env.development

@@ -3,5 +3,8 @@ FAST_REFRESH=true
 SKIP_PREFLIGHT_CHECK=true
 GENERATE_SOURCEMAP=false
 REACT_APP_FEATURE_CHARTS=true
+REACT_APP_SOCKET_API_KEY=72a5b4b0-e727-48be-8aa1-5da9d62fe635
 # Default to chrome. Reference:node_modules/react-dev-utils/openBrowser.js
-# BROWSER=Brave Browser
+# BROWSER=Brave Browser
+REACT_APP_STACKLY_DESIGN_VERSION=old
+REACT_APP_SHOW_STACKLY_POPUP=true

.env.production

@@ -1,2 +1,5 @@
 REACT_APP_FATHOM_SITE_ID=KKJYZYXY
-REACT_APP_FATHOM_SITE_SCRIPT_URL=https://gold-stunning.swapr.site/script.js
+REACT_APP_FATHOM_SITE_SCRIPT_URL=https://gold-stunning.swapr.site/script.js
+REACT_APP_STACKLY_DESIGN_VERSION=old
+REACT_APP_SHOW_STACKLY_POPUP=true
+REACT_APP_SOCKET_API_KEY=0b353e78-04e1-41ef-8bf3-61453e2ad1da

.yarnrc.yml

@@ -24,3 +24,5 @@ plugins:
     spec: '@yarnpkg/plugin-interactive-tools'
 
 yarnPath: .yarn/releases/yarn-3.3.1.cjs
+
+checksumBehavior: update

CONTRIBUTING.md

@@ -90,7 +90,7 @@ TypeScript interfaces that are used in more than one place should be stored here
 
 # Coding Standards
 
-At DXdao, everyone thrives to write high-quality code. And such as every Contributor should follow _best practices_ to achieve their goals.
+At Swapr, everyone thrives to write high-quality code. And such as every Contributor should follow _best practices_ to achieve their goals.
 
 ## Code Indentation
 

README.md

@@ -1,9 +1,9 @@
 # Swapr dapp
 
-[![CI](https://github.com/ImpeccableHQ/swapr-dapp/workflows/CI/badge.svg)](https://github.com/ImpeccableHQ/swapr-dapp/actions?query=branch%3Adevelop+workflow%3ACI)
+[![CI](https://github.com/SwaprHQ/swapr-dapp/workflows/CI/badge.svg)](https://github.com/SwaprHQ/swapr-dapp/actions?query=branch%3Adevelop+workflow%3ACI)
 [![GitPOAP Badge](https://public-api.gitpoap.io/v1/repo/levelkdev/swapr-dapp/badge)](https://www.gitpoap.io/gh/levelkdev/swapr-dapp)
 
-An open source decentralized application for Swapr -- a protocol for decentralized exchange of Ethereum tokens governed by the DXdao.
+An open source decentralized application for Swapr -- a protocol for decentralized exchange of Ethereum tokens governed by the Swapr.
 
 ### Run
 
@@ -18,13 +18,13 @@ Swapr releases are published to the IPFS at [swapr.eth](https://swapr.eth.limo).
 Clone the repo
 
 ```bash
-git clone https://github.com/ImpeccableHQ/swapr-dapp.git
+git clone https://github.com/SwaprHQ/swapr-dapp.git
 ```
 
 Install dependencies using Yarn
 
 ```bash
-yarn install --frozen-lockfile
+yarn install --immutable
 ```
 
 Build the app

bin/fathom-generate-events/chain.ts

@@ -12,6 +12,7 @@ export function getChainNameByChainId(chainId: ChainId): string {
     [ChainId.ARBITRUM_GOERLI]: 'arbitrum-goerli',
     [ChainId.ARBITRUM_RINKEBY]: 'arbitrum-rinkeby',
     [ChainId.BSC_MAINNET]: 'bsc',
+    [ChainId.ZK_SYNC_ERA_MAINNET]: 'zksync',
   }[chainId]
 }
 
@@ -32,5 +33,7 @@ export function getProModeEventNameByChainId(chainId?: ChainId): string {
     [ChainId.BSC_TESTNET]: 'proMode/bsc-testnet/15seconds',
     [ChainId.OPTIMISM_MAINNET]: 'proMode/optimism/15seconds',
     [ChainId.OPTIMISM_GOERLI]: 'proMode/optimism-goerli/15seconds',
+    [ChainId.ZK_SYNC_ERA_MAINNET]: 'proMode/zksync/15seconds',
+    [ChainId.ZK_SYNC_ERA_TESTNET]: 'proMode/zksync-testnet/15seconds',
   }[chainId]
 }

chompfile.toml

@@ -85,7 +85,6 @@ run = 'mochawesome-merge mochawesome-report/*.json > index.json --charts true'
 [[task]]
 name = 'start'
 deps = ['codegen:socket', 'codegen:graphql']
-engine = 'node'
 run = 'react-app-rewired start'
 
 [[task]]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swapr/frontend",
-  "version": "1.0.0-beta.20",
+  "version": "1.0.0-beta.21",
   "private": true,
   "description": "DXswap Decentralized Application",
   "license": "GPL-3.0-or-later",
@@ -43,10 +43,10 @@
     "@reach/portal": "^0.17.0",
     "@react-spring/web": "^9.7.1",
     "@rebass/forms": "^4.0.6",
-    "@reduxjs/toolkit": "^1.9.2",
+    "@reduxjs/toolkit": "^1.9.5",
     "@swapr/core": "^0.3.19",
     "@swapr/periphery": "^0.3.22",
-    "@swapr/sdk": "1.8.2",
+    "@swapr/sdk": "1.9.1",
     "@tanstack/react-query": "4.24.6",
     "@uniswap/token-lists": "^1.0.0-beta.27",
     "@uniswap/v3-periphery": "1.4.1",
@@ -97,7 +97,7 @@
     "react-popper": "^2.2.5",
     "react-redux": "^8.0.2",
     "react-router-dom": "^6.4.1",
-    "react-toastify": "9.1.1",
+    "react-toastify": "9.1.2",
     "react-use": "^17.4.0",
     "react-virtualized-auto-sizer": "^1.0.6",
     "react-window": "^1.8.5",
@@ -118,15 +118,15 @@
     "@openapitools/openapi-generator-cli": "^2.5.1",
     "@react-theming/storybook-addon": "1.1.10",
     "@simbathesailor/use-what-changed": "^2.0.0",
-    "@storybook/addon-actions": "7.0.2",
-    "@storybook/addon-docs": "7.0.2",
-    "@storybook/addon-essentials": "7.0.2",
-    "@storybook/addon-interactions": "7.0.2",
-    "@storybook/addon-links": "7.0.2",
-    "@storybook/node-logger": "7.0.2",
-    "@storybook/preset-create-react-app": "7.0.2",
-    "@storybook/react": "7.0.2",
-    "@storybook/react-webpack5": "7.0.2",
+    "@storybook/addon-actions": "7.0.22",
+    "@storybook/addon-docs": "7.0.22",
+    "@storybook/addon-essentials": "7.0.22",
+    "@storybook/addon-interactions": "7.0.22",
+    "@storybook/addon-links": "7.0.22",
+    "@storybook/node-logger": "7.0.22",
+    "@storybook/preset-create-react-app": "7.0.22",
+    "@storybook/react": "7.0.22",
+    "@storybook/react-webpack5": "7.0.22",
     "@storybook/testing-library": "0.1.0",
     "@synthetixio/synpress": "^2.3.3",
     "@testing-library/cypress": "^9.0.0",

public/locales/en/bridge.json

@@ -4,8 +4,8 @@
   "bridgeModal.heading.collecting": "Bridging Collecting",
   "bridgeModal.heading.success": "Bridging Successful",
   "bridgeModal.heading.disclaimer": "Bridging {{typedValue}} {{symbol}}",
+  "bridge.checkoutBridgeUrl": "For more information, visit <0>{{bridgeName}} page↗</0> ",
   "bridge.txnThrough": "This transaction is routed through <0>{{bridgeName}}</0>",
-  "bridge.walletControl": "{{bridgeName}} asks you to sign a transaction that gives them control to your wallet.",
   "bridge.responsible": "Swapr is <0>not</0> responsible for any transactions outside of its control.",
   "bridge.confirmText": "Accept & Continue",
   "bridge.rejectText": "Cancel",

src/analytics/generated/dev/fathom-events.json

@@ -1314,64 +1314,148 @@
       "id": "1OTIE815",
       "object": "event",
       "name": "arbitrum-42161/ecoRouter/0x/volumeUSD/pro",
-      "currency": "dollar",
+      "currency": null,
       "created_at": "2023-02-10 10:49:52"
     },
     {
-      "id": "VX2N8K5E",
+      "id": "QSC4YK7J",
       "object": "event",
-      "name": "bsc-56/ecoRouter/0x/volumeUSD/pro",
-      "currency": "dollar",
+      "name": "optimism-10/ecoRouter/0x/volumeUSD/pro",
+      "currency": null,
       "created_at": "2023-02-10 10:49:53"
     },
     {
-      "id": "QSC4YK7J",
+      "id": "VX2N8K5E",
       "object": "event",
-      "name": "optimism-10/ecoRouter/0x/volumeUSD/pro",
-      "currency": "dollar",
+      "name": "bsc-56/ecoRouter/0x/volumeUSD/pro",
+      "currency": null,
       "created_at": "2023-02-10 10:49:53"
     },
     {
       "id": "2JQ4PJKP",
       "object": "event",
       "name": "ethereum-1/ecoRouter/1inch/volumeUSD/pro",
-      "currency": "dollar",
+      "currency": null,
       "created_at": "2023-02-10 10:49:54"
     },
     {
-      "id": "HBA3CKKR",
+      "id": "DNOARMRM",
       "object": "event",
-      "name": "arbitrum-42161/ecoRouter/1inch/volumeUSD/pro",
-      "currency": "dollar",
+      "name": "optimism-10/ecoRouter/1inch/volumeUSD/pro",
+      "currency": null,
       "created_at": "2023-02-10 10:49:54"
     },
     {
-      "id": "NRMOA5C6",
+      "id": "HBA3CKKR",
       "object": "event",
-      "name": "polygon-137/ecoRouter/1inch/volumeUSD/pro",
-      "currency": "dollar",
+      "name": "arbitrum-42161/ecoRouter/1inch/volumeUSD/pro",
+      "currency": null,
       "created_at": "2023-02-10 10:49:54"
     },
     {
-      "id": "DNOARMRM",
+      "id": "NRMOA5C6",
       "object": "event",
-      "name": "optimism-10/ecoRouter/1inch/volumeUSD/pro",
-      "currency": "dollar",
+      "name": "polygon-137/ecoRouter/1inch/volumeUSD/pro",
+      "currency": null,
       "created_at": "2023-02-10 10:49:54"
     },
     {
       "id": "LC83QHNP",
       "object": "event",
       "name": "gnosis-100/ecoRouter/1inch/volumeUSD/pro",
-      "currency": "dollar",
+      "currency": null,
       "created_at": "2023-02-10 10:49:55"
     },
     {
       "id": "QNH3ZHO1",
       "object": "event",
       "name": "bsc-56/ecoRouter/1inch/volumeUSD/pro",
-      "currency": "dollar",
+      "currency": null,
       "created_at": "2023-02-10 10:49:55"
+    },
+    {
+      "id": "NBFCPZTJ",
+      "object": "event",
+      "name": "zksync-324/ecoRouter/1inch/volumeUSD",
+      "currency": null,
+      "created_at": "2023-06-06 01:40:21"
+    },
+    {
+      "id": "WBFPSB9A",
+      "object": "event",
+      "name": "zksync-324/ecoRouter/dfyn/volumeUSD",
+      "currency": null,
+      "created_at": "2023-06-06 01:40:21"
+    },
+    {
+      "id": "F5OZOVND",
+      "object": "event",
+      "name": "zksync-324/ecoRouter/dfyn/volumeUSD/pro",
+      "currency": null,
+      "created_at": "2023-06-06 01:40:22"
+    },
+    {
+      "id": "WVUHFGAM",
+      "object": "event",
+      "name": "zksync-324/ecoRouter/1inch/volumeUSD/pro",
+      "currency": null,
+      "created_at": "2023-06-06 01:40:22"
+    },
+    {
+      "id": "MCPIKQFK",
+      "object": "event",
+      "name": "proMode/zksync/15seconds",
+      "currency": null,
+      "created_at": "2023-06-06 01:40:23"
+    },
+    {
+      "id": "TTYCO1UP",
+      "object": "event",
+      "name": "proMode/zksync-testnet/15seconds",
+      "currency": null,
+      "created_at": "2023-06-06 01:40:23"
+    },
+    {
+      "id": "HL760OAZ",
+      "object": "event",
+      "name": "zksync-324/ecoRouter/syncswap/volumeUSD/pro",
+      "currency": null,
+      "created_at": "2023-06-07 14:35:43"
+    },
+    {
+      "id": "SDTW49CC",
+      "object": "event",
+      "name": "zksync-324/ecoRouter/syncswap/volumeUSD",
+      "currency": null,
+      "created_at": "2023-06-07 14:35:43"
+    },
+    {
+      "id": "IH7DKC4B",
+      "object": "event",
+      "name": "bsc-56/ecoRouter/biswap/volumeUSD",
+      "currency": null,
+      "created_at": "2023-06-20 14:52:01"
+    },
+    {
+      "id": "SM201VOB",
+      "object": "event",
+      "name": "undefined-324/ecoRouter/1inch/volumeUSD",
+      "currency": null,
+      "created_at": "2023-06-20 14:52:01"
+    },
+    {
+      "id": "IGW1T4KN",
+      "object": "event",
+      "name": "undefined-324/ecoRouter/1inch/volumeUSD/pro",
+      "currency": null,
+      "created_at": "2023-06-20 14:52:02"
+    },
+    {
+      "id": "XEBFING1",
+      "object": "event",
+      "name": "bsc-56/ecoRouter/biswap/volumeUSD/pro",
+      "currency": null,
+      "created_at": "2023-06-20 14:52:02"
     }
   ]
-}
+}