Merge pull request #3721 from IntersectMBO/develop

3rd June version (voting, delegation, pdf, outcomes)

Author: aaboyle878

CHANGELOG.md

@@ -17,6 +17,8 @@ changes.
 ### Fixed
 
 - Fix missing off chain references in DRep details [Issue 3490](https://github.com/IntersectMBO/govtool/issues/3490)
+- Fix blank screen and type error on linkReferences when navigating to edit dRep page that has no links [Issue 3714](https://github.com/IntersectMBO/govtool/issues/3714)
+- Fix adding two link input fields when editing the dRep form when no links are present initially [Issue 3709](https://github.com/IntersectMBO/govtool/issues/3709)
 
 ### Changed
 

govtool/frontend/package-lock.json

@@ -29,7 +29,7 @@
     "@hookform/resolvers": "^3.3.1",
     "@intersect.mbo/govtool-outcomes-pillar-ui": "v1.4.3",
     "@intersect.mbo/intersectmbo.org-icons-set": "^1.0.8",
-    "@intersect.mbo/pdf-ui": "0.7.0-beta-33",
+    "@intersect.mbo/pdf-ui": "0.7.0-beta-35",
     "@mui/icons-material": "^5.14.3",
     "@mui/material": "^5.14.4",
     "@rollup/plugin-babel": "^6.0.4",

govtool/frontend/package.json

@@ -4,6 +4,7 @@ import { Box } from "@mui/material";
 
 import { useCardano } from "@context";
 import {
+  defaultEditDRepInfoValues,
   useEditDRepInfoForm,
   useGetDRepDetailsQuery,
   useTranslation,
@@ -44,15 +45,21 @@ export const EditDRepForm = ({
 
       reset({
         ...data,
-        objectives: data?.objectives ?? "",
-        motivations: data?.motivations ?? "",
-        qualifications: data?.qualifications ?? "",
-        paymentAddress: data?.paymentAddress ?? "",
-        image: data?.image ?? "",
-        linkReferences: data.linkReferences ?? [getEmptyReference("Link")],
-        identityReferences: data.identityReferences ?? [
-          getEmptyReference("Identity"),
-        ],
+        objectives: data?.objectives ?? defaultEditDRepInfoValues.objectives,
+        motivations: data?.motivations ?? defaultEditDRepInfoValues.motivations,
+        qualifications:
+          data?.qualifications ?? defaultEditDRepInfoValues.qualifications,
+        paymentAddress:
+          data?.paymentAddress ?? defaultEditDRepInfoValues.paymentAddress,
+        image: data?.image ?? defaultEditDRepInfoValues.image,
+        linkReferences:
+          Array.isArray(data?.linkReferences) && data.linkReferences.length > 0
+            ? data.linkReferences
+            : defaultEditDRepInfoValues.linkReferences,
+        identityReferences:
+          Array.isArray(data?.identityReferences) && data.identityReferences.length > 0
+            ? data.identityReferences
+            : defaultEditDRepInfoValues.identityReferences,
       });
     }
   }, [yourselfDRep, loadUserData]);
@@ -74,9 +81,3 @@ export const EditDRepForm = ({
     </Box>
   );
 };
-
-const getEmptyReference = (type: "Link" | "Identity") => ({
-  "@type": type,
-  uri: "",
-  label: "",
-});

govtool/frontend/src/components/organisms/EditDRepInfoSteps/EditDRepForm.tsx

@@ -2,7 +2,7 @@ import { importWallet } from "@fixtures/importWallet";
 import { valid as mockValid } from "@mock/index";
 import LoginPage from "@pages/loginPage";
 import ProposalDiscussionPage from "@pages/proposalDiscussionPage";
-import { BrowserContext, Page } from "@playwright/test";
+import { BrowserContext, expect, Page } from "@playwright/test";
 import { ProposalType, StaticWallet } from "@types";
 import { ShelleyWallet } from "./crypto";
 import convertBufferToHex from "./convertBufferToHex";
@@ -57,9 +57,16 @@ export async function createAuthWithUserName({
 
   const proposalDiscussionPage = new ProposalDiscussionPage(page);
   await proposalDiscussionPage.goto();
-  await proposalDiscussionPage.verifyIdentityBtn.click({ timeout: 15_000 });
-
-  await proposalDiscussionPage.setUsername(mockValid.username());
+  await proposalDiscussionPage.verifyIdentityBtn.click({ timeout: 60_000 });
+  try {
+    await expect(page.getByTestId("username-input")).toBeVisible({
+      timeout: 10_000,
+    });
+    await proposalDiscussionPage.setUsername(mockValid.username());
+  } catch (error) {
+    // Ignore error if username is already set
+    console.log("Username is already set");
+  }
 
   await context.storageState({ path: auth });
 }

tests/govtool-frontend/playwright/lib/helpers/auth.ts

@@ -50,7 +50,7 @@ export async function skipIfNotInfoAndBootstrapping(type: ProposalType) {
 export async function skipIfMainnet() {
   if (environments.networkId === 1) {
     await allure.description(
-      "Ada spendable features are not available on mainnet."
+      "Test skipped on mainnet to prevent affecting the production environment or using real ADA."
     );
     test.skip();
   }

tests/govtool-frontend/playwright/lib/helpers/cardano.ts

@@ -2,7 +2,12 @@ import environments from "../constants/environments";
 import { ed25519 as ed } from "@noble/curves/ed25519";
 import { bech32 } from "bech32";
 import * as blake from "blakejs";
-import { rewardAddressBech32, rewardAddressRawBytes } from "./shellyWallet";
+import {
+  addressBech32,
+  addressRawBytes,
+  rewardAddressBech32,
+  rewardAddressRawBytes,
+} from "./shellyWallet";
 
 const KEY_HASH_LENGTH = 28;
 const ADDR_LENGTH = KEY_HASH_LENGTH * 2 + 1;
@@ -103,20 +108,15 @@ export class ShelleyWallet {
   }
 
   addressBech32(networkId: number): string {
-    const prefix = networkId == 0 ? "addr_test" : "addr";
-    return bech32.encode(
-      prefix,
-      bech32.toWords(Buffer.from(this.addressRawBytes(networkId))),
-      200
-    );
+    const stakePkh = Buffer.from(this.stakeKey.pkh).toString("hex");
+    const paymentPkh = Buffer.from(this.paymentKey.pkh).toString("hex");
+    return addressBech32(networkId, paymentPkh, stakePkh);
   }
 
   addressRawBytes(networkId) {
-    const concatenatedArray1 = new Uint8Array(ADDR_LENGTH);
-    concatenatedArray1[0] = networkId;
-    concatenatedArray1.set(this.paymentKey.pkh, 1);
-    concatenatedArray1.set(this.stakeKey.pkh, KEY_HASH_LENGTH + 1);
-    return concatenatedArray1;
+    const stakePkh = Buffer.from(this.stakeKey.pkh).toString("hex");
+    const paymentPkh = Buffer.from(this.paymentKey.pkh).toString("hex");
+    return addressRawBytes(networkId, paymentPkh, stakePkh);
   }
 
   rewardAddressRawBytes(network: number) {

tests/govtool-frontend/playwright/lib/helpers/crypto.ts

@@ -2,7 +2,9 @@ import { bech32 } from "bech32";
 import { blake2bHex } from "blakejs";
 import convertBufferToHex from "./convertBufferToHex";
 import { ShelleyWallet } from "./crypto";
+
 const KEY_HASH_LENGTH = 28;
+const ADDR_LENGTH = KEY_HASH_LENGTH * 2 + 1;
 
 export default function extractDRepFromWallet(wallet: ShelleyWallet) {
   const dRepPubKey = convertBufferToHex(wallet.dRepKey.public);
@@ -36,6 +38,36 @@ export function rewardAddressBech32(
   );
 }
 
+export function addressBech32(
+  networkId: number,
+  paymentPkh: string,
+  stakePkh: string
+): string {
+  const prefix = networkId == 0 ? "addr_test" : "addr";
+  return bech32.encode(
+    prefix,
+    bech32.toWords(
+      Buffer.from(addressRawBytes(networkId, paymentPkh, stakePkh))
+    ),
+    200
+  );
+}
+
+export function addressRawBytes(
+  networkId: number,
+  paymentPkh: string,
+  stakePkh: string
+) {
+  const concatenatedArray1 = new Uint8Array(ADDR_LENGTH);
+  concatenatedArray1[0] = networkId;
+  concatenatedArray1.set(Uint8Array.from(Buffer.from(paymentPkh, "hex")), 1);
+  concatenatedArray1.set(
+    Uint8Array.from(Buffer.from(stakePkh, "hex")),
+    KEY_HASH_LENGTH + 1
+  );
+  return concatenatedArray1;
+}
+
 export async function generateWallets(num: number) {
   return await Promise.all(
     Array.from({ length: num }, () =>

tests/govtool-frontend/playwright/lib/helpers/shellyWallet.ts

@@ -106,6 +106,10 @@ export default class OutcomeDetailsPage {
           isLoggedIn
         );
 
+        if (!govActionDetailsPage) {
+          return;
+        }
+
         const outcomeResponse = await outcomeResponsePromise;
         const proposalToCheck = (await outcomeResponse.json())[0];
 
@@ -267,7 +271,7 @@ export default class OutcomeDetailsPage {
             {
               message: `CC "Abstain" vote count checked for ${currentPageUrl}`,
             }
-          ).toHaveText(`Abstain Votes${proposalToCheck.pool_abstain_votes}`); //BUG missing testIds
+          ).toHaveText(`Abstain Votes${proposalToCheck.cc_abstain_votes}`); //BUG missing testIds
 
           const noPercentage = 100 - parseFloat(yesPercentage.replace("%", ""));
           await expect(govActionDetailsPage.ccCommitteeNoVotes, {

tests/govtool-frontend/playwright/lib/pages/outcomeDetailsPage.ts

@@ -177,8 +177,7 @@ export default class OutComesPage {
     await this.page.getByTestId(this.getSortTestId(sortOption)).click();
 
     const response = await responsePromise;
-    const data = await response.json();
-    let outcomeProposalList: outcomeProposal[] = data.length != 0 ? data : null;
+    const outcomeProposalList: outcomeProposal[] = await response.json();
 
     // API validation
     if (outcomeProposalList.length <= 1) return;
@@ -456,10 +455,15 @@ export default class OutComesPage {
 
   async searchOutcomesById(governanceActionId: string) {
     await this.searchInput.fill(governanceActionId);
-    await expect(
-      this.page.getByRole("progressbar").getByRole("img")
-    ).toBeVisible();
 
+    try {
+      await expect(
+        this.page.getByRole("progressbar").getByRole("img")
+      ).toBeVisible();
+    } catch (error) {
+      // Handle the case where the progress bar is not visible
+      console.warn("Progress bar not visible, proceeding with search.");
+    }
     await functionWaitedAssert(
       async () => {
         const idSearchOutcomeCards = await this.getAllOutcomes();
@@ -480,9 +484,14 @@ export default class OutComesPage {
 
   async searchOutcomesByTitle(governanceActionTitle: string) {
     await this.searchInput.fill(governanceActionTitle);
-    await expect(
-      this.page.getByRole("progressbar").getByRole("img")
-    ).toBeVisible();
+    try {
+      await expect(
+        this.page.getByRole("progressbar").getByRole("img")
+      ).toBeVisible();
+    } catch (error) {
+      // Handle the case where the progress bar is not visible
+      console.warn("Progress bar not visible, proceeding with search.");
+    }
 
     await functionWaitedAssert(
       async () => {
@@ -545,17 +554,26 @@ export default class OutComesPage {
       { timeout: 60_000 }
     );
 
-    const metricsResponsePromise = page.waitForResponse(
-      (response) => response.url().includes(`/misc/network/metrics?epoch`),
-      { timeout: 60_000 }
-    );
-
     const outcomePage = new OutComesPage(page);
     await outcomePage.goto({ filter: filterKey });
 
     const outcomeListResponse = await outcomeListResponsePromise;
     const proposals = await outcomeListResponse.json();
 
+    if (proposals.length === 0) {
+      expect(true, "No proposals found!").toBeTruthy();
+      return {
+        govActionDetailsPage: null,
+        outcomeResponsePromise: null,
+        metricsResponsePromise: null,
+      };
+    }
+
+    const metricsResponsePromise = page.waitForResponse(
+      (response) => response.url().includes(`/misc/network/metrics?epoch`),
+      { timeout: 60_000 }
+    );
+
     expect(
       proposals.length,
       proposals.length == 0 && "No proposals found!"