Sync pretest with test with the recent workflow changes introduced on develop

.github/workflows/build-and-deploy-beta.yml

@@ -23,7 +23,6 @@ jobs:
       DBSYNC_POSTGRES_USER: "postgres"
       GA_CLIENT_EMAIL: ${{ secrets.GA_CLIENT_EMAIL }}
       GA_PRIVATE_KEY: ${{ secrets.GA_PRIVATE_KEY }}
-      GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
       GRAFANA_ADMIN_PASSWORD: ${{ secrets.GRAFANA_ADMIN_PASSWORD }}
       GRAFANA_SLACK_OAUTH_TOKEN: ${{ secrets.GRAFANA_SLACK_OAUTH_TOKEN }}
       GRAFANA_SLACK_RECIPIENT: ${{ secrets.GRAFANA_SLACK_RECIPIENT }}
@@ -32,7 +31,6 @@ jobs:
       IP_ADDRESS_BYPASSING_BASIC_AUTH2: ${{ secrets.IP_ADDRESS_BYPASSING_BASIC_AUTH2 }}
       NEXT_PUBLIC_API_URL: "https://participation.sanchogov.tools"
       NEXT_PUBLIC_GA4_PROPERTY_ID: ${{ secrets.NEXT_PUBLIC_GA4_PROPERTY_ID }}
-      NGINX_BASIC_AUTH: ${{ secrets.NGINX_BASIC_AUTH }}
       PIPELINE_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
       SENTRY_DSN: ${{ secrets.SENTRY_DSN_FRONTEND }}
       SENTRY_DSN_BACKEND: ${{ secrets.SENTRY_DSN_BACKEND }}

.github/workflows/build-and-deploy-dev.yml

@@ -22,7 +22,6 @@ jobs:
       DBSYNC_POSTGRES_USER: "postgres"
       GA_CLIENT_EMAIL: ${{ secrets.GA_CLIENT_EMAIL }}
       GA_PRIVATE_KEY: ${{ secrets.GA_PRIVATE_KEY }}
-      GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
       GRAFANA_ADMIN_PASSWORD: ${{ secrets.GRAFANA_ADMIN_PASSWORD }}
       GRAFANA_SLACK_OAUTH_TOKEN: ${{ secrets.GRAFANA_SLACK_OAUTH_TOKEN }}
       GRAFANA_SLACK_RECIPIENT: ${{ secrets.GRAFANA_SLACK_RECIPIENT }}
@@ -31,7 +30,7 @@ jobs:
       IP_ADDRESS_BYPASSING_BASIC_AUTH2: ${{ secrets.IP_ADDRESS_BYPASSING_BASIC_AUTH2 }}
       NEXT_PUBLIC_API_URL: "https://participation.sanchogov.tools"
       NEXT_PUBLIC_GA4_PROPERTY_ID: ${{ secrets.NEXT_PUBLIC_GA4_PROPERTY_ID }}
-      NGINX_BASIC_AUTH: ${{ secrets.NGINX_BASIC_AUTH }}
+      DEV_NGINX_BASIC_AUTH: ${{ secrets.DEV_NGINX_BASIC_AUTH }}
       PIPELINE_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
       SENTRY_DSN: ${{ secrets.SENTRY_DSN_FRONTEND }}
       SENTRY_DSN_BACKEND: ${{ secrets.SENTRY_DSN_BACKEND }}

.github/workflows/build-and-deploy-staging.yml

@@ -24,7 +24,6 @@ jobs:
       DBSYNC_POSTGRES_USER: "postgres"
       GA_CLIENT_EMAIL: ${{ secrets.GA_CLIENT_EMAIL }}
       GA_PRIVATE_KEY: ${{ secrets.GA_PRIVATE_KEY }}
-      GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
       GRAFANA_ADMIN_PASSWORD: ${{ secrets.GRAFANA_ADMIN_PASSWORD }}
       GRAFANA_SLACK_OAUTH_TOKEN: ${{ secrets.GRAFANA_SLACK_OAUTH_TOKEN }}
       GRAFANA_SLACK_RECIPIENT: ${{ secrets.GRAFANA_SLACK_RECIPIENT }}
@@ -33,7 +32,7 @@ jobs:
       IP_ADDRESS_BYPASSING_BASIC_AUTH2: ${{ secrets.IP_ADDRESS_BYPASSING_BASIC_AUTH2 }}
       NEXT_PUBLIC_API_URL: "https://participation.sanchogov.tools"
       NEXT_PUBLIC_GA4_PROPERTY_ID: ${{ secrets.NEXT_PUBLIC_GA4_PROPERTY_ID }}
-      NGINX_BASIC_AUTH: ${{ secrets.NGINX_BASIC_AUTH }}
+      STAGING_NGINX_BASIC_AUTH: ${{ secrets.STAGING_NGINX_BASIC_AUTH }}
       PIPELINE_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
       SENTRY_DSN: ${{ secrets.SENTRY_DSN_FRONTEND }}
       SENTRY_DSN_BACKEND: ${{ secrets.SENTRY_DSN_BACKEND }}

.github/workflows/build-and-deploy-test.yml

@@ -15,11 +15,22 @@ jobs:
     name: Deploy app
     runs-on: ubuntu-latest
     env:
+      DBSYNC_POSTGRES_DB: "cexplorer"
+      DBSYNC_POSTGRES_PASSWORD: "pSa8JCpQOACMUdGb"
+      DBSYNC_POSTGRES_USER: "postgres"
+      GA_CLIENT_EMAIL: ${{ secrets.GA_CLIENT_EMAIL }}
+      GA_PRIVATE_KEY: ${{ secrets.GA_PRIVATE_KEY }}
       GRAFANA_ADMIN_PASSWORD: ${{ secrets.GRAFANA_ADMIN_PASSWORD }}
       GRAFANA_SLACK_RECIPIENT: ${{ secrets.GRAFANA_SLACK_RECIPIENT }}
       GRAFANA_SLACK_OAUTH_TOKEN: ${{ secrets.GRAFANA_SLACK_OAUTH_TOKEN }}
       SENTRY_DSN_BACKEND: ${{ secrets.SENTRY_DSN_BACKEND }}
       GTM_ID: ${{ secrets.GTM_ID }}
+      IP_ADDRESS_BYPASSING_BASIC_AUTH1: ${{ secrets.IP_ADDRESS_BYPASSING_BASIC_AUTH1 }}
+      IP_ADDRESS_BYPASSING_BASIC_AUTH2: ${{ secrets.IP_ADDRESS_BYPASSING_BASIC_AUTH2 }}
+      NEXT_PUBLIC_API_URL: "https://participation.sanchogov.tools"
+      NEXT_PUBLIC_GA4_PROPERTY_ID: ${{ secrets.NEXT_PUBLIC_GA4_PROPERTY_ID }}
+      TEST_NGINX_BASIC_AUTH: ${{ secrets.TEST_NGINX_BASIC_AUTH }}
+      PIPELINE_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
       SENTRY_DSN: ${{ secrets.SENTRY_DSN_FRONTEND }}
       PIPELINE_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
       USERSNAP_SPACE_API_KEY: ${{ secrets.USERSNAP_SPACE_API_KEY }}

.github/workflows/frontend_sonar_scan.yml

@@ -15,15 +15,40 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+
+    - name: Cache dependencies
+      uses: actions/cache@v2
+      with:
+        path: govtool/frontend/node_modules
+        key: ${{ runner.os }}-node-${{ hashFiles('govtool/frontend/package-lock.json') }}
+
+    - name: Set up Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version-file: "govtool/frontend/.nvmrc"
+
+    - name: 🧪 Test
+      working-directory: govtool/frontend
+      env:
+        NODE_OPTIONS: "--max_old_space_size=4096"
+      run: |
+        npm install
+        npm run test:coverage
+
+# Running with docker
+#
+#    - name: Run SonarQube Scanner
+#      run: |
+#        docker run --rm \
+#          -e SONAR_HOST_URL="https://sonarcloud.io" \
+#          -e SONAR_TOKEN="ec4183646e59dd70c8077acfabe52062ccbea7a9" \
+#          -v "$(pwd):/usr/src" \
+#          --workdir=/usr/src/govtool/frontend \
+#          sonarsource/sonar-scanner-cli:5.0.1
+
     - uses: sonarsource/sonarqube-scan-action@master
       with:
         projectBaseDir: govtool/frontend
       env:
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
-
-      # Fail the build if it doesn't meet quality gate
-      # - uses: sonarsource/sonarqube-quality-gate-action@master
-      #   timeout-minutes: 5
-      #   env:
-      #     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        SONAR_HOST_URL: https://sonarcloud.io

.gitignore

@@ -140,6 +140,5 @@ scripts/govtool/dev-postgres_password
 
 node_modules
 
-
 # sonar scanner
 .scannerwork/

govtool/frontend/sonar-project.properties

@@ -1 +1,7 @@
-sonar.projectKey=voltaire-era_AYra4oOPzihwqYo-BApS
+sonar.projectKey=intersect-govtool
+sonar.sources=./src
+sonar.host.url=https://sonarcloud.io
+sonar.organization=intersect
+sonar.javascript.lcov.reportPaths=./coverage/lcov.info
+sonar.junit.reportsPath=./junit-report.xml
+sonar.exclusions=node_modules

govtool/frontend/src/components/molecules/Card.tsx

@@ -10,6 +10,7 @@ type CardProps = PropsWithChildren & {
   label?: string;
   sx?: SxProps<Theme>;
   variant?: "default" | "error" | "primary" | "success" | "warning";
+  onCardClick?: () => void;
 };
 
 const COLORS = {
@@ -42,6 +43,7 @@ export const Card = ({
   elevation = 3,
   label,
   sx,
+  onCardClick,
 }: CardProps) => {
   const colors = COLORS[variant];
 
@@ -57,6 +59,7 @@ export const Card = ({
         position: "relative",
         ...sx,
       }}
+      onClick={onCardClick}
     >
       {label && (
         <Chip

govtool/frontend/src/components/molecules/DelegationAction.tsx

@@ -10,7 +10,7 @@ import { DirectVoterActionProps } from "./types";
 
 export const DelegationAction = ({
   dRepId,
-  onClickArrow,
+  onCardClick,
   sx,
 }: DirectVoterActionProps) => {
   const { t } = useTranslation();
@@ -27,8 +27,10 @@ export const DelegationAction = ({
         justifyContent: "space-between",
         px: 1.5,
         py: 1,
+        cursor: "pointer",
         ...sx,
       }}
+      onCardClick={onCardClick}
     >
       <Box sx={{ width: "90%" }}>
         <Typography fontWeight={600} variant="body2">
@@ -45,11 +47,7 @@ export const DelegationAction = ({
           {dRepId}
         </Typography>
       </Box>
-      <ArrowForwardIosIcon
-        color="primary"
-        onClick={onClickArrow}
-        sx={{ cursor: "pointer", height: 16, width: 24 }}
-      />
+      <ArrowForwardIosIcon color="primary" sx={{ height: 16, width: 24 }} />
     </Card>
   );
 };

govtool/frontend/src/components/molecules/types.ts

@@ -18,7 +18,7 @@ export type StepProps = {
 
 export type DirectVoterActionProps = {
   dRepId: string;
-  onClickArrow: () => void;
+  onCardClick: () => void;
   sx?: SxProps;
 };
 

govtool/frontend/src/components/organisms/AutomatedVotingOptions.tsx

@@ -9,9 +9,9 @@ import {
 import { Typography } from "@atoms";
 import { ICONS } from "@consts";
 import { PendingTransaction } from "@context";
-import { useTranslation } from "@hooks";
+import { useGetNetworkMetrics, useTranslation } from "@hooks";
 import { AutomatedVotingCard } from "@molecules";
-import { openInNewTab } from "@/utils";
+import { correctAdaFormat, openInNewTab } from "@/utils";
 import {
   AutomatedVotingOptionCurrentDelegation,
   AutomatedVotingOptionDelegationId,
@@ -42,6 +42,8 @@ export const AutomatedVotingOptions = ({
 
   const [isOpen, setIsOpen] = useState<boolean>(false);
 
+  const { networkMetrics } = useGetNetworkMetrics();
+
   // TODO: Change to certain automated voted option if available
   const onClickInfo = () => openInNewTab("https://docs.sanchogov.tools/");
 
@@ -63,10 +65,13 @@ export const AutomatedVotingOptions = ({
       isDelegationToAbstainInProgress ||
       isDelegationToNoConfidenceInProgress;
 
-    if (shouldBeSetOpen) {
-      setIsOpen(true);
-    }
-  }, [currentDelegation, delegationInProgress]);
+    setIsOpen(shouldBeSetOpen);
+  }, [
+    isDelegatedToAbstain,
+    isDelegatedToNoConfidence,
+    isDelegationToAbstainInProgress,
+    isDelegationToNoConfidenceInProgress,
+  ]);
 
   return (
     <Accordion
@@ -117,7 +122,11 @@ export const AutomatedVotingOptions = ({
                   })
                 : t("dRepDirectory.abstainCardDefaultTitle")
             }
-            votingPower={votingPower}
+            votingPower={
+              networkMetrics
+                ? correctAdaFormat(networkMetrics?.alwaysAbstainVotingPower)
+                : ""
+            }
             transactionId={
               pendingTransaction?.delegate?.resourceId ===
               AutomatedVotingOptionDelegationId.abstain
@@ -148,7 +157,13 @@ export const AutomatedVotingOptions = ({
                   })
                 : t("dRepDirectory.noConfidenceDefaultTitle")
             }
-            votingPower={votingPower}
+            votingPower={
+              networkMetrics
+                ? correctAdaFormat(
+                    networkMetrics?.alwaysNoConfidenceVotingPower,
+                  )
+                : ""
+            }
             transactionId={
               pendingTransaction?.delegate?.resourceId ===
               AutomatedVotingOptionDelegationId.no_confidence

govtool/frontend/src/components/organisms/DashboardCards/DelegateDashboardCard.tsx

@@ -123,7 +123,7 @@ export const DelegateDashboardCard = ({
       {displayedDelegationId && (
         <DelegationAction
           dRepId={displayedDelegationId}
-          onClickArrow={navigateToDRepDetails}
+          onCardClick={navigateToDRepDetails}
           sx={{ mt: 1.5 }}
         />
       )}

govtool/frontend/src/consts/icons.ts

@@ -17,6 +17,7 @@ export const ICONS = {
   drawerIcon: "/icons/DrawerIcon.svg",
   dRepDirectoryActiveIcon: "/icons/DRepDirectoryActive.svg",
   dRepDirectoryIcon: "/icons/DRepDirectory.svg",
+  editIcon: "/icons/Edit.svg",
   externalLinkIcon: "/icons/ExternalLink.svg",
   faqsActiveIcon: "/icons/FaqsActive.svg",
   faqsIcon: "/icons/Faqs.svg",

govtool/frontend/src/consts/queryKeys.ts

@@ -4,6 +4,7 @@ export const QUERY_KEYS = {
   useGetDRepListInfiniteKey: "useGetDRepListInfiniteKey",
   useGetDRepVotesKey: "useGetDRepVotesKey",
   useGetDRepVotingPowerKey: "useGetDRepVotingPowerKey",
+  useGetNetworkMetricsKey: "useGetNetworkMetricsKey",
   useGetProposalKey: "useGetProposalKey",
   useGetProposalsKey: "useGetProposalsKey",
   useGetProposalsInfiniteKey: "useGetProposalsInfiniteKey",

govtool/frontend/src/hooks/queries/index.ts

@@ -4,6 +4,7 @@ export * from "./useGetVoterInfoQuery";
 export * from "./useGetDRepListQuery";
 export * from "./useGetDRepVotesQuery";
 export * from "./useGetDRepVotingPowerQuery";
+export * from "./useGetNetworkMetrics";
 export * from "./useGetProposalQuery";
 export * from "./useGetProposalsQuery";
 export * from "./useGetProposalsInfiniteQuery";

govtool/frontend/src/hooks/queries/useGetNetworkMetrics.ts

@@ -0,0 +1,17 @@
+import { useQuery } from "react-query";
+
+import { getNetworkMetrics } from "@services";
+import { QUERY_KEYS } from "@consts";
+import { useCardano } from "@/context";
+
+export const useGetNetworkMetrics = () => {
+  const { isEnabled } = useCardano();
+
+  const { data } = useQuery({
+    queryKey: QUERY_KEYS.useGetNetworkMetricsKey,
+    queryFn: () => getNetworkMetrics(),
+    enabled: isEnabled,
+  });
+
+  return { networkMetrics: data };
+};

govtool/frontend/src/i18n/locales/en.ts

@@ -261,11 +261,11 @@ export const en = {
       directVoter: "Direct Voter",
       filterTitle: "DRep Status",
       goToDRepDirectory: "Go to DRep Directory",
-      meAsDRep: "This  DRep ID is connected  to your wallet",
+      meAsDRep: "This DRep ID is connected to your wallet",
       myDelegation: "You have delegated <strong>₳ {{ada}}</strong> to:",
       myDelegationToYourself:
         "You have delegated <strong>₳ {{ada}}</strong> to yourself:",
-      myDRep: "This is your DRep",
+      myDRep: "This is your DRep profile",
       listTitle: "Find a DRep",
       noConfidenceDefaultDescription:
         "Select this to signal no confidence in the current constitutional committee by voting NO on every proposal and voting YES to no confidence proposals",