fix(INJI-449): secure-keystore warning popup shown on reload of app

settings key which was stored in storage was not loaded into settings machine context correctly, which caused the bug - on reload settings related flows was falling back to initial setting. Co-authored-by: Sreenadh S <[email protected]> Signed-off-by: Kiruthika Jeyashankar <[email protected]>
tw-mosip · Nov 28, 2023 · 3a47303 · 3a47303
1 parent db8238c
commit 3a47303
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/machines/app.ts b/machines/app.ts
@@ -319,17 +319,17 @@ export const appMachine = model.createMachine(
 
       loadCredentialRegistryInConstants: (_context, event) => {
         changeCrendetialRegistry(
-          !event.response?.credentialRegistry
+          !event.response?.encryptedData?.credentialRegistry
             ? MIMOTO_BASE_URL
-            : event.response?.credentialRegistry,
+            : event.response?.encryptedData?.credentialRegistry,
         );
       },
 
       loadEsignetHostFromConstants: (_context, event) => {
         changeEsignetUrl(
-          !event.response?.esignetHostUrl
+          !event.response?.encryptedData?.esignetHostUrl
             ? ESIGNET_BASE_URL
-            : event.response?.esignetHostUrl,
+            : event.response?.encryptedData?.esignetHostUrl,
         );
       },
     },

diff --git a/machines/settings.ts b/machines/settings.ts
@@ -195,7 +195,8 @@ export const settingsMachine = model.createMachine(
         __AppId.setValue(newContext.appId);
         return {
           ...context,
-          ...newContext,
+          ...newContext.encryptedData,
+          appId: newContext.appId,
         };
       }),