prefer remote params, save params

prax-wallet · Jun 27, 2024 · 9a3e352 · 9a3e352
1 parent 9b43db5
commit 9a3e352
Showing 1 changed file with 9 additions and 21 deletions.
diff --git a/apps/extension/src/wallet-services.ts b/apps/extension/src/wallet-services.ts
@@ -39,29 +39,17 @@ export const startWalletServices = async () => {
  * local storage.
  */
 const getChainId = async (baseUrl: string) => {
-  const localParams = await localExtStorage
-    .get('params')
-    .then(jsonParams => (jsonParams ? AppParameters.fromJsonString(jsonParams) : undefined));
+  const params =
+    (await createPromiseClient(AppService, createGrpcWebTransport({ baseUrl })).appParameters({}))
+      .appParameters ??
+    (await localExtStorage
+      .get('params')
+      .then(jsonParams => (jsonParams ? AppParameters.fromJsonString(jsonParams) : undefined)));
 
-  let chainId = localParams?.chainId;
+  if (params?.chainId) void localExtStorage.set('params', params.toJsonString());
+  else throw new Error('No chainId available');
 
-  if (!localParams) {
-    try {
-      const remoteParams = (
-        await createPromiseClient(AppService, createGrpcWebTransport({ baseUrl })).appParameters({})
-      ).appParameters;
-
-      chainId ??= remoteParams?.chainId;
-
-      if (remoteParams) void localExtStorage.set('params', remoteParams.toJsonString());
-    } catch (e) {
-      console.warn(e);
-    }
-  }
-
-  if (!chainId) throw new Error('No chainId available');
-
-  return chainId;
+  return params.chainId;
 };
 
 /**