From d5ceab476a1c02da0bffc9c53a3cb31797837143 Mon Sep 17 00:00:00 2001
From: Eduard Kuzmenko <thanwords24@gmail.com>
Date: Fri, 30 Apr 2021 19:15:59 +0400
Subject: [PATCH] Fix support of old state

---
 src/lib/appManagers/appStateManager.ts | 17 +++++++++--------
 src/pages/pageSignQR.ts                |  9 +++------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/lib/appManagers/appStateManager.ts b/src/lib/appManagers/appStateManager.ts
index 5f4bdd6b..9fa052ab 100644
--- a/src/lib/appManagers/appStateManager.ts
+++ b/src/lib/appManagers/appStateManager.ts
@@ -276,21 +276,22 @@ export class AppStateManager extends EventListenerBase<{
         
         //state = this.state = new Proxy(state, getHandler());
 
+        // * support old version
+        if(!state.settings.hasOwnProperty('theme') && state.settings.hasOwnProperty('nightTheme')) {
+          state.settings.theme = state.settings.nightTheme ? 'night' : 'day';
+          this.pushToState('settings', state.settings);
+        }
+
         // * support old version
         if(!state.settings.hasOwnProperty('themes') && state.settings.background) {
-          const theme = STATE_INIT.settings.themes.find(t => t.name === STATE_INIT.settings.theme);
+          state.settings.themes = copy(STATE_INIT.settings.themes);
+          const theme = state.settings.themes.find(t => t.name === state.settings.theme);
           if(theme) {
-            state.settings.themes.find(t => t.name === theme.name).background = copy(state.settings.background);
+            theme.background = state.settings.background;
             this.pushToState('settings', state.settings);
           }
         }
 
-        // * support old version
-        if(!state.settings.hasOwnProperty('theme') && state.settings.hasOwnProperty('nightTheme')) {
-          state.settings.theme = state.settings.nightTheme ? 'night' : 'day';
-          this.pushToState('settings', state.settings);
-        }
-
         validateInitObject(STATE_INIT, state, (missingKey) => {
           // @ts-ignore
           this.pushToState(missingKey, state[missingKey]);
diff --git a/src/pages/pageSignQR.ts b/src/pages/pageSignQR.ts
index 95b8f63c..dbe5bb98 100644
--- a/src/pages/pageSignQR.ts
+++ b/src/pages/pageSignQR.ts
@@ -6,9 +6,6 @@
 
 import apiManager from '../lib/mtproto/mtprotoworker';
 import Page from './page';
-import pageIm from './pageIm';
-import pagePassword from './pagePassword';
-import pageSignIn from './pageSignIn';
 import serverTimeManager from '../lib/mtproto/serverTimeManager';
 import { AuthAuthorization, AuthLoginToken } from '../layer';
 import { bytesCmp, bytesToBase64 } from '../helpers/bytes';
@@ -48,7 +45,7 @@ let onFirstMount = async() => {
   container.append(h4, helpList, inputWrapper);
 
   btnBack.addEventListener('click', () => {
-    pageSignIn.mount();
+    import('./pageSignIn').then(m => m.default.mount());
     stop = true;
   });
   
@@ -89,7 +86,7 @@ let onFirstMount = async() => {
       if(loginToken._ === 'auth.loginTokenSuccess') {
         const authorization = loginToken.authorization as any as AuthAuthorization.authAuthorization;
         apiManager.setUserAuth(authorization.user.id);
-        pageIm.mount();
+        import('./pageIm').then(m => m.default.mount());
         return true;
       }
 
@@ -201,7 +198,7 @@ let onFirstMount = async() => {
         case 'SESSION_PASSWORD_NEEDED':
           console.warn('pageSignQR: SESSION_PASSWORD_NEEDED');
           err.handled = true;
-          pagePassword.mount();
+          import('./pagePassword').then(m => m.default.mount());
           stop = true;
           cachedPromise = null;
           break;