Jim/88166/delay in real account creation flow after clicking add acco…

…unt button in the account creation popup (#7926) * chore: remove duplicate get_settings api request * chore: set account_settings in client-store if undefined * chore: remove unnecessary else block * refactor: convert if expression to ternary * chore: set account_settings in client store instead of creating a local variable
deriv-com · Mar 21, 2023 · 8bb1351 · 8bb1351
1 parent 19b3dc8
commit 8bb1351
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/packages/core/src/Stores/client-store.js b/packages/core/src/Stores/client-store.js
@@ -1317,7 +1317,7 @@ export default class ClientStore extends BaseStore {
                     new_data.landing_company_shortcode = authorize_response.authorize.landing_company_name;
                     runInAction(() => (client_accounts[client_id] = new_data));
                     this.setLoginInformation(client_accounts, client_id);
-                    WS.authorized.storage.getSettings().then(get_settings_response => {
+                    WS.authorized.getSettings().then(get_settings_response => {
                         this.setAccountSettings(get_settings_response.get_settings);
                         resolve();
                     });
@@ -1659,14 +1659,16 @@ export default class ClientStore extends BaseStore {
                     statement: 1,
                 })
             );
-            const account_settings = (await WS.authorized.cache.getSettings()).get_settings;
-            if (account_settings) this.setPreferredLanguage(account_settings.preferred_language);
+
+            if (Object.keys(this.account_settings).length === 0) {
+                this.setAccountSettings((await WS.authorized.getSettings()).get_settings);
+            }
+            if (this.account_settings) this.setPreferredLanguage(this.account_settings.preferred_language);
             await this.fetchResidenceList();
             await this.getTwoFAStatus();
-            if (account_settings && !account_settings.residence) {
+            if (this.account_settings && !this.account_settings.residence) {
                 this.root_store.ui.toggleSetResidenceModal(true);
             }
-
             await WS.authorized.cache.landingCompany(this.residence).then(this.responseLandingCompany);
             if (!this.is_virtual) await this.getLimits();
 

diff --git a/packages/core/src/_common/base/socket_cache.js b/packages/core/src/_common/base/socket_cache.js
@@ -30,6 +30,7 @@ const SocketCache = (() => {
         contracts_for: { expire: 10 },
         exchange_rates: { expire: 60 },
         trading_times: { expire: 120 },
+        get_settings: { expire: 10 },
         // TODO: Enable statement and trade table caching once we have UI design for handling
         // transitions between cached table and newly added data to table
         // statement             : { expire: 10 },