Merge pull request #1765 from wavesplatform/dexw-2282-dayX-old

Dexw 2282 day x old

Author: vba2000

data-service/utils/ConfigService.ts

@@ -30,17 +30,17 @@ export class ConfigService {
 
     protected wavesApp: any;
 
-    protected _instance: ConfigService | null = null;
+    protected static _instance: ConfigService | void;
 
     public change = new Signal() as Signal<string>;
 
     public configReady: Promise<any>;
 
     constructor(wavesApp: any) {
-        if (this._instance) {
-            return this._instance;
+        if (ConfigService._instance) {
+            return ConfigService._instance;
         }
-        this._instance = this;
+        ConfigService._instance = this;
         this.wavesApp = wavesApp;
         this.configReady = this.fetchConfig();
     }

src/modules/app/initialize/AppRun.js

@@ -185,13 +185,6 @@
                     });
                 }
 
-                if (configService.get('DEXW_LOCKED') && $state.current.name !== 'migration') {
-                    $state.go('migration');
-                } else {
-                    $state.go('signIn');
-                }
-
-
                 $rootScope.WavesApp = WavesApp;
             }
 
@@ -415,7 +408,7 @@
                 const START_STATES = WavesApp.stateTree.where({ noLogin: true })
                     .map((item) => WavesApp.stateTree.getPath(item.id).join('.'));
 
-                const DEXW_LOCKED_STATES = ['migration', 'signIn'];
+                const DEXW_LOCKED_STATES = ['migration'];
 
                 const offInitialTransitions = $transitions.onStart({}, transition => {
                     const DEXW_LOCKED = configService.get('DEXW_LOCKED');