From cc285e5ea729795812d8f1f66f622b67c11efb4a Mon Sep 17 00:00:00 2001
From: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
Date: Tue, 18 Jan 2022 13:44:39 +1000
Subject: [PATCH] Always migrate envUrls (#614)

---
 common/src/services/stateMigration.service.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/common/src/services/stateMigration.service.ts b/common/src/services/stateMigration.service.ts
index 5c5ee37fa84..9d422e7006b 100644
--- a/common/src/services/stateMigration.service.ts
+++ b/common/src/services/stateMigration.service.ts
@@ -177,9 +177,7 @@ export class StateMigrationService {
                 v1Keys.enableBiometric,
                 options
               ),
-              environmentUrls:
-                (await this.storageService.get<EnvironmentUrls>(v1Keys.environmentUrls, options)) ??
-                new EnvironmentUrls(),
+              environmentUrls: null,
               installedVersion: await this.storageService.get<string>(
                 v1Keys.installedVersion,
                 options
@@ -489,6 +487,10 @@ export class StateMigrationService {
             },
           };
 
+    initialState.globals.environmentUrls =
+      (await this.storageService.get<EnvironmentUrls>(v1Keys.environmentUrls, options)) ??
+      new EnvironmentUrls();
+
     await this.storageService.save("state", initialState, options);
 
     if (await this.secureStorageService.has(v1Keys.key, { keySuffix: "biometric" })) {