feature/logout-navigation

CHANGELOG.md

@@ -1,5 +1,6 @@
 ### Bug
 
+- Logout warning modal redirect to current page instead of home page [#1297](https://github.com/MyEtherWallet/MyEtherWallet/pull/1297)
 - Custom networks not showing on send offline helper [#1285](https://github.com/MyEtherWallet/MyEtherWallet/pull/1285)
 
 ### Devop

src/builds/web/app.vue

@@ -70,6 +70,10 @@ export default {
     this.$refs.welcome.$refs.welcome.$on('hidden', () => {
       store.set('notFirstTimeVisit', true);
     });
+
+    this.$refs.logoutWarningModal.$refs.logoutWarningModal.$on('hidden', () => {
+      window.scrollTo(0, 0);
+    });
   },
   destroyed() {
     window.removeEventListener('PWA_UPDATED');

src/components/LogoutModal/LogoutModal.vue

@@ -29,7 +29,6 @@ export default {
     logout() {
       this.$store.dispatch('clearWallet');
       this.$refs.logout.hide();
-      this.$router.push('/');
     },
     cancel() {
       this.$refs.logout.hide();

src/components/LogoutWarningModal/LogoutWarningModal.vue

@@ -44,7 +44,12 @@ export default {
   },
   methods: {
     logout() {
+      const path = this.$route.fullPath;
+      if (path !== '/interface') {
+        this.$store.dispatch('setLastPath', path);
+      }
       this.$store.dispatch('clearWallet');
+      this.$store.dispatch('setLastPath', '');
       this.$refs.logoutWarningModal.hide();
     },
     cancel() {

src/layouts/InterfaceLayout/components/InterfaceTokens/InterfaceTokens.vue

@@ -196,8 +196,8 @@ export default {
       if (store.get('localTokens') !== undefined) {
         this.getV3Tokens();
       }
-      const storedTokens = store.get('customTokens');
-      this.customTokens = storedTokens.hasOWnProperty(this.network.type.name)
+      const storedTokens = store.get('customTokens') || {};
+      this.customTokens = storedTokens.hasOwnProperty(this.network.type.name)
         ? storedTokens[this.network.type.name]
         : [];
     },

src/store/actions.js

@@ -77,10 +77,11 @@ const gettingStartedDone = function({ commit }) {
 };
 
 const clearWallet = function({ commit, state }) {
+  const linkTo = state.path !== '' ? state.path : '/';
   if (state.wallet && state.wallet.identifier === MEW_CONNECT) {
     state.wallet.mewConnect().disconnectRTC();
   }
-  Vue.router.push('/');
+  Vue.router.push(linkTo);
   commit('CLEAR_WALLET');
 };