Merge branch 'develop' into fix/list-anchors

dyrector-io · Feb 28, 2024 · c01c584 · c01c584
2 parents 27bce84 + 2d22943
commit c01c584
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/docker-compose.http-only.yaml b/docker-compose.http-only.yaml
@@ -41,6 +41,7 @@ services:
       - RECAPTCHA_SECRET_KEY=${RECAPTCHA_SECRET_KEY}
       - RECAPTCHA_SITE_KEY=${RECAPTCHA_SITE_KEY}
       - QA_OPT_OUT=${QA_OPT_OUT:-false}
+      - ENCRYPTION_SECRET_KEY=${ENCRYPTION_SECRET_KEY}
     depends_on:
       crux-postgres:
         condition: service_healthy

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -45,6 +45,7 @@ services:
       - RECAPTCHA_SECRET_KEY=${RECAPTCHA_SECRET_KEY}
       - RECAPTCHA_SITE_KEY=${RECAPTCHA_SITE_KEY}
       - QA_OPT_OUT=${QA_OPT_OUT:-false}
+      - ENCRYPTION_SECRET_KEY=${ENCRYPTION_SECRET_KEY}
     depends_on:
       crux-postgres:
         condition: service_healthy

diff --git a/web/crux-ui/e2e/utils/node-helper.ts b/web/crux-ui/e2e/utils/node-helper.ts
@@ -10,6 +10,8 @@ export const installDagent = async (page: Page) => {
 
   await page.locator('button:has-text("Add")').click()
 
+  await page.waitForSelector('h4:text-is("New node")')
+
   await page.locator('input[name=name] >> visible=true').fill(DAGENT_NODE)
 
   await page.locator('button:has-text("Save")').click()