From 7b9242da2bcc3fed1d43a799ac44c1910dbe7624 Mon Sep 17 00:00:00 2001
From: Megha-Dev-19 <meghadev1901@gmail.com>
Date: Thu, 7 Dec 2023 15:42:14 +0530
Subject: [PATCH 1/8] fix solution action

---
 src/devhub/entity/post/PostEditor.jsx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/devhub/entity/post/PostEditor.jsx b/src/devhub/entity/post/PostEditor.jsx
index cff6067ea..4e55daefd 100644
--- a/src/devhub/entity/post/PostEditor.jsx
+++ b/src/devhub/entity/post/PostEditor.jsx
@@ -1,3 +1,10 @@
+const cleanDescription = (description) => {
+  return description ? description.replace(
+    /###### Requested amount: .+?\n###### Requested sponsor: @[^\s]+\n/g,
+    ""
+  ) : description
+};
+
 initState({
   seekingFunding: props.seekingFunding ?? false,
   author_id: context.accountId,
@@ -89,13 +96,6 @@ const labels = labelStrings.map((s) => {
   return { name: s };
 });
 
-const cleanDescription = (description) => {
-  return description.replace(
-    /###### Requested amount: .+?\n###### Requested sponsor: @[^\s]+\n/g,
-    ""
-  );
-};
-
 if (!state.draftStateApplied && props.draftState) {
   State.update({ ...props.draftState, draftStateApplied: true });
 }

From c31e5ca8c883c74f5523003fb9ef75c12718961b Mon Sep 17 00:00:00 2001
From: Megha-Dev-19 <meghadev1901@gmail.com>
Date: Mon, 22 Apr 2024 15:21:54 +0530
Subject: [PATCH 2/8] fix preview for proposals

---
 src/devhub/components/molecule/Compose.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/devhub/components/molecule/Compose.jsx b/src/devhub/components/molecule/Compose.jsx
index 059ae8cda..b681af491 100644
--- a/src/devhub/components/molecule/Compose.jsx
+++ b/src/devhub/components/molecule/Compose.jsx
@@ -95,7 +95,7 @@ const Compose = ({
                 "${REPL_DEVHUB}/widget/devhub.components.molecule.MarkdownViewer"
               }
               props={{
-                text: data,
+                text: state.data,
               }}
             />
           </div>

From 910df8c8f113509235b28724c59080fb7f3d7a88 Mon Sep 17 00:00:00 2001
From: Megha-Dev-19 <100185149+Megha-Dev-19@users.noreply.github.com>
Date: Tue, 1 Oct 2024 15:13:56 +0530
Subject: [PATCH 3/8] remove markdown iframe

---
 .../devhub/components/molecule/Compose.jsx    |  10 -
 .../components/molecule/SimpleMDEViewer.jsx   | 190 ++++++------------
 .../entity/proposal/CommentsAndLogs.jsx       |   5 -
 .../devhub/entity/proposal/Proposal.jsx       |   5 -
 .../devhub/components/molecule/Compose.jsx    |   5 -
 .../entity/proposal/CommentsAndLogs.jsx       |   5 -
 .../devhub/entity/proposal/Proposal.jsx       |   5 -
 .../widget/components/molecule/Compose.jsx    |   5 -
 .../widget/components/proposals/Proposal.jsx  |   5 -
 .../widget/components/rfps/Rfp.jsx            |   5 -
 10 files changed, 67 insertions(+), 173 deletions(-)

diff --git a/instances/devhub.near/widget/devhub/components/molecule/Compose.jsx b/instances/devhub.near/widget/devhub/components/molecule/Compose.jsx
index 5484fe0eb..0ae8c0b62 100644
--- a/instances/devhub.near/widget/devhub/components/molecule/Compose.jsx
+++ b/instances/devhub.near/widget/devhub/components/molecule/Compose.jsx
@@ -116,11 +116,6 @@ const Compose = ({
                 src={`${REPL_DEVHUB}/widget/devhub.components.molecule.SimpleMDEViewer`}
                 props={{
                   content: state.data,
-                  embeddCSS: `
-                body{
-                  font-size:14px;
-                }
-                `,
                 }}
               />
             </div>
@@ -189,11 +184,6 @@ const Compose = ({
                 src={`${REPL_DEVHUB}/widget/devhub.components.molecule.SimpleMDEViewer`}
                 props={{
                   content: state.data,
-                  embeddCSS: `
-                    body {
-                      font-size: 14px;
-                    }
-                  `,
                 }}
               />
             </div>
diff --git a/instances/devhub.near/widget/devhub/components/molecule/SimpleMDEViewer.jsx b/instances/devhub.near/widget/devhub/components/molecule/SimpleMDEViewer.jsx
index bdaa0fd25..ff9b649f6 100644
--- a/instances/devhub.near/widget/devhub/components/molecule/SimpleMDEViewer.jsx
+++ b/instances/devhub.near/widget/devhub/components/molecule/SimpleMDEViewer.jsx
@@ -1,139 +1,83 @@
 const content = props.content ?? "";
-const height = props.height;
 const embeddCSS = props.embeddCSS;
-const [iframeHeight, setIframeHeight] = useState("100px");
 
-const code = `
-    <!doctype html>
-    <html>
-    <head>
-      <meta charset="utf-8" />
-      <link rel="stylesheet" href="https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.css">
-      <link rel="stylesheet" href="https://cdn.jsdelivr.net/highlight.js/latest/styles/github.min.css">
-      <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
-      <style>
-      body {  
-        margin: 0;
-        overflow: ${height ? "auto" : "hidden"};
-        font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-        line-height:1.5;
-        font-weight:300;
-        color:#212529;
-      }
+const simplemdeCss = fetch(
+  "https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.css"
+).body;
+const githubCss = fetch(
+  "https://cdn.jsdelivr.net/highlight.js/latest/styles/github.min.css"
+).body;
 
-      blockquote {
-        margin: 1em 0;
-        padding-left: 1.5em;
-        border-left: 4px solid #ccc;
-        color: #666;
-        font-style: italic;
-        font-size: inherit;
-      }
+const bootstrapCss = fetch(
+  "https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css"
+).body;
 
-      .no-margin {
-        margin: 0px !important;
-      }
+if (!simplemdeCss || !githubCss || !bootstrapCss) return "";
 
-      h1, h2, h3, h4, h5, h6 {
-        font-weight:500;
-        margin-block:5px;
-      }
-
-      p {
-        white-space: pre-wrap;
-      }
-
-      img {
-        height: 200px;
-        object-fit:contain;
-        width: -webkit-fill-available;
-      }
-
-      table {
-        border: 1px solid #dee2e6;
-      }
+const CssContainer = styled.div`
+  ${githubCss}
+  ${simplemdeCss}
   
-      table th, table td {
-        padding: 0.75rem;
-        vertical-align: top;
-      }
+  font-size:14px;
+  p {
+    span {
+      white-space: normal;
+    }
+  }
 
-      table td {
-        border-top: 1px solid #dee2e6;
-      }
-      
-      table thead th {
-        vertical-align: bottom;
-        border-bottom: 2px solid #dee2e6;
-      }
-      
-      table tbody + tbody {
-        border-top: 2px solid #dee2e6;
-      }
-      
-      /* Zebra-striping */
-      tbody tr:nth-of-type(odd) {
-        background-color: rgba(0, 0, 0, 0.05);
-      }
+  blockquote {
+    margin: 1em 0;
+    padding-left: 1.5em;
+    border-left: 4px solid #ccc;
+    color: #666;
+    font-style: italic;
+    font-size: inherit;
+  }
 
-      ${embeddCSS}
-    </style>
-      </head> 
-    <body>
-      <div id="content"></div>
-      <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
-      <script>
-      
-    
+  pre {
+    background-color: #f4f4f4;
+    border: 1px solid #ddd;
+    border-radius: 4px;
+    padding: 1em;
+    overflow-x: auto;
+    font-family: "Courier New", Courier, monospace;
+  }
 
-      function updateContent(content) {
-        document.getElementById('content').innerHTML = marked.parse(content)
+  a {
+    color: #04a46e;
+  }
 
-        const newHeight = Math.max(
-          document.body.scrollHeight,
-          document.documentElement.scrollHeight,
-          document.body.offsetHeight,
-          document.documentElement.offsetHeight
-        );
-        
-        window.parent.postMessage({
-          handler: 'IFRAME_HEIGHT',
-          height: newHeight
-        }, '*');
-      }
+  .remove-underline a {
+    text-decoration: none !important;
+  }
 
-      window.addEventListener('message', (event) => {
-        if (event.data.content) {
-          updateContent(event.data.content);
-        }
-      });
+  ${embeddCSS}
+`;
 
-      window.addEventListener('load', () => {
-        window.parent.postMessage({
-          handler: 'IFRAME_HEIGHT',
-          height: document.body.scrollHeight
-        }, '*');
-      });
-      </script>
-    </body>
-    </html>
-  `;
+const renderMention =
+  props.renderMention ??
+  ((accountId) => (
+    <span
+      key={accountId}
+      className="d-inline-flex remove-underline"
+      style={{ fontWeight: 500 }}
+    >
+      <Widget
+        src="${REPL_DEVHUB}/widget/devhub.components.molecule.ProfileLine"
+        props={{
+          accountId: accountId.toLowerCase(),
+          hideAccountId: true,
+          tooltip: true,
+        }}
+      />
+    </span>
+  ));
 
+const processedContent = content
+  .replace(/<br\s*\/?>/gi, "  \n")
+  .replace(/\n/g, "  \n");
 return (
-  <iframe
-    srcDoc={code}
-    message={{
-      content: content,
-    }}
-    style={{ height: height ?? iframeHeight }}
-    className="w-100"
-    onMessage={(e) => {
-      switch (e.handler) {
-        case "IFRAME_HEIGHT": {
-          setIframeHeight(`${e.height}px`);
-          break;
-        }
-      }
-    }}
-  />
+  <CssContainer>
+    <Markdown text={processedContent} onMention={renderMention} />
+  </CssContainer>
 );
diff --git a/instances/devhub.near/widget/devhub/entity/proposal/CommentsAndLogs.jsx b/instances/devhub.near/widget/devhub/entity/proposal/CommentsAndLogs.jsx
index a62eb0bc4..d05607f11 100644
--- a/instances/devhub.near/widget/devhub/entity/proposal/CommentsAndLogs.jsx
+++ b/instances/devhub.near/widget/devhub/entity/proposal/CommentsAndLogs.jsx
@@ -222,11 +222,6 @@ const Comment = ({ commentItem }) => {
               src={`${REPL_DEVHUB}/widget/devhub.components.molecule.SimpleMDEViewer`}
               props={{
                 content: content.text,
-                embeddCSS: `
-                  body {
-                    font-size:14px;
-                  }
-                `,
               }}
             />
 
diff --git a/instances/devhub.near/widget/devhub/entity/proposal/Proposal.jsx b/instances/devhub.near/widget/devhub/entity/proposal/Proposal.jsx
index 13ebbc3f0..d28d4ec44 100644
--- a/instances/devhub.near/widget/devhub/entity/proposal/Proposal.jsx
+++ b/instances/devhub.near/widget/devhub/entity/proposal/Proposal.jsx
@@ -870,11 +870,6 @@ return (
                       src={`${REPL_DEVHUB}/widget/devhub.components.molecule.SimpleMDEViewer`}
                       props={{
                         content: snapshot.description,
-                        embeddCSS: `
-                        body {
-                          font-size: 14px;
-                        }
-                       `,
                       }}
                     />
 
diff --git a/instances/events-committee.near/widget/devhub/components/molecule/Compose.jsx b/instances/events-committee.near/widget/devhub/components/molecule/Compose.jsx
index 9991f9e3f..637f4c8dc 100644
--- a/instances/events-committee.near/widget/devhub/components/molecule/Compose.jsx
+++ b/instances/events-committee.near/widget/devhub/components/molecule/Compose.jsx
@@ -108,11 +108,6 @@ const Compose = ({
               src={`${REPL_DEVHUB}/widget/devhub.components.molecule.SimpleMDEViewer`}
               props={{
                 content: state.data,
-                embeddCSS: `
-                body {
-                  font-size: 14px;
-                }
-                `,
               }}
             />
           </div>
diff --git a/instances/events-committee.near/widget/devhub/entity/proposal/CommentsAndLogs.jsx b/instances/events-committee.near/widget/devhub/entity/proposal/CommentsAndLogs.jsx
index 2279f8c46..77b5abeee 100644
--- a/instances/events-committee.near/widget/devhub/entity/proposal/CommentsAndLogs.jsx
+++ b/instances/events-committee.near/widget/devhub/entity/proposal/CommentsAndLogs.jsx
@@ -222,11 +222,6 @@ const Comment = ({ commentItem }) => {
               src={`${REPL_DEVHUB}/widget/devhub.components.molecule.SimpleMDEViewer`}
               props={{
                 content: content.text,
-                embeddCSS: `
-                body {
-                  font-size: 14px;
-                }
-                `,
               }}
             />
 
diff --git a/instances/events-committee.near/widget/devhub/entity/proposal/Proposal.jsx b/instances/events-committee.near/widget/devhub/entity/proposal/Proposal.jsx
index 8d31fcfc8..f172e095e 100644
--- a/instances/events-committee.near/widget/devhub/entity/proposal/Proposal.jsx
+++ b/instances/events-committee.near/widget/devhub/entity/proposal/Proposal.jsx
@@ -868,11 +868,6 @@ return (
                       src={`${REPL_DEVHUB}/widget/devhub.components.molecule.SimpleMDEViewer`}
                       props={{
                         content: snapshot.description,
-                        embeddCSS: `
-                        body {
-                          font-size: 14px;
-                        }
-                      `,
                       }}
                     />
 
diff --git a/instances/infrastructure-committee.near/widget/components/molecule/Compose.jsx b/instances/infrastructure-committee.near/widget/components/molecule/Compose.jsx
index 7a4a03058..6edae6b9a 100644
--- a/instances/infrastructure-committee.near/widget/components/molecule/Compose.jsx
+++ b/instances/infrastructure-committee.near/widget/components/molecule/Compose.jsx
@@ -108,11 +108,6 @@ const Compose = ({
               src={`${REPL_DEVHUB}/widget/devhub.components.molecule.SimpleMDEViewer`}
               props={{
                 content: state.data,
-                embeddCSS: `
-                  body {
-                    font-size: 14px !important;
-                  }
-                `,
               }}
             />
           </div>
diff --git a/instances/infrastructure-committee.near/widget/components/proposals/Proposal.jsx b/instances/infrastructure-committee.near/widget/components/proposals/Proposal.jsx
index 5aefc8d7d..7b4c9b1d9 100644
--- a/instances/infrastructure-committee.near/widget/components/proposals/Proposal.jsx
+++ b/instances/infrastructure-committee.near/widget/components/proposals/Proposal.jsx
@@ -848,11 +848,6 @@ return (
                       src={`${REPL_DEVHUB}/widget/devhub.components.molecule.SimpleMDEViewer`}
                       props={{
                         content: snapshot.description,
-                        embeddCSS: `
-                        body {
-                          font-size: 14px !important;
-                        }
-                        `,
                       }}
                     />
 
diff --git a/instances/infrastructure-committee.near/widget/components/rfps/Rfp.jsx b/instances/infrastructure-committee.near/widget/components/rfps/Rfp.jsx
index 5392169d6..47268022b 100644
--- a/instances/infrastructure-committee.near/widget/components/rfps/Rfp.jsx
+++ b/instances/infrastructure-committee.near/widget/components/rfps/Rfp.jsx
@@ -671,11 +671,6 @@ return (
                       src={`${REPL_DEVHUB}/widget/devhub.components.molecule.SimpleMDEViewer`}
                       props={{
                         content: snapshot.description,
-                        embeddCSS: `
-                        body {
-                          font-size: 14px;
-                        }
-                        `,
                       }}
                     />
 

From e9db92ecbd4c4646be37393843a61a27d9651eb2 Mon Sep 17 00:00:00 2001
From: Megha-Dev-19 <100185149+Megha-Dev-19@users.noreply.github.com>
Date: Thu, 3 Oct 2024 15:21:36 +0530
Subject: [PATCH 4/8] added tests

---
 .../tests/infrastructure/proposal.spec.js     | 79 ++++++++++++++++++-
 1 file changed, 77 insertions(+), 2 deletions(-)

diff --git a/playwright-tests/tests/infrastructure/proposal.spec.js b/playwright-tests/tests/infrastructure/proposal.spec.js
index b28b0bcf2..043863e52 100644
--- a/playwright-tests/tests/infrastructure/proposal.spec.js
+++ b/playwright-tests/tests/infrastructure/proposal.spec.js
@@ -8,6 +8,13 @@ const test = base.extend({
   proposalAuthorAccountId: ["megha19.near", { option: true }],
 });
 
+async function checkForNewPageLoad(page, url) {
+  const pagePromise = page.waitForEvent("popup");
+  const newTab = await pagePromise;
+  await newTab.waitForLoadState();
+  await expect(newTab).toHaveURL(new RegExp(url));
+}
+
 test.describe("Wallet is connected as admin", () => {
   test.use({
     storageState: "playwright-tests/storage-states/wallet-connected-admin.json",
@@ -167,12 +174,12 @@ test.describe("Wallet is connected as admin", () => {
     await createProposal(page, false);
   });
 
-  test("should show relevant users in mention autocomplete", async ({
+  test("should show relevant users in mention autocomplete and correct name and image in viewer", async ({
     page,
     account,
   }) => {
+    test.setTimeout(120000);
     await page.goto(`/${account}/widget/app?page=proposal&id=1`);
-
     await page.waitForSelector(`iframe`, {
       state: "visible",
     });
@@ -227,5 +234,73 @@ test.describe("Wallet is connected as admin", () => {
     // When I manually test, it shows the correct 4 users
     expect(mentionSuggestions.slice(0, 4)).toEqual(expected);
     await pauseIfVideoRecording(page);
+
+    await page
+      .frameLocator("iframe")
+      .getByRole("button", { name: "hemera.near" })
+      .click();
+    await commentEditor.pressSequentially(" test");
+    await page.waitForTimeout(1000);
+    await page.getByRole("button", { name: "Preview" }).click();
+    await page.waitForTimeout(10_000);
+    const accountLink = page.getByRole("link", {
+      name: "Hemera @hemera.near",
+      exact: true,
+    });
+    await expect(accountLink).toBeVisible({ timeout: 20_000 });
+    accountLink.click();
+    await checkForNewPageLoad(
+      page,
+      "mob\\.near\\/widget\\/ProfilePage\\?accountId=hemera\\.near"
+    );
+  });
+
+  test("should show links and mention in markdown viewer", async ({
+    page,
+    account,
+  }) => {
+    test.setTimeout(120000);
+    await page.goto(`/${account}/widget/app?page=proposal&id=1`);
+    await page.goto(`/${account}/widget/app?page=proposal&id=1`);
+    await page.waitForSelector(`iframe`, {
+      state: "visible",
+    });
+
+    const proposal = page.getByRole("link", { name: "hemera.near" }).first();
+    await proposal.waitFor();
+    await proposal.scrollIntoViewIfNeeded();
+
+    const comment = page
+      .getByRole("link", { name: "trechriron71.near" })
+      .first();
+    await comment.waitFor();
+    await comment.scrollIntoViewIfNeeded();
+
+    const heading = page.getByText("Add a comment");
+    await heading.waitFor();
+    await heading.scrollIntoViewIfNeeded();
+
+    await page.waitForTimeout(5000);
+
+    const delay_milliseconds_between_keypress_when_typing = 0;
+    const commentEditor = page
+      .frameLocator("iframe")
+      .last()
+      .locator(".CodeMirror textarea");
+    await commentEditor.focus();
+    await commentEditor.pressSequentially(
+      `Adding a test [link](https://www.google.com/)`,
+      {
+        delay: delay_milliseconds_between_keypress_when_typing,
+      }
+    );
+    await page.waitForTimeout(1000);
+    await page.getByRole("button", { name: "Preview" }).click();
+
+    // make sure links open in new tab
+    const link = await page.getByRole("link", { name: "link" });
+    expect(link).toBeVisible();
+    link.click();
+    await checkForNewPageLoad(page, /https:\/\/www\.google\.com\//);
   });
 });

From c5bdbf4764871afbafd3f4449d65e2a54eba0f42 Mon Sep 17 00:00:00 2001
From: Megha-Dev-19 <100185149+Megha-Dev-19@users.noreply.github.com>
Date: Sun, 6 Oct 2024 21:43:15 +0530
Subject: [PATCH 5/8] fix tests

---
 .../widget/components/molecule/Compose.jsx    |  2 +-
 .../tests/infrastructure/proposal.spec.js     | 30 +++++++------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/instances/infrastructure-committee.near/widget/components/molecule/Compose.jsx b/instances/infrastructure-committee.near/widget/components/molecule/Compose.jsx
index 6edae6b9a..df8ae5486 100644
--- a/instances/infrastructure-committee.near/widget/components/molecule/Compose.jsx
+++ b/instances/infrastructure-committee.near/widget/components/molecule/Compose.jsx
@@ -103,7 +103,7 @@ const Compose = ({
             />
           </>
         ) : (
-          <div className="card-body">
+          <div className="card-body compose-preview">
             <Widget
               src={`${REPL_DEVHUB}/widget/devhub.components.molecule.SimpleMDEViewer`}
               props={{
diff --git a/playwright-tests/tests/infrastructure/proposal.spec.js b/playwright-tests/tests/infrastructure/proposal.spec.js
index 043863e52..1c822f4d4 100644
--- a/playwright-tests/tests/infrastructure/proposal.spec.js
+++ b/playwright-tests/tests/infrastructure/proposal.spec.js
@@ -8,13 +8,6 @@ const test = base.extend({
   proposalAuthorAccountId: ["megha19.near", { option: true }],
 });
 
-async function checkForNewPageLoad(page, url) {
-  const pagePromise = page.waitForEvent("popup");
-  const newTab = await pagePromise;
-  await newTab.waitForLoadState();
-  await expect(newTab).toHaveURL(new RegExp(url));
-}
-
 test.describe("Wallet is connected as admin", () => {
   test.use({
     storageState: "playwright-tests/storage-states/wallet-connected-admin.json",
@@ -243,22 +236,18 @@ test.describe("Wallet is connected as admin", () => {
     await page.waitForTimeout(1000);
     await page.getByRole("button", { name: "Preview" }).click();
     await page.waitForTimeout(10_000);
-    const accountLink = page.getByRole("link", {
-      name: "Hemera @hemera.near",
-      exact: true,
-    });
+    const accountLink = page
+      .locator(".compose-preview")
+      .locator("div[data-component='mob.near/widget/ProfileImage']");
     await expect(accountLink).toBeVisible({ timeout: 20_000 });
     accountLink.click();
-    await checkForNewPageLoad(
-      page,
-      "mob\\.near\\/widget\\/ProfilePage\\?accountId=hemera\\.near"
+    await page.waitForNavigation();
+    await expect(page).toHaveURL(
+      /mob\.near\/widget\/ProfilePage\?accountId=hemera\.near/
     );
   });
 
-  test("should show links and mention in markdown viewer", async ({
-    page,
-    account,
-  }) => {
+  test("should show links in markdown viewer", async ({ page, account }) => {
     test.setTimeout(120000);
     await page.goto(`/${account}/widget/app?page=proposal&id=1`);
     await page.goto(`/${account}/widget/app?page=proposal&id=1`);
@@ -301,6 +290,9 @@ test.describe("Wallet is connected as admin", () => {
     const link = await page.getByRole("link", { name: "link" });
     expect(link).toBeVisible();
     link.click();
-    await checkForNewPageLoad(page, /https:\/\/www\.google\.com\//);
+    const pagePromise = page.waitForEvent("popup");
+    const newTab = await pagePromise;
+    await newTab.waitForLoadState();
+    await expect(newTab).toHaveURL("https://www.google.com");
   });
 });

From 01864a29194da41377d3938f7acea79e3f081665 Mon Sep 17 00:00:00 2001
From: Megha-Dev-19 <100185149+Megha-Dev-19@users.noreply.github.com>
Date: Sun, 6 Oct 2024 22:09:31 +0530
Subject: [PATCH 6/8] fix tests

---
 .../tests/events/proposals.spec.js            |   3 +-
 .../tests/infrastructure/proposal.spec.js     |   4 +-
 .../tests/other/feed.dontaskagain.spec.js     |   4 +-
 .../tests/proposal/comment.spec.js            |  20 ++-
 .../tests/proposal/proposals.spec.js          | 144 ++++++++++++++++++
 playwright-tests/tests/sunset/feed.spec.js    |   1 -
 playwright-tests/tests/sunset/funding.spec.js |   2 +-
 7 files changed, 157 insertions(+), 21 deletions(-)

diff --git a/playwright-tests/tests/events/proposals.spec.js b/playwright-tests/tests/events/proposals.spec.js
index 5545397a5..15859e748 100644
--- a/playwright-tests/tests/events/proposals.spec.js
+++ b/playwright-tests/tests/events/proposals.spec.js
@@ -481,7 +481,6 @@ test.describe("Wallet is connected", () => {
     const delay_milliseconds_between_keypress_when_typing = 0;
     const commentEditor = page
       .frameLocator("iframe")
-      .last()
       .locator(".CodeMirror textarea");
     await commentEditor.focus();
     await commentEditor.pressSequentially(
@@ -492,7 +491,7 @@ test.describe("Wallet is connected", () => {
     );
 
     await pauseIfVideoRecording(page);
-    const iframe = page.frameLocator("iframe").last();
+    const iframe = page.frameLocator("iframe");
     const liFrameLocators = iframe.frameLocator(
       'ul[id="mentiondropdown"] > li'
     );
diff --git a/playwright-tests/tests/infrastructure/proposal.spec.js b/playwright-tests/tests/infrastructure/proposal.spec.js
index 1c822f4d4..6805815ba 100644
--- a/playwright-tests/tests/infrastructure/proposal.spec.js
+++ b/playwright-tests/tests/infrastructure/proposal.spec.js
@@ -196,7 +196,6 @@ test.describe("Wallet is connected as admin", () => {
     const delay_milliseconds_between_keypress_when_typing = 0;
     const commentEditor = page
       .frameLocator("iframe")
-      .last()
       .locator(".CodeMirror textarea");
     await commentEditor.focus();
     await commentEditor.pressSequentially(
@@ -207,7 +206,7 @@ test.describe("Wallet is connected as admin", () => {
     );
 
     await pauseIfVideoRecording(page);
-    const iframe = page.frameLocator("iframe").last();
+    const iframe = page.frameLocator("iframe");
     const liFrameLocators = iframe.frameLocator(
       'ul[id="mentiondropdown"] > li'
     );
@@ -274,7 +273,6 @@ test.describe("Wallet is connected as admin", () => {
     const delay_milliseconds_between_keypress_when_typing = 0;
     const commentEditor = page
       .frameLocator("iframe")
-      .last()
       .locator(".CodeMirror textarea");
     await commentEditor.focus();
     await commentEditor.pressSequentially(
diff --git a/playwright-tests/tests/other/feed.dontaskagain.spec.js b/playwright-tests/tests/other/feed.dontaskagain.spec.js
index 08327a3fd..1b18713b1 100644
--- a/playwright-tests/tests/other/feed.dontaskagain.spec.js
+++ b/playwright-tests/tests/other/feed.dontaskagain.spec.js
@@ -42,7 +42,6 @@ test.describe("Wallet is connected with devhub access key", () => {
 
     const commentArea = await page
       .frameLocator("iframe")
-      .last()
       .locator(".CodeMirror textarea");
     await commentArea.focus();
     await commentArea.fill("Some comment");
@@ -159,7 +158,7 @@ test.describe("Wallet is connected with devhub access key", () => {
     await pauseIfVideoRecording(page);
     await page.waitForTimeout(10_000);
     const commentArea = await page
-      .frameLocator("#accordion2261 iframe")
+      .frameLocator("iframe")
       .locator(".CodeMirror textarea");
     await commentArea.focus();
     await page.waitForTimeout(100);
@@ -222,7 +221,6 @@ test.describe("Wallet is connected", () => {
 
     const commentArea = await page
       .frameLocator("iframe")
-      .last()
       .locator(".CodeMirror textarea");
     await commentArea.focus();
     await commentArea.fill("Some comment");
diff --git a/playwright-tests/tests/proposal/comment.spec.js b/playwright-tests/tests/proposal/comment.spec.js
index 8414ad788..3595faccf 100644
--- a/playwright-tests/tests/proposal/comment.spec.js
+++ b/playwright-tests/tests/proposal/comment.spec.js
@@ -35,7 +35,6 @@ test.describe("Don't ask again enabled", () => {
     const delay_milliseconds_between_keypress_when_typing = 0;
     const commentArea = await page
       .frameLocator("iframe")
-      .last()
       .locator(".CodeMirror textarea");
     await commentArea.focus({ timeout: 20_000 });
     const text = "Comment testing";
@@ -83,10 +82,10 @@ test.describe("Don't ask again enabled", () => {
     );
     const commentButton = await page.getByRole("button", { name: "Comment" });
     await expect(commentButton).toBeAttached();
-    await commentButton.scrollIntoViewIfNeeded();
+    await commentButton.scrollIntoViewIfNeeded({ timeout: 10_000 });
     await commentButton.click();
     await expect(
-      await page.frameLocator("iframe").last().locator(".CodeMirror")
+      await page.frameLocator("iframe").locator(".CodeMirror")
     ).toContainText(text);
 
     const loadingIndicator = await page.locator(".comment-btn-spinner");
@@ -101,10 +100,10 @@ test.describe("Don't ask again enabled", () => {
 
     await expect(transaction_successful_toast).not.toBeAttached();
     await expect(
-      await page.frameLocator("iframe").last().locator(".CodeMirror")
+      await page.frameLocator("iframe").locator(".CodeMirror")
     ).not.toContainText(text);
     await expect(
-      await page.frameLocator("iframe").last().locator(".CodeMirror")
+      await page.frameLocator("iframe").locator(".CodeMirror")
     ).toContainText("Add your comment here...");
     await pauseIfVideoRecording(page);
   });
@@ -131,7 +130,6 @@ test.describe("Don't ask again enabled", () => {
 
     const commentArea = await page
       .frameLocator("iframe")
-      .last()
       .locator(".CodeMirror textarea");
     await commentArea.focus();
     await page.waitForTimeout(100);
@@ -250,10 +248,10 @@ test.describe("Don't ask again enabled", () => {
       timeout: 10000,
     });
     await expect(
-      await page.frameLocator("iframe").last().locator(".CodeMirror")
+      await page.frameLocator("iframe").locator(".CodeMirror")
     ).not.toContainText(commentText);
     await expect(
-      await page.frameLocator("iframe").last().locator(".CodeMirror")
+      await page.frameLocator("iframe").locator(".CodeMirror")
     ).toContainText("Add your comment here...");
 
     const submittedTransactionJsonObject =
@@ -263,7 +261,7 @@ test.describe("Don't ask again enabled", () => {
     );
     expect(submittedComment.text).toEqual(commentText);
     let commentElement = await page
-      .frameLocator("#theorinear121684809 iframe")
+      .frameLocator("#theorinear121684809")
       .locator("#content");
     await expect(commentElement).toBeVisible({ timeout: 30_000 });
     await expect(commentElement).toContainText(
@@ -274,7 +272,7 @@ test.describe("Don't ask again enabled", () => {
     await page.reload();
 
     commentElement = await page
-      .frameLocator("#theorinear121684809 iframe")
+      .frameLocator("#theorinear121684809")
       .locator("#content");
     await expect(commentElement).toBeVisible({ timeout: 30_000 });
     await expect(commentElement).toContainText(
@@ -290,7 +288,7 @@ test.describe("Don't ask again enabled", () => {
     await page.waitForTimeout(5000);
 
     await expect(
-      await page.frameLocator("iframe").last().locator(".CodeMirror")
+      await page.frameLocator("iframe").locator(".CodeMirror")
     ).toContainText("Add your comment here...");
 
     await pauseIfVideoRecording(page);
diff --git a/playwright-tests/tests/proposal/proposals.spec.js b/playwright-tests/tests/proposal/proposals.spec.js
index 7c6011236..5af34fa82 100644
--- a/playwright-tests/tests/proposal/proposals.spec.js
+++ b/playwright-tests/tests/proposal/proposals.spec.js
@@ -567,6 +567,150 @@ test.describe("Wallet is connected", () => {
     const consentCheckBoxes = await page.getByRole("checkbox");
     await consentCheckBoxes.first().click();
     await pauseIfVideoRecording(page);
+    await expect(disabledSubmitButton).toBeAttached();
+    await page.getByRole("checkbox").nth(1).click();
+    await pauseIfVideoRecording(page);
+    await expect(disabledSubmitButton).not.toBeAttached();
+
+    const submitButton = await page.getByText("Submit Draft");
+    await submitButton.scrollIntoViewIfNeeded();
+    await submitButton.hover();
+    await pauseIfVideoRecording(page);
+    await submitButton.click();
+    const transactionText = JSON.stringify(
+      JSON.parse(await page.locator("div.modal-body code").innerText()),
+      null,
+      1
+    );
+    expect(transactionText).toEqual(
+      JSON.stringify(
+        {
+          labels: [],
+          body: {
+            proposal_body_version: "V0",
+            name: "Test proposal 123456",
+            description:
+              "The test proposal description. And mentioning @petersalomonsen.near. Also mentioning @megha19.near",
+            category: "DevDAO Platform",
+            summary: "Test proposal summary 123456789",
+            linked_proposals: [],
+            requested_sponsorship_usd_amount: "12345",
+            requested_sponsorship_paid_in_currency: "USDC",
+            receiver_account: "efiz.near",
+            supervisor: null,
+            requested_sponsor: "neardevdao.near",
+            timeline: {
+              status: "DRAFT",
+            },
+          },
+          accepted_terms_and_conditions_version: acceptedTermsVersion,
+        },
+        null,
+        1
+      )
+    );
+
+    await pauseIfVideoRecording(page);
+  });
+
+  test("should show relevant users in mention autocomplete", async ({
+    page,
+    account,
+  }) => {
+    await page.goto(`/${account}/widget/app?page=proposal&id=112`);
+
+    await page.waitForSelector(`iframe`, {
+      state: "visible",
+    });
+
+    const comment = page.getByRole("link", { name: "geforcy.near" });
+    await comment.scrollIntoViewIfNeeded();
+    await expect(comment).toBeVisible();
+    await page.waitForTimeout(5000);
+
+    const delay_milliseconds_between_keypress_when_typing = 0;
+    const commentEditor = page
+      .frameLocator("iframe")
+      .locator(".CodeMirror textarea");
+    await commentEditor.focus();
+    await commentEditor.pressSequentially(
+      `Make sure relevant users show up in a mention. @`,
+      {
+        delay: delay_milliseconds_between_keypress_when_typing,
+      }
+    );
+
+    await pauseIfVideoRecording(page);
+    const iframe = page.frameLocator("iframe");
+    const liFrameLocators = iframe.frameLocator(
+      'ul[id="mentiondropdown"] > li'
+    );
+    const liLocators = await liFrameLocators.owner().all();
+    const expected = [
+      "thomasguntenaar.near", // author,
+      "theori.near", // supervisor,
+      "neardevdao.near", //  requested_sponsor,
+      "geforcy.near", // comment author,
+    ];
+    let mentionSuggestions = [];
+    for (let i = 0; i < liLocators.length; i++) {
+      const text = await liLocators[i].innerText();
+      mentionSuggestions.push(text);
+    }
+
+    // When I manually test, it shows the correct 4 users
+    expect(mentionSuggestions.slice(0, 4)).toEqual(expected);
+    await pauseIfVideoRecording(page);
+  });
+
+  test("should show only valid input in amount field and show error for invalid", async ({
+    page,
+    account,
+  }) => {
+    test.setTimeout(120000);
+    const delay_milliseconds_between_keypress_when_typing = 0;
+    await page.goto(`/${account}/widget/app?page=create-proposal`);
+    const input = page.locator('input[type="text"]').nth(2);
+    const errorText = await page.getByText(
+      "Please enter the nearest positive whole number."
+    );
+    await input.pressSequentially("12345de", {
+      delay: delay_milliseconds_between_keypress_when_typing,
+    });
+    await expect(errorText).toBeVisible();
+    // clear input field
+    for (let i = 0; i < 7; i++) {
+      await input.press("Backspace", {
+        delay: delay_milliseconds_between_keypress_when_typing,
+      });
+    }
+    await input.pressSequentially("12334", {
+      delay: delay_milliseconds_between_keypress_when_typing,
+    });
+    await expect(errorText).toBeHidden();
+    await pauseIfVideoRecording(page);
+  });
+
+  test("should create a proposal, autolink reference to existing proposal", async ({
+    page,
+    account,
+  }) => {
+    test.setTimeout(120000);
+    await getCurrentBlockHeight(page);
+    await page.goto(`/${account}/widget/app?page=create-proposal`);
+
+    const delay_milliseconds_between_keypress_when_typing = 0;
+    const titleArea = await page.getByRole("textbox").first();
+    await expect(titleArea).toBeEditable({ timeout: 10_000 });
+    await titleArea.pressSequentially("Test proposal 123456", {
+      delay: delay_milliseconds_between_keypress_when_typing,
+    });
+
+    await pauseIfVideoRecording(page);
+
+    const categoryDropdown = await page.locator(".dropdown-toggle").first();
+    await categoryDropdown.click();
+    await page.locator(".dropdown-menu > div > div:nth-child(2) > div").click();
 
     const disabledSubmitButton = await page.locator(
       ".submit-draft-button.disabled"
diff --git a/playwright-tests/tests/sunset/feed.spec.js b/playwright-tests/tests/sunset/feed.spec.js
index bf49907c2..b35209477 100644
--- a/playwright-tests/tests/sunset/feed.spec.js
+++ b/playwright-tests/tests/sunset/feed.spec.js
@@ -143,7 +143,6 @@ test.describe("Wallet is connected", () => {
     await page.getByRole("button", { name: "Comment" }).click();
     await page
       .frameLocator("iframe")
-      .last()
       .locator(".CodeMirror textarea")
       .fill("The comment to the idea");
 
diff --git a/playwright-tests/tests/sunset/funding.spec.js b/playwright-tests/tests/sunset/funding.spec.js
index a4b0657f4..c3467ab34 100644
--- a/playwright-tests/tests/sunset/funding.spec.js
+++ b/playwright-tests/tests/sunset/funding.spec.js
@@ -122,7 +122,7 @@ test.describe("Wallet is connected by moderator", () => {
     await page.getByLabel("Select currency").selectOption("USDC");
 
     const descriptionInput = page
-      .frameLocator("#accordion2586 iframe")
+      .frameLocator("iframe")
       .locator(".CodeMirror textarea");
     await descriptionInput.focus();
     await page.waitForTimeout(100);

From bacd546a6c63ffaa00cbaf10bfd75372d958fb31 Mon Sep 17 00:00:00 2001
From: Megha-Dev-19 <100185149+Megha-Dev-19@users.noreply.github.com>
Date: Tue, 8 Oct 2024 16:09:40 +0530
Subject: [PATCH 7/8] fix tests

---
 .../devhub/components/molecule/SimpleMDEViewer.jsx       | 4 +---
 .../tests/infrastructure/infrastructure.near.spec.js     | 2 +-
 playwright-tests/tests/proposal/comment.spec.js          | 9 +++------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/instances/devhub.near/widget/devhub/components/molecule/SimpleMDEViewer.jsx b/instances/devhub.near/widget/devhub/components/molecule/SimpleMDEViewer.jsx
index ff9b649f6..d5709ac87 100644
--- a/instances/devhub.near/widget/devhub/components/molecule/SimpleMDEViewer.jsx
+++ b/instances/devhub.near/widget/devhub/components/molecule/SimpleMDEViewer.jsx
@@ -20,9 +20,7 @@ const CssContainer = styled.div`
   
   font-size:14px;
   p {
-    span {
-      white-space: normal;
-    }
+    white-space: normal;
   }
 
   blockquote {
diff --git a/playwright-tests/tests/infrastructure/infrastructure.near.spec.js b/playwright-tests/tests/infrastructure/infrastructure.near.spec.js
index 22347058f..756ae63ac 100644
--- a/playwright-tests/tests/infrastructure/infrastructure.near.spec.js
+++ b/playwright-tests/tests/infrastructure/infrastructure.near.spec.js
@@ -11,7 +11,7 @@ test.describe("Wallet is connected", () => {
     await expect(aboutHeaderLink).toBeVisible();
     await aboutHeaderLink.click();
     await expect(
-      page.frameLocator("iframe").getByRole("heading", { name: "Introduction" })
+      page.getByRole("heading", { name: "Introduction" })
     ).toBeVisible();
 
     const proposalsHeaderLink = await page.getByRole("link", {
diff --git a/playwright-tests/tests/proposal/comment.spec.js b/playwright-tests/tests/proposal/comment.spec.js
index 3595faccf..0dde423de 100644
--- a/playwright-tests/tests/proposal/comment.spec.js
+++ b/playwright-tests/tests/proposal/comment.spec.js
@@ -260,9 +260,8 @@ test.describe("Don't ask again enabled", () => {
       submittedTransactionJsonObject.data["petersalomonsen.near"].post.comment
     );
     expect(submittedComment.text).toEqual(commentText);
-    let commentElement = await page
-      .frameLocator("#theorinear121684809")
-      .locator("#content");
+    let commentElement = await page.locator("#theorinear121684809 div").nth(4);
+
     await expect(commentElement).toBeVisible({ timeout: 30_000 });
     await expect(commentElement).toContainText(
       "Typically, funds are disbursed within 10 business days, but the timeline can vary depending on the project's complexity and paperwork. Your DevDAO Moderator will keep you updated.",
@@ -271,9 +270,7 @@ test.describe("Don't ask again enabled", () => {
 
     await page.reload();
 
-    commentElement = await page
-      .frameLocator("#theorinear121684809")
-      .locator("#content");
+    commentElement = await page.locator("#theorinear121684809 div").nth(4);
     await expect(commentElement).toBeVisible({ timeout: 30_000 });
     await expect(commentElement).toContainText(
       "Typically, funds are disbursed within 10 business days, but the timeline can vary depending on the project's complexity and paperwork. Your DevDAO Moderator will keep you updated.",

From 411f4e86cdb023a0ab017bc6afe71ca172c13047 Mon Sep 17 00:00:00 2001
From: Megha-Dev-19 <100185149+Megha-Dev-19@users.noreply.github.com>
Date: Wed, 9 Oct 2024 20:09:07 +0530
Subject: [PATCH 8/8] fix conflicts

---
 .../tests/proposal/proposals.spec.js          | 144 ------------------
 1 file changed, 144 deletions(-)

diff --git a/playwright-tests/tests/proposal/proposals.spec.js b/playwright-tests/tests/proposal/proposals.spec.js
index 5af34fa82..7c6011236 100644
--- a/playwright-tests/tests/proposal/proposals.spec.js
+++ b/playwright-tests/tests/proposal/proposals.spec.js
@@ -567,150 +567,6 @@ test.describe("Wallet is connected", () => {
     const consentCheckBoxes = await page.getByRole("checkbox");
     await consentCheckBoxes.first().click();
     await pauseIfVideoRecording(page);
-    await expect(disabledSubmitButton).toBeAttached();
-    await page.getByRole("checkbox").nth(1).click();
-    await pauseIfVideoRecording(page);
-    await expect(disabledSubmitButton).not.toBeAttached();
-
-    const submitButton = await page.getByText("Submit Draft");
-    await submitButton.scrollIntoViewIfNeeded();
-    await submitButton.hover();
-    await pauseIfVideoRecording(page);
-    await submitButton.click();
-    const transactionText = JSON.stringify(
-      JSON.parse(await page.locator("div.modal-body code").innerText()),
-      null,
-      1
-    );
-    expect(transactionText).toEqual(
-      JSON.stringify(
-        {
-          labels: [],
-          body: {
-            proposal_body_version: "V0",
-            name: "Test proposal 123456",
-            description:
-              "The test proposal description. And mentioning @petersalomonsen.near. Also mentioning @megha19.near",
-            category: "DevDAO Platform",
-            summary: "Test proposal summary 123456789",
-            linked_proposals: [],
-            requested_sponsorship_usd_amount: "12345",
-            requested_sponsorship_paid_in_currency: "USDC",
-            receiver_account: "efiz.near",
-            supervisor: null,
-            requested_sponsor: "neardevdao.near",
-            timeline: {
-              status: "DRAFT",
-            },
-          },
-          accepted_terms_and_conditions_version: acceptedTermsVersion,
-        },
-        null,
-        1
-      )
-    );
-
-    await pauseIfVideoRecording(page);
-  });
-
-  test("should show relevant users in mention autocomplete", async ({
-    page,
-    account,
-  }) => {
-    await page.goto(`/${account}/widget/app?page=proposal&id=112`);
-
-    await page.waitForSelector(`iframe`, {
-      state: "visible",
-    });
-
-    const comment = page.getByRole("link", { name: "geforcy.near" });
-    await comment.scrollIntoViewIfNeeded();
-    await expect(comment).toBeVisible();
-    await page.waitForTimeout(5000);
-
-    const delay_milliseconds_between_keypress_when_typing = 0;
-    const commentEditor = page
-      .frameLocator("iframe")
-      .locator(".CodeMirror textarea");
-    await commentEditor.focus();
-    await commentEditor.pressSequentially(
-      `Make sure relevant users show up in a mention. @`,
-      {
-        delay: delay_milliseconds_between_keypress_when_typing,
-      }
-    );
-
-    await pauseIfVideoRecording(page);
-    const iframe = page.frameLocator("iframe");
-    const liFrameLocators = iframe.frameLocator(
-      'ul[id="mentiondropdown"] > li'
-    );
-    const liLocators = await liFrameLocators.owner().all();
-    const expected = [
-      "thomasguntenaar.near", // author,
-      "theori.near", // supervisor,
-      "neardevdao.near", //  requested_sponsor,
-      "geforcy.near", // comment author,
-    ];
-    let mentionSuggestions = [];
-    for (let i = 0; i < liLocators.length; i++) {
-      const text = await liLocators[i].innerText();
-      mentionSuggestions.push(text);
-    }
-
-    // When I manually test, it shows the correct 4 users
-    expect(mentionSuggestions.slice(0, 4)).toEqual(expected);
-    await pauseIfVideoRecording(page);
-  });
-
-  test("should show only valid input in amount field and show error for invalid", async ({
-    page,
-    account,
-  }) => {
-    test.setTimeout(120000);
-    const delay_milliseconds_between_keypress_when_typing = 0;
-    await page.goto(`/${account}/widget/app?page=create-proposal`);
-    const input = page.locator('input[type="text"]').nth(2);
-    const errorText = await page.getByText(
-      "Please enter the nearest positive whole number."
-    );
-    await input.pressSequentially("12345de", {
-      delay: delay_milliseconds_between_keypress_when_typing,
-    });
-    await expect(errorText).toBeVisible();
-    // clear input field
-    for (let i = 0; i < 7; i++) {
-      await input.press("Backspace", {
-        delay: delay_milliseconds_between_keypress_when_typing,
-      });
-    }
-    await input.pressSequentially("12334", {
-      delay: delay_milliseconds_between_keypress_when_typing,
-    });
-    await expect(errorText).toBeHidden();
-    await pauseIfVideoRecording(page);
-  });
-
-  test("should create a proposal, autolink reference to existing proposal", async ({
-    page,
-    account,
-  }) => {
-    test.setTimeout(120000);
-    await getCurrentBlockHeight(page);
-    await page.goto(`/${account}/widget/app?page=create-proposal`);
-
-    const delay_milliseconds_between_keypress_when_typing = 0;
-    const titleArea = await page.getByRole("textbox").first();
-    await expect(titleArea).toBeEditable({ timeout: 10_000 });
-    await titleArea.pressSequentially("Test proposal 123456", {
-      delay: delay_milliseconds_between_keypress_when_typing,
-    });
-
-    await pauseIfVideoRecording(page);
-
-    const categoryDropdown = await page.locator(".dropdown-toggle").first();
-    await categoryDropdown.click();
-    await page.locator(".dropdown-menu > div > div:nth-child(2) > div").click();
 
     const disabledSubmitButton = await page.locator(
       ".submit-draft-button.disabled"