From c62ba6f4e9c704a89582637301cde77b5117f146 Mon Sep 17 00:00:00 2001
From: cwlee <cwlee0@gmail.com>
Date: Thu, 2 Jun 2022 18:30:15 +0800
Subject: [PATCH] fix: opportunistic selectedAddress restore

---
 src/controllers/TorusController.ts | 4 ++++
 src/utils/enums.ts                 | 1 +
 2 files changed, 5 insertions(+)

diff --git a/src/controllers/TorusController.ts b/src/controllers/TorusController.ts
index ae373429..2929196f 100644
--- a/src/controllers/TorusController.ts
+++ b/src/controllers/TorusController.ts
@@ -1307,6 +1307,7 @@ export default class TorusController extends BaseController<TorusControllerConfi
     const keyState: KeyState = {
       priv_key: ecc_privateKey.toString("hex"),
       pub_key: ecc_publicKey.toString("hex"),
+      sol_pub_key: saveState.publicKey,
     };
 
     try {
@@ -1344,9 +1345,12 @@ export default class TorusController extends BaseController<TorusControllerConfi
           : {
               priv_key: "",
               pub_key: "",
+              sol_pub_key: "",
             };
 
       if (keyState.priv_key && keyState.pub_key) {
+        // opportunistic login
+        this.preferencesController.setSelectedAddress(keyState.sol_pub_key);
         const metadata = await this.storageLayer?.getMetadata({ privKey: new BN(keyState.priv_key, "hex") });
 
         const decryptedState = metadata as OpenLoginBackendState;
diff --git a/src/utils/enums.ts b/src/utils/enums.ts
index ce852de1..0b5377d9 100644
--- a/src/utils/enums.ts
+++ b/src/utils/enums.ts
@@ -52,6 +52,7 @@ export type OpenLoginPopupResponse = {
 export interface KeyState {
   priv_key: string;
   pub_key: string;
+  sol_pub_key: string;
 }
 
 export interface OpenLoginBackendState {