Invalidate account cache if account token changes

1 files changed, 7 insertions, 0 deletions

diff --git a/gui/packages/desktop/src/renderer/app.js b/gui/packages/desktop/src/renderer/app.js
index c65906d010..e973340107 100644
--- a/gui/packages/desktop/src/renderer/app.js
+++ b/gui/packages/desktop/src/renderer/app.js
@@ -615,6 +615,7 @@ type AccountVerification =
 // An account data cache that helps to throttle RPC requests to get_account_data and retain the
 // cached value for 1 minute.
 class AccountDataCache {
+  _currentAccount: ?AccountToken;
   _executingPromise: ?Promise<AccountData>;
   _value: ?AccountData;
   _expiresAt: ?Date;
@@ -625,6 +626,12 @@ class AccountDataCache {
   }
 
   async fetch(accountToken: AccountToken): Promise<AccountData> {
+    // invalidate cache if account token has changed
+    if (accountToken !== this._currentAccount) {
+      this.invalidate();
+      this._currentAccount = accountToken;
+    }
+
     // return the same promise if still fetching from remote
     const executingPromise = this._executingPromise;
     if (executingPromise) {