fix: 🐛 conflicts,lint, and github comment

Author: gamalielhere

.nvmrc

@@ -0,0 +1 @@
+12.22.3

CHANGELOG.md

@@ -9,6 +9,7 @@
 * fix prefilled swaps [#3240](https://github.com/MyEtherWallet/MyEtherWallet/pull/3240)
 * use network getter instead of currentNetwork [#3260](https://github.com/MyEtherWallet/MyEtherWallet/pull/3260)
 * fix getransferv2 error [#3259](https://github.com/MyEtherWallet/MyEtherWallet/pull/3259)
+* fix let toast handle error [#3275](https://github.com/MyEtherWallet/MyEtherWallet/pull/3275)
 
 ### Release v6.0.1
 
@@ -17,9 +18,11 @@
 * fix show private key in paper wallet for non pubKeyOnly wallets [#3239](https://github.com/MyEtherWallet/MyEtherWallet/pull/3239)
 * Fix contract interaction [#3251](https://github.com/MyEtherWallet/MyEtherWallet/pull/3251)
 * Format 24 hour change percentage on module balance [#3248](https://github.com/MyEtherWallet/MyEtherWallet/pull/3248)
+* fix $store null [#3273](https://github.com/MyEtherWallet/MyEtherWallet/pull/3273)
 
 ### Feature
 
+* Change routes from hardcoded string to consts [#3244](https://github.com/MyEtherWallet/MyEtherWallet/pull/3244)
 * Remove divider in Staked UI and replace Russ team member photo [#3246](https://github.com/MyEtherWallet/MyEtherWallet/pull/3246)
 
 ### Devop

devmoji.config.js

@@ -6,16 +6,16 @@ module.exports = {
     { code: 'revert', gitmoji: 'rewind' },
     { code: 'lint', gitmoji: 'card_file_box' },
     { code: 'translations', gitmoji: 'globe_with_meridians' },
-    { code: 'build', gitmoji: ':green_heart:' },
-    { code: 'ci', gitmoji: ':green_heart:' },
-    { code: 'chore', gitmoji: ':construction_worker:' },
-    { code: 'docs', gitmoji: ':memo:' },
-    { code: 'feat', gitmoji: ':sparkles:' },
-    { code: 'fix', gitmoji: ':bug:' },
-    { code: 'refactor', gitmoji: ':recycle:' },
-    { code: 'style', gitmoji: ':art:' },
-    { code: 'test', gitmoji: ':white_check_mark:' },
-    { code: 'translation', gitmoji: ':globe_with_meridians:' },
-    { code: 'sentry', gitmoji: ':fire:' }
+    { code: 'build', gitmoji: 'green_heart' },
+    { code: 'ci', gitmoji: 'green_heart' },
+    { code: 'chore', gitmoji: 'construction_worker' },
+    { code: 'docs', gitmoji: 'page_facing_up' },
+    { code: 'feat', gitmoji: 'sparkles' },
+    { code: 'fix', gitmoji: 'bug' },
+    { code: 'refactor', gitmoji: 'recycle' },
+    { code: 'style', gitmoji: 'art' },
+    { code: 'test', gitmoji: 'white_check_mark' },
+    { code: 'translation', gitmoji: 'globe_with_meridians' },
+    { code: 'sentry', gitmoji: 'fire' }
   ]
 };

package-lock.json

@@ -20,7 +20,8 @@ const EXCEPTIONS = [
   '@aave/protocol-js',
   '@unstoppabledomains/resolution',
   'sass',
-  'scryptsy'
+  'scryptsy',
+  'is-ipfs' // verifying this next week
 ];
 const CUSTOM_DIST = {
   ['babel-core']: 'bridge'

package-test.js

@@ -23,7 +23,10 @@
           </a>
         </template>
         <template #slide2>
-          <router-link :to="{ name: 'BuyHardwareWallet' }" target="_blank">
+          <router-link
+            :to="{ name: ROUTES_HOME.BUY_HARDWARE_WALLET.NAME }"
+            target="_blank"
+          >
             <div class="ad2 px-5 d-flex flex-column justify-center">
               <div class="title font-weight-bold mb-n1">Hardware wallets</div>
               <div class="mb-2">Buy a hardware wallet!</div>
@@ -63,7 +66,13 @@
 </template>
 
 <script>
-export default {};
+import { ROUTES_HOME } from '@/core/configs/configRoutes';
+
+export default {
+  data: () => ({
+    ROUTES_HOME: ROUTES_HOME
+  })
+};
 </script>
 
 <style lang="scss" scoped>

src/core/components/AppCarousel.vue

@@ -40,14 +40,18 @@
               class="mr-4"
               title="Create a new wallet"
               btn-size="xlarge"
-              @click.native="$router.push({ name: 'CreateWallet' })"
+              @click.native="
+                $router.push({ name: ROUTES_HOME.CREATE_WALLET.NAME })
+              "
             />
             <mew-button
               color-theme="primary"
               btn-style="outline"
               title="Access my wallet"
               btn-size="xlarge"
-              @click.native="$router.push({ name: 'AccessWallet' })"
+              @click.native="
+                $router.push({ name: ROUTES_HOME.ACCESS_WALLET.NAME })
+              "
             />
           </div>
         </div>
@@ -90,7 +94,9 @@
                 has-full-width
                 title="Create a new wallet"
                 btn-size="xlarge"
-                @click.native="$router.push({ name: 'CreateWallet' })"
+                @click.native="
+                  $router.push({ name: ROUTES_HOME.CREATE_WALLET.NAME })
+                "
               />
             </v-col>
             <v-col cols="12" sm="6" class="mb-n2">
@@ -99,7 +105,9 @@
                 btn-style="outline"
                 title="Access my wallet"
                 btn-size="xlarge"
-                @click.native="$router.push({ name: 'AccessWallet' })"
+                @click.native="
+                  $router.push({ name: ROUTES_HOME.ACCESS_WALLET.NAME })
+                "
               />
             </v-col>
           </v-row>
@@ -110,11 +118,14 @@
 </template>
 
 <script>
+import { ROUTES_HOME } from '../configs/configRoutes';
 export default {
   name: 'GetStarted',
   components: {},
   data() {
-    return {};
+    return {
+      ROUTES_HOME: ROUTES_HOME
+    };
   }
 };
 </script>

src/core/components/AppGetStarted.vue

@@ -0,0 +1,30 @@
+const ROUTES_HOME = {
+  HOME: { NAME: 'Home', PATH: '' },
+  //A-Z
+  ACCESS_WALLET: { NAME: 'AccessWallet', PATH: 'wallet/access/:overlay?' },
+  BUY_HARDWARE_WALLET: { NAME: 'BuyHardwareWallet', PATH: 'company' },
+  COMPANY_PAGE: { NAME: 'CompanyPage', PATH: 'company' },
+  CREATE_WALLET: { NAME: 'CreateWallet', PATH: 'wallet/create/:overlay?' },
+  HOW_IT_WORKS: { NAME: 'HowItWorks', PATH: 'how-it-works' },
+  PRESS_KIT: { NAME: 'PressKit', PATH: 'presskit' },
+  PRIVACY_POLICY: { NAME: 'PrivacyPolicy', PATH: 'privacy-policy' },
+  SECURITY_POLICY: { NAME: 'SecurityPolicy', PATH: 'security-policy' },
+  TEAM_PAGE: { NAME: 'TeamPage', PATH: 'team' },
+  TERMS_OF_SERVICE: { NAME: 'TermsOfService', PATH: 'terms-of-service' },
+  TOOLS: { NAME: 'Tools', PATH: 'tools' }
+};
+const ROUTES_WALLET = {
+  WALLETS: { NAME: 'Wallets', PATH: '' },
+  //A-Z
+  DAPPS: { NAME: 'Dapps', PATH: 'dapps' },
+  DASHBOARD: { NAME: 'Dashboard', PATH: 'dashboard' },
+  DEPLOY_CONTRACT: { NAME: 'DeployContract', PATH: 'deploy' },
+  INTERACT_WITH_CONTRACT: { NAME: 'InteractWithContract', PATH: 'interact' },
+  NFT_MANAGER: { NAME: 'NFTManager', PATH: 'nft' },
+  SEND_TX: { NAME: 'SendTX', PATH: 'send-tx' },
+  SIGN_MESSAGE: { NAME: 'SignMessage', PATH: 'sign' },
+  SWAP: { NAME: 'Swap', PATH: 'swap' },
+  VERIFY_MESSAGE: { NAME: 'VerifyMessage', PATH: 'verify' }
+};
+
+export { ROUTES_HOME, ROUTES_WALLET };

src/core/configs/configRoutes.js

@@ -3,6 +3,7 @@ import store from '@/core/store';
 import langShortCodes from '@/translations/getShortCodes';
 import routesDefault from './routes-default';
 import routesWallet from './routes-wallet';
+import { ROUTES_HOME } from '../configs/configRoutes';
 const routes = [routesDefault, routesWallet];
 
 const getLangBasePath = () => {
@@ -38,7 +39,8 @@ router.beforeResolve((to, from, next) => {
        * this is a little hacky but utilizes intended purpose.
        * vue router notes: move on to the next hook in the pipeline. If no hooks are left, the navigation is confirmed.
        */
-      if (from.name !== 'AccessWallet') router.push({ name: 'AccessWallet' });
+      if (from.name !== ROUTES_HOME.ACCESS_WALLET.NAME)
+        router.push({ name: ROUTES_HOME.ACCESS_WALLET.NAME });
     } else {
       if (store.state.external.path !== '') {
         const localPath = store.state.external.path;