address review feedback

interledger · Oct 14, 2024 · 9178f5a · 9178f5a
1 parent c9ab8ce
commit 9178f5a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/esbuild/config.ts b/esbuild/config.ts
@@ -1,4 +1,5 @@
 import path from 'node:path';
+import { readdirSync } from 'node:fs';
 import type { BuildOptions } from 'esbuild';
 import type { Manifest } from 'webextension-polyfill';
 
@@ -10,6 +11,13 @@ export const SRC_DIR = path.resolve(ROOT_DIR, 'src');
 export const DEV_DIR = path.resolve(ROOT_DIR, 'dev');
 export const DIST_DIR = path.resolve(ROOT_DIR, 'dist');
 
+const KEY_AUTO_ADD_TARGETS = readdirSync(
+  path.join(SRC_DIR, 'content', 'keyAutoAdd'),
+  { withFileTypes: true },
+)
+  .filter((e) => e.isFile())
+  .map(({ name }) => path.basename(name, path.extname(name)));
+
 export type Target = (typeof TARGETS)[number];
 export type Channel = (typeof CHANNELS)[number];
 export type BuildArgs = {
@@ -28,14 +36,10 @@ export const options: BuildOptions = {
       in: path.join(SRC_DIR, 'content', 'index.ts'),
       out: path.join('content', 'content'),
     },
-    {
-      in: path.join(SRC_DIR, 'content', 'keyAutoAdd', 'testWallet.ts'),
-      out: path.join('content', 'keyAutoAdd', 'testWallet'),
-    },
-    {
-      in: path.join(SRC_DIR, 'content', 'keyAutoAdd', 'fynbos.ts'),
-      out: path.join('content', 'keyAutoAdd', 'fynbos'),
-    },
+    ...KEY_AUTO_ADD_TARGETS.map((name) => ({
+      in: path.join(SRC_DIR, 'content', 'keyAutoAdd', `${name}.ts`),
+      out: path.join('content', 'keyAutoAdd', name),
+    })),
     {
       in: path.join(SRC_DIR, 'content', 'polyfill.ts'),
       out: path.join('polyfill', 'polyfill'),

diff --git a/src/content/keyAutoAdd/fynbos.ts b/src/content/keyAutoAdd/fynbos.ts
@@ -23,7 +23,7 @@ const waitForLogin: Run<void> = async (
   let alreadyLoggedIn = window.location.href.startsWith(keyAddUrl);
   if (!alreadyLoggedIn) setNotificationSize('notification');
   try {
-    sleep(2000);
+    await sleep(2000);
     alreadyLoggedIn = await waitForURL(
       (url) => (url.origin + url.pathname).startsWith(keyAddUrl),
       { timeout: LOGIN_WAIT_TIMEOUT },

diff --git a/tests/e2e/connectAutoKeyFynbos.spec.ts b/tests/e2e/connectAutoKeyFynbos.spec.ts
@@ -110,7 +110,7 @@ test('Connect to Fynbos with automatic key addition when not logged-in to wallet
     return keyNickName;
   });
 
-  await test.step('shows connect consent page', async () => {
+  await test.step('shows wallet consent page', async () => {
     await waitForGrantConsentPage(page);
     expect(page.getByRole('button', { name: 'Approve' })).toBeVisible();
   });
@@ -133,15 +133,14 @@ test('Connect to Fynbos with automatic key addition when not logged-in to wallet
           `/settings/keys?_data=${encodeURIComponent('routes/settings.keys')}`,
           { credentials: 'include' },
         );
-        type Result = {
+        const data = await res.json();
+        return data as {
           keys: {
             id: string;
             applicationName: string;
             publicKeyFingerprint: string;
           }[];
         };
-        const data: Result = await res.json();
-        return data;
       });
 
       return data.keys