Merge branch 'develop' of github.com:torusresearch/torus-website into…

… fix/popup-closing

.github/workflows/develop.yml

@@ -90,7 +90,7 @@ jobs:
       - name: invalidate
         uses: chaitanyapotti/cloudfront-update-distribution@v2
         with:
-          cloudfront-distribution-id: ${{ secrets.DISTRIBUTION_LRC_TOR_US }}
+          cloudfront-distribution-id: ${{ secrets.DISTRIBUTION_TESTING_TOR_US }}
           cloudfront-invalidation-path: '/*'
           cloudfront-invalidation-required: true
           cloudfront-wait-for-service-update: false

package.json

@@ -35,39 +35,39 @@
     "@ethereumjs/util": "^8.1.0",
     "@gtm-support/vue2-gtm": "^2.0.0",
     "@metamask/contract-metadata": "^2.3.1",
-    "@metamask/eth-json-rpc-infura": "^8.1.0",
-    "@metamask/eth-json-rpc-middleware": "^11.0.0",
-    "@metamask/eth-json-rpc-provider": "^1.0.0",
-    "@metamask/eth-sig-util": "^5.1.0",
-    "@sentry/browser": "^7.56.0",
-    "@sentry/tracing": "^7.56.0",
-    "@sentry/vue": "^7.56.0",
+    "@metamask/eth-json-rpc-infura": "^8.1.1",
+    "@metamask/eth-json-rpc-middleware": "^11.0.1",
+    "@metamask/eth-json-rpc-provider": "^1.0.1",
+    "@metamask/eth-sig-util": "^6.0.0",
+    "@sentry/browser": "^7.60.0",
+    "@sentry/tracing": "^7.60.0",
+    "@sentry/vue": "^7.60.0",
     "@toruslabs/broadcast-channel": "^7.0.0",
     "@toruslabs/eccrypto": "^3.0.0",
     "@toruslabs/http-helpers": "^4.0.0",
     "@toruslabs/loglevel-sentry": "^5.0.0",
     "@toruslabs/metadata-helpers": "^4.0.0",
-    "@toruslabs/openlogin": "^4.5.4",
-    "@toruslabs/openlogin-jrpc": "^4.6.0",
+    "@toruslabs/openlogin": "^4.7.0",
+    "@toruslabs/openlogin-jrpc": "^4.7.0",
     "@toruslabs/openlogin-session-manager": "^1.1.0",
     "@toruslabs/openlogin-subkey": "^4.2.0",
-    "@toruslabs/openlogin-utils": "^4.5.1",
-    "@uniswap/default-token-list": "^11.2.0",
-    "@walletconnect/sign-client": "^2.8.6",
-    "@walletconnect/utils": "^2.8.6",
+    "@toruslabs/openlogin-utils": "^4.7.0",
+    "@uniswap/default-token-list": "^11.4.0",
+    "@walletconnect/sign-client": "^2.9.1",
+    "@walletconnect/utils": "^2.9.1",
     "await-semaphore": "^0.1.3",
     "bignumber.js": "^9.1.1",
     "bn.js": "^5.2.1",
     "bowser": "^2.11.0",
     "copy-to-clipboard": "^3.3.3",
-    "core-js": "^3.31.0",
+    "core-js": "^3.31.1",
     "das-sdk": "^1.9.3",
     "deepmerge": "^4.3.1",
-    "eth-block-tracker": "^7.0.1",
+    "eth-block-tracker": "^7.1.0",
     "eth-json-rpc-filters": "^6.0.0",
     "eth-query": "^2.1.2",
     "eth-rpc-errors": "^4.0.3",
-    "ethers": "^6.6.1",
+    "ethers": "^6.6.5",
     "ethjs-query": "^0.3.8",
     "fast-json-patch": "^3.1.1",
     "jsonschema": "^1.4.1",
@@ -76,7 +76,7 @@
     "loglevel": "^1.8.1",
     "pify": "^5.0.0",
     "pump": "^3.0.0",
-    "readable-stream": "^4.4.0",
+    "readable-stream": "^4.4.2",
     "register-service-worker": "^1.7.2",
     "swappable-obj-proxy": "^1.1.0",
     "vue": "^2.7.14",
@@ -97,14 +97,14 @@
     "workbox-strategies": "^7.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.5",
-    "@babel/eslint-parser": "^7.22.5",
+    "@babel/core": "^7.22.9",
+    "@babel/eslint-parser": "^7.22.9",
     "@babel/eslint-plugin": "^7.22.5",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-proposal-numeric-separator": "^7.18.6",
-    "@babel/preset-env": "^7.22.5",
+    "@babel/preset-env": "^7.22.9",
     "@babel/register": "^7.22.5",
-    "@sentry/cli": "^2.19.1",
+    "@sentry/cli": "^2.20.0",
     "@vue/cli-plugin-babel": "^5.0.8",
     "@vue/cli-plugin-eslint": "^5.0.8",
     "@vue/cli-plugin-pwa": "^5.0.8",
@@ -115,7 +115,7 @@
     "cross-env": "^7.0.3",
     "dotenv": "^16.3.1",
     "empty-module": "0.0.2",
-    "eslint": "^8.43.0",
+    "eslint": "^8.45.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-config-problems": "^8.0.0",
@@ -128,24 +128,24 @@
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "eslint-plugin-switch-case": "^1.1.2",
     "eslint-plugin-unicorn": "^47.0.0",
-    "eslint-plugin-vue": "^9.15.0",
-    "eslint-plugin-vue-scoped-css": "^2.4.0",
+    "eslint-plugin-vue": "^9.15.1",
+    "eslint-plugin-vue-scoped-css": "^2.5.0",
     "express": "^4.18.2",
     "fibers": "^5.0.3",
-    "ganache": "^7.8.0",
+    "ganache": "^7.9.0",
     "husky": "^8.0.3",
     "jsdom": "^22.1.0",
     "jsdom-global": "^3.0.2",
-    "lint-staged": "^13.2.2",
+    "lint-staged": "^13.2.3",
     "lodash-es": "^4.17.21",
     "luxon": "^3.3.0",
     "mocha": "^10.2.0",
-    "nock": "13.3.1",
-    "node-fetch": "^3.3.1",
+    "nock": "13.3.2",
+    "node-fetch": "^3.3.2",
     "nyc": "^15.1.0",
     "prettier": "^2.8.8",
     "process": "^0.11.10",
-    "puppeteer": "^20.7.3",
+    "puppeteer": "^20.9.0",
     "sass": "~1.32.13",
     "sass-loader": "^13.3.2",
     "sinon": "^15.2.0",

src/components/Confirm/AddNetwork/AddNetwork.vue

@@ -18,7 +18,7 @@
       </v-flex>
     </v-layout>
     <v-divider class="mx-6"></v-divider>
-    <v-layout wrap align-center ma-6>
+    <v-layout wrap align-center pa-6>
       <v-flex xs12 mb-2>
         <div class="caption mb-2 text_2--text">{{ t('dappProvider.requestFrom') }}</div>
 

src/components/Confirm/ConfirmForm/ConfirmForm.vue

@@ -380,7 +380,7 @@
         </v-flex>
       </v-layout>
       <v-layout wrap>
-        <v-flex xs12 mt-8 mx-6>
+        <v-flex xs12 my-8 mx-6>
           <v-layout mx-n2>
             <v-flex xs6 px-2>
               <v-btn block text large class="text_2--text" @click="triggerDeny">

src/components/Confirm/NetworkSwitch/NetworkSwitch.vue

@@ -18,7 +18,7 @@
       </v-flex>
     </v-layout>
     <v-divider class="mx-6"></v-divider>
-    <v-layout wrap align-center ma-6>
+    <v-layout wrap align-center pa-6>
       <v-flex xs12 mb-2>
         <div class="caption mb-2 text_2--text">{{ t('dappProvider.requestFrom') }}</div>
 

src/components/helpers/QuickAddress/QuickAddress.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="quick-address d-flex align-center">
     <div class="ml-auto">
+      <WalletConnectModal />
+    </div>
+    <div class="ml-2">
       <ShowToolTip :address="selectedAddress">
         <v-btn small class="address-btn" aria-label="Copy Address">
           <v-icon left size="9">$vuetify.icons.address</v-icon>
@@ -22,9 +25,10 @@ import { mapState } from 'vuex'
 import { apiStreamSupported, toChecksumAddressByChainId } from '../../../utils/utils'
 import ExportQrCode from '../ExportQrCode'
 import ShowToolTip from '../ShowToolTip'
+import WalletConnectModal from '../WalletConnectModal'
 
 export default {
-  components: { ExportQrCode, ShowToolTip },
+  components: { ExportQrCode, ShowToolTip, WalletConnectModal },
   computed: {
     ...mapState({
       selectedAddress(state) {