thisyahlen/fix: login change language error

packages/core/src/App/Components/Layout/Header/menu-links.jsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 import { Text, Icon, Counter } from '@deriv/components';
 import { BinaryLink } from '../../Routes';
 import { observer, useStore } from '@deriv/stores';
@@ -81,16 +82,16 @@ const CashierTab = observer(() => {
 });
 
 const MenuLinks = observer(() => {
-    const { client, common, ui } = useStore();
+    const { i18n } = useTranslation();
+    const { client, ui } = useStore();
     const { is_logged_in } = client;
-    const { current_language } = common;
     const { is_mobile } = ui;
     const is_traders_hub = window.location.pathname === routes.traders_hub;
 
     if (!is_logged_in) return <></>;
 
     return (
-        <div key={`menu-links__${current_language}`} className='header__menu-links'>
+        <div key={`menu-links__${i18n.language}`} className='header__menu-links'>
             {!is_traders_hub && <ReportTab />}
             {!is_mobile && <CashierTab />}
         </div>

packages/core/src/Stores/client-store.js

@@ -1617,6 +1617,7 @@ export default class ClientStore extends BaseStore {
             const language = authorize_response.authorize.preferred_language;
             if (language !== 'EN' && language !== LocalStore.get(LANGUAGE_KEY)) {
                 window.history.replaceState({}, document.title, urlForLanguage(language));
+                await this.root_store.common.changeSelectedLanguage(language);
             }
             if (this.citizen) this.onSetCitizen(this.citizen);
             if (!this.is_virtual) {

packages/core/src/Stores/common-store.js

@@ -7,6 +7,7 @@ import BinarySocket from '_common/base/socket_base';
 import BaseStore from './base-store';
 import WS from 'Services/ws-methods';
 import * as SocketCache from '_common/base/socket_cache';
+import { reject } from 'lodash';
 
 export default class CommonStore extends BaseStore {
     constructor(root_store) {
@@ -112,26 +113,33 @@ export default class CommonStore extends BaseStore {
         }
     }
 
-    changeSelectedLanguage = key => {
+    changeSelectedLanguage = async key => {
         SocketCache.clear();
         if (key === 'EN') {
             window.localStorage.setItem('i18n_language', key);
         }
 
-        WS.setSettings({
-            set_settings: 1,
-            preferred_language: key,
-        }).then(() => {
-            const new_url = new URL(window.location.href);
-            if (key === 'EN') {
-                new_url.searchParams.delete('lang');
-            } else {
-                new_url.searchParams.set('lang', key);
-            }
-            window.history.pushState({ path: new_url.toString() }, '', new_url.toString());
-            changeLanguage(key, () => {
-                this.changeCurrentLanguage(key);
-                BinarySocket.closeAndOpenNewConnection(key);
+        return new Promise(resolve => {
+            WS.setSettings({
+                set_settings: 1,
+                preferred_language: key,
+            }).then(async () => {
+                const new_url = new URL(window.location.href);
+                if (key === 'EN') {
+                    new_url.searchParams.delete('lang');
+                } else {
+                    new_url.searchParams.set('lang', key);
+                }
+                window.history.pushState({ path: new_url.toString() }, '', new_url.toString());
+                try {
+                    await changeLanguage(key, () => {
+                        this.changeCurrentLanguage(key);
+                        BinarySocket.closeAndOpenNewConnection(key);
+                    });
+                    resolve();
+                } catch (e) {
+                    reject();
+                }
             });
         });
     };