go back to previous url after lock

src/app/accounts/lock.component.ts

@@ -36,9 +36,12 @@ export class LockComponent extends BaseLockComponent {
             this.router.navigate(['vault']);
         }
 
-        const previousUrl = this.routerService.getPreviousUrl();
+        this.onSuccessfulSubmit = () => {
-        if (previousUrl !== '/' && previousUrl.indexOf('lock') === -1) {
+            const previousUrl = this.routerService.getPreviousUrl();
-            this.successRoute = previousUrl;
+            if (previousUrl !== '/' && previousUrl.indexOf('lock') === -1) {
-        }
+                this.successRoute = previousUrl;
+            }
+            this.router.navigate([this.successRoute]);
+        };
     }
 }

src/app/app.component.ts

@@ -111,6 +111,9 @@ export class AppComponent implements OnDestroy, OnInit {
                         this.notificationsService.updateConnection(false);
                         this.router.navigate(['lock']);
                         break;
+                    case 'lockedUrl':
+                        window.setTimeout(() => this.routerService.setPreviousUrl(message.url), 500);
+                        break;
                     case 'syncStarted':
                         break;
                     case 'syncCompleted':

src/app/services/router.service.ts

@@ -14,7 +14,7 @@ export class RouterService {
     private currentUrl: string = undefined;
 
     constructor(private router: Router, private activatedRoute: ActivatedRoute,
-        private titleService: Title, private i18nService: I18nService) {
+        private titleService: Title, i18nService: I18nService) {
         this.currentUrl = this.router.url;
         router.events.subscribe((event) => {
             if (event instanceof NavigationEnd) {
@@ -55,4 +55,8 @@ export class RouterService {
     getPreviousUrl() {
         return this.previousUrl;
     }
+
+    setPreviousUrl(url: string) {
+        this.previousUrl = url;
+    }
 }