Merge branch 'master' of github.com:binary-com/deriv-app into amina/9…

…2874/Seeing_something's_not_right_message_while_change_MT5_investor_password
deriv-com · Apr 7, 2023 · 32e62ba · 32e62ba
2 parents 222e2e4 + 9ecfe42
commit 32e62ba
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/packages/core/src/Stores/common-store.js b/packages/core/src/Stores/common-store.js
@@ -1,10 +1,7 @@
 import * as SocketCache from '_common/base/socket_cache';
-import { reject } from 'lodash';
-
 import { action, computed, makeObservable, observable } from 'mobx';
 import { changeLanguage, getAllowedLanguages } from '@deriv/translations';
 import { getAppId, getUrlBinaryBot, getUrlSmartTrader, isMobile, platforms, routes, toMoment } from '@deriv/shared';
-
 import BaseStore from './base-store';
 import BinarySocket from '_common/base/socket_base';
 import ServerTime from '_common/base/server_time';
@@ -121,7 +118,7 @@ export default class CommonStore extends BaseStore {
             window.localStorage.setItem('i18n_language', key);
         }
 
-        return new Promise(resolve => {
+        return new Promise((resolve, reject) => {
             WS.setSettings({
                 set_settings: 1,
                 preferred_language: key,

diff --git a/packages/translations/src/i18next/i18next.ts b/packages/translations/src/i18next/i18next.ts
@@ -100,6 +100,7 @@ const i18n_config = {
         hashTransKey(defaultValue: string) {
             return crc32(defaultValue);
         },
+        useSuspense: false,
     },
     lng: initial_language,
     fallbackLng: 'EN',