diff --git a/packages/bot-web-ui/src/app/app.jsx b/packages/bot-web-ui/src/app/app.jsx index 971745fc714a..30e86ae295fc 100644 --- a/packages/bot-web-ui/src/app/app.jsx +++ b/packages/bot-web-ui/src/app/app.jsx @@ -33,9 +33,9 @@ const App = ({ passthrough }) => { ApiHelpers.setInstance(app.api_helpers_store); const { active_symbols } = ApiHelpers.instance; + setIsLoading(true); - active_symbols.retrieveActiveSymbols(true).then(async () => { - await app.root_store.ws.wait('landing_company', 'get_settings'); + active_symbols.retrieveActiveSymbols(true).then(() => { setIsLoading(false); onMount(); }); diff --git a/packages/core/src/Stores/client-store.js b/packages/core/src/Stores/client-store.js index 741dd925390d..6f22e4554149 100644 --- a/packages/core/src/Stores/client-store.js +++ b/packages/core/src/Stores/client-store.js @@ -681,9 +681,7 @@ export default class ClientStore extends BaseStore { @computed get is_options_blocked() { - return this.is_logged_in - ? isOptionsBlocked(this.residence) - : isOptionsBlocked(this.website_status.clients_country); + return isOptionsBlocked(this.residence); } /**