Fix routing issues - Closes #180

src/app/components/login/login.js

@@ -54,8 +54,7 @@ app.component('login', {
           passphrase: this.Passphrase.normalize(_passphrase),
           network: this.network,
         });
-
-        this.$state.go('main');
+        this.$state.go(this.$rootScope.landingUrl || 'main.transactions');
       }
     }
 
@@ -78,9 +77,6 @@ app.component('login', {
       const passphrase = this.$location.search().passphrase || this.$cookies.get('passphrase');
       if (passphrase) {
         this.input_passphrase = passphrase;
-        if (this.$rootScope.logged === undefined) {
-          this.$timeout(this.passConfirmSubmit.bind(this), 10);
-        }
       }
     }
   },

src/app/components/main/main.js

@@ -48,10 +48,7 @@ app.component('main', {
           }
         });
 
-      // Return to landing page if there's any
-      this.activeTab = this.$rootScope.landingUrl || 'main.transactions';
-      this.$state.go(this.$rootScope.landingUrl || 'main.transactions');
-      delete this.$rootScope.landingUrl;
+      this.activeTab = this.$state.current.name;
     }
 
     checkIfIsDelegate() {

src/app/states.js

@@ -8,11 +8,12 @@ app.config(($stateProvider, $urlRouterProvider) => {
       component: 'login',
     })
     .state('main', {
+      abstract: true,
       url: '/main',
       component: 'main',
     })
     .state('main.transactions', {
-      url: '/transactions',
+      url: '',
       component: 'transactions',
     })
     .state('main.voting', {
@@ -23,6 +24,6 @@ app.config(($stateProvider, $urlRouterProvider) => {
       url: '/forging',
       component: 'forging',
     });
-  $urlRouterProvider.otherwise('/404');
+  $urlRouterProvider.otherwise('/');
   // $locationProvider.html5Mode(true);
 });

src/test/components/login/login.spec.js

@@ -138,7 +138,7 @@ describe('Login controller', () => {
       controller.input_passphrase = testPassphrase;
       const spy = sinon.spy($state, 'go');
       controller.passConfirmSubmit();
-      expect(spy).to.have.been.calledWith('main');
+      expect(spy).to.have.been.calledWith();
     });
   });