fix(renderer): Consistent store initialization

Make sure the RendererStore is in a state consistent with the MainStore
before attempting to initialize the application.

This avoids, e.g., race conditions when trying to load the default
locale spuriously before loading the actually selected locale.

Signed-off-by: Kristóf Marussy <kristof@marussy.com>

2 files changed, 9 insertions, 8 deletions

diff --git a/packages/renderer/src/index.tsx b/packages/renderer/src/index.tsx
index 60ef714..a408c4d 100644
--- a/packages/renderer/src/index.tsx
+++ b/packages/renderer/src/index.tsx
@@ -46,7 +46,7 @@ if (isDevelopment) {
 
 const { sophieRenderer: ipc } = window;
 
-const store = createAndConnectRendererStore(ipc);
+const store = await createAndConnectRendererStore(ipc);
 
 if (isDevelopment) {
   exposeToReduxDevtools(store).catch((error) => {
diff --git a/packages/renderer/src/stores/RendererStore.ts b/packages/renderer/src/stores/RendererStore.ts
index f48d484..7052162 100644
--- a/packages/renderer/src/stores/RendererStore.ts
+++ b/packages/renderer/src/stores/RendererStore.ts
@@ -66,27 +66,28 @@ export default RendererStore;
  * the newly created store via `ipc`.
  *
  * @param ipc The `sophieRenderer` context bridge.
+ * @returns A promise that resolves to the store once it was initialized.
  */
-export function createAndConnectRendererStore(
+export async function createAndConnectRendererStore(
   ipc: SophieRenderer,
-): RendererStore {
+): Promise<RendererStore> {
   const env: RendererEnv = {
     dispatchMainAction: ipc.dispatchAction,
   };
   const store = RendererStore.create({}, env);
 
-  ipc
-    .onSharedStoreChange({
+  try {
+    await ipc.onSharedStoreChange({
       onSnapshot(snapshot) {
         applySnapshot(store.shared, snapshot);
       },
       onPatch(patch) {
         applyPatch(store.shared, patch);
       },
-    })
-    .catch((error) => {
-      log.error('Failed to connect to shared store', error);
     });
+  } catch (error) {
+    log.error('Failed to connect to shared store', error);
+  }
 
   return store;
 }