Merge pull request #2382 from torusresearch/develop

Release v4.1.0

.github/workflows/binance.yml

@@ -78,7 +78,7 @@ jobs:
       - name: Run build
         run: |
           . ./scripts/setup.sh
-          npm version patch -m 'Updating version to %s [skip ci]'
+          npm version minor -m 'Updating version to %s [skip ci]'
           npm run build
           . ./scripts/gitPush.sh
         env:

.github/workflows/master.yml

@@ -78,7 +78,7 @@ jobs:
       - name: Run build
         run: |
           . ./scripts/setup.sh
-          npm version patch -m 'Updating version to %s [skip ci]'
+          npm version minor -m 'Updating version to %s [skip ci]'
           npm run build
           . ./scripts/gitPush.sh
         env:

.vscode/settings.json

@@ -6,7 +6,7 @@
   "eslint.format.enable": true,
   "eslint.lintTask.enable": true,
   "editor.codeActionsOnSave": {
-    "source.fixAll": true
+    "source.fixAll": "explicit"
   },
   "prettier.printWidth": 150,
   "cSpell.words": ["ARBITRUM", "loglevel", "openlogin", "toruslabs", "unstoppabledomains", "walletconnect"]

package.json

@@ -39,28 +39,28 @@
     "@metamask/eth-json-rpc-middleware": "^12.0.1",
     "@metamask/eth-json-rpc-provider": "^2.3.0",
     "@metamask/eth-sig-util": "^7.0.1",
-    "@sentry/browser": "^7.82.0",
-    "@sentry/tracing": "^7.82.0",
-    "@sentry/vue": "^7.82.0",
+    "@sentry/browser": "^7.87.0",
+    "@sentry/tracing": "^7.87.0",
+    "@sentry/vue": "^7.87.0",
     "@toruslabs/broadcast-channel": "^9.0.1",
     "@toruslabs/eccrypto": "^4.0.0",
-    "@toruslabs/http-helpers": "^5.0.0",
+    "@toruslabs/http-helpers": "^6.0.0",
     "@toruslabs/loglevel-sentry": "^6.0.1",
     "@toruslabs/metadata-helpers": "^5.0.0",
     "@toruslabs/openlogin": "^6.1.0",
     "@toruslabs/openlogin-jrpc": "^6.1.0",
     "@toruslabs/openlogin-session-manager": "^3.0.0",
     "@toruslabs/openlogin-subkey": "^6.0.0",
     "@toruslabs/openlogin-utils": "^6.1.0",
-    "@uniswap/default-token-list": "^11.9.0",
-    "@walletconnect/sign-client": "^2.10.5",
-    "@walletconnect/utils": "^2.10.5",
+    "@uniswap/default-token-list": "^11.11.0",
+    "@walletconnect/sign-client": "^2.10.6",
+    "@walletconnect/utils": "^2.10.6",
     "await-semaphore": "^0.1.3",
     "bignumber.js": "^9.1.2",
     "bn.js": "^5.2.1",
     "bowser": "^2.11.0",
     "copy-to-clipboard": "^3.3.3",
-    "core-js": "^3.33.3",
+    "core-js": "^3.34.0",
     "das-sdk": "^1.9.3",
     "deepmerge": "^4.3.1",
     "eth-block-tracker": "^8.1.0",
@@ -97,14 +97,14 @@
     "workbox-strategies": "^7.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.3",
+    "@babel/core": "^7.23.6",
     "@babel/eslint-parser": "^7.23.3",
-    "@babel/eslint-plugin": "^7.22.10",
+    "@babel/eslint-plugin": "^7.23.5",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-proposal-numeric-separator": "^7.18.6",
-    "@babel/preset-env": "^7.23.3",
+    "@babel/preset-env": "^7.23.6",
     "@babel/register": "^7.22.15",
-    "@sentry/cli": "^2.22.3",
+    "@sentry/cli": "^2.23.0",
     "@vue/cli-plugin-babel": "^5.0.8",
     "@vue/cli-plugin-eslint": "^5.0.8",
     "@vue/cli-plugin-pwa": "^5.0.8",
@@ -115,35 +115,35 @@
     "cross-env": "^7.0.3",
     "dotenv": "^16.3.1",
     "empty-module": "0.0.2",
-    "eslint": "^8.54.0",
+    "eslint": "^8.55.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-prettier": "^9.0.0",
+    "eslint-config-prettier": "^9.1.0",
     "eslint-config-problems": "^8.0.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.29.0",
-    "eslint-plugin-n": "^16.3.1",
+    "eslint-plugin-n": "^16.4.0",
     "eslint-plugin-only-error": "^1.0.2",
     "eslint-plugin-prettier": "^5.0.1",
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "eslint-plugin-switch-case": "^1.1.2",
     "eslint-plugin-unicorn": "^49.0.0",
-    "eslint-plugin-vue": "^9.18.1",
-    "eslint-plugin-vue-scoped-css": "^2.5.1",
+    "eslint-plugin-vue": "^9.19.2",
+    "eslint-plugin-vue-scoped-css": "^2.6.1",
     "express": "^4.18.2",
     "ganache": "^7.9.1",
     "husky": "^8.0.3",
-    "jsdom": "^23.0.0",
+    "jsdom": "^23.0.1",
     "jsdom-global": "^3.0.2",
-    "lint-staged": "^15.1.0",
+    "lint-staged": "^15.2.0",
     "lodash-es": "^4.17.21",
     "luxon": "^3.4.4",
     "mocha": "^10.2.0",
     "nock": "13.4.0",
     "nyc": "^15.1.0",
-    "prettier": "^3.1.0",
+    "prettier": "^3.1.1",
     "process": "^0.11.10",
-    "puppeteer": "^21.5.2",
+    "puppeteer": "^21.6.1",
     "sass": "~1.32.13",
     "sass-loader": "^13.3.2",
     "sinon": "^15.2.0",

scripts/updateIframeIntegrity.sh

@@ -7,11 +7,11 @@ git config user.name "torus-bot"
 cd ~/torus-embed/
 
 if [[ "$GITHUB_REF" = 'refs/heads/master' ]]; then 
-    npm version patch -m 'Updating iframe integrity and publish %s'
+    npm version minor -m 'Updating iframe integrity and publish %s'
     git push origin master
     git push --tags 
 fi
 if [[ "$GITHUB_REF" = 'refs/heads/binance' ]]; then 
-    npm version patch -m 'Updating iframe integrity and publish %s'
+    npm version minor -m 'Updating iframe integrity and publish %s'
     git push origin binance
 fi

src/components/WalletTopup/WalletTopupBase/WalletTopupBase.vue

@@ -33,8 +33,7 @@
               <div class="mb-2 d-flex align-center">
                 <span class="body-2">{{ t('walletTopUp.youSend') }}</span>
                 <span class="caption ml-auto">
-                  {{ t('walletTopUp.min') }} {{ selectedProvider === XANPOOL ? '0.1 ETH' : minOrderValue }}, {{ t('walletTopUp.max') }}
-                  {{ maxOrderValue }} USD*
+                  {{ t('walletTopUp.min') }} {{ minOrderValue }}, {{ t('walletTopUp.max') }} {{ maxOrderValue }} USD*
                 </span>
               </div>
               <v-text-field
@@ -145,7 +144,6 @@
 import { BroadcastChannel } from '@toruslabs/broadcast-channel'
 import { mapState } from 'vuex'
 
-import { XANPOOL } from '../../../utils/enums'
 import { broadcastChannelOptions, formatCurrencyNumber, paymentProviders, significantDigits } from '../../../utils/utils'
 import ComponentLoader from '../../helpers/ComponentLoader'
 import HelpTooltip from '../../helpers/HelpTooltip'
@@ -195,7 +193,6 @@ export default {
       snackbarText: 'Sample',
       snackbarColor: 'success',
       selectedCurrency: '',
-      XANPOOL,
     }
   },
   computed: {

src/config.js

@@ -167,7 +167,6 @@ export default {
   simplexApiHost: 'https://simplex-api.tor.us',
   moonpayApiHost: 'https://moonpay-api.tor.us',
   rampApiHost: 'https://ramp-network-api.tor.us',
-  xanpoolApiHost: 'https://xanpool-api.tor.us',
   mercuryoApiHost: 'https://mercuryo-api.tor.us',
   transakApiHost: 'https://transak-api.tor.us',
   banxaApiHost: 'https://banxa-api.tor.us',
@@ -182,12 +181,6 @@ export default {
   rampApiQuoteHost: `https://api-instant.ramp.network/api/host-api/quote?hostApiKey=${rampApiKey}`,
   rampAPIKEY: rampApiKey,
 
-  xanpoolHost: 'https://checkout.xanpool.com',
-  xanpoolLiveAPIKEY: '778522fccc19a010f100f437c4aca60j',
-  xanpoolTestHost: 'https://checkout.sandbox.xanpool.com',
-  xanpoolTestAPIKEY: 'sandbox_778522fccc19a010f100f437c4aca60j',
-  xanpoolApiQuoteHost: 'https://xanpool.com/api/transactions/estimate',
-
   mercuryoHost: 'https://exchange.mercuryo.io',
   mercuryoLiveAPIKEY: '8e531c49-2f64-4e7e-b1d4-16aa4958c291',
   mercuryoTestHost: 'https://sandbox-exchange.mrcr.io',

src/containers/WalletTopup/index.js

@@ -4,4 +4,3 @@ export { default as WalletTopupMoonpay } from './WalletTopupMoonpay'
 export { default as WalletTopupRampNetwork } from './WalletTopupRampNetwork'
 export { default as WalletTopupSimplex } from './WalletTopupSimplex'
 export { default as WalletTopupTransak } from './WalletTopupTransak'
-export { default as WalletTopupXanpool } from './WalletTopupXanpool'

src/router.js

@@ -124,11 +124,6 @@ const router = new Router({
               name: 'walletTopupMoonpay',
               component: () => import(/* webpackChunkName: "walletTopupMoonpay" */ './containers/WalletTopup/WalletTopupMoonpay'),
             },
-            {
-              path: 'xanpool',
-              name: 'walletTopupXanpool',
-              component: () => import(/* webpackChunkName: "walletTopupXanpool" */ './containers/WalletTopup/WalletTopupXanpool'),
-            },
             {
               path: 'mercuryo',
               name: 'walletTopupMercuryo',