Merge pull request #3977 from Emurgo/fix/connector-i18n

fix i18n for connector pop up

Author: vsubhuman

packages/yoroi-extension/app/connector/stores/index.js

@@ -70,7 +70,7 @@ function initializeSubstore<T: {...}>(
 export default (action(
   (
     api: Api,
-  ): StoresMap => {
+  ): Promise<StoresMap> => {
     const storeNames = Object.keys(storeClasses);
     storeNames.forEach(name => {
       if (stores[name]) stores[name].teardown();
@@ -94,13 +94,14 @@ export default (action(
     initializeSubstore<AdaStoresMap>(loadedStores.substores.ada);
 
     // Perform load after all setup is done to ensure migration can modify store state
-    loadedStores.loading.load()
+    return loadedStores.loading.load()
       .then(() => console.debug('connector / loading store loaded'))
-      .catch(e => console.error('connector / loading store load failed', e));
-
-    return loadedStores;
+      .catch(e => console.error('connector / loading store load failed', e))
+      .then(() => {
+        return loadedStores;
+      });
   }
-): (Api) => StoresMap);
+): (Api) => Promise<StoresMap>);
 
 export type ConnectorStoresProps = {|
   +stores: StoresMap,

packages/yoroi-extension/app/connector/stores/toplevel/ProfileStore.js

@@ -8,6 +8,12 @@ export default class ProfileStore extends BaseProfileStore<StoresMap> {
 
   setup(): void {
     super.setup();
+    this.stores.loading.registerBlockingLoadingRequest(
+      (async () => {
+        await this.getProfileLocaleRequest.execute();
+      })(),
+      'load locale'
+    );
   }
 
   teardown(): void {

packages/yoroi-extension/chrome/extension/connector/index.js

@@ -29,7 +29,7 @@ const initializeDappConnector: void => Promise<void> = async () => {
   const router = new RouterStore();
   const hashHistory = createHashHistory();
   const history = syncHistoryWithStore(hashHistory, router);
-  const stores = createStores(api);
+  const stores = await createStores(api);
 
   window.yoroi = {
     api,