Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into feat/submit-iceberg

.github/workflows/ci-cd-trigger.yml

@@ -5,9 +5,7 @@ on:
     branches:
       - release/*
       - develop
-  # uncomment pull_request and comment pull_request_target to test CI changes against feature branch not target branch (develop)
-  # pull_request:
-  pull_request_target:
+  pull_request:
     types:
       - opened
       - ready_for_review
@@ -48,7 +46,7 @@ jobs:
 
   lint-pr-title:
     needs: node-modules
-    if: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target' }}
+    if: ${{ github.event_name == 'pull_request' }}
     name: Verify PR title
     uses: ./.github/workflows/lint-pr.yml
     secrets: inherit
@@ -109,6 +107,7 @@ jobs:
           echo "NX_HEAD: ${{ env.NX_HEAD }}"
           echo "Affected: ${affected}"
           echo "Branch slug: ${branch_slug}"
+          echo "Current ref: ${{ github.ref }}"
           echo ">>>> eof debug"
 
           projects_array=()
@@ -180,20 +179,27 @@ jobs:
           fi
 
           # if branch starts with release/ and ends with trading / governance or explorer - overwrite the array of affected projects with fixed single application
-          if [[ "${{ github.ref }}" == release* ]]; then
+          if [[ "${{ github.ref }}" == *release* ]]; then
+            echo ">> This is a relase branch"
             case "${{ github.ref }}" in
               *trading)
+                echo ">> Only trading will be deployed"
                 projects_array=(trading)
                 projects_e2e_array=(trading)
               ;;
               *governance)
+                echo ">> Only governance will be deployed"
                 projects_array=(governance)
                 projects_e2e_array=(governance)
               ;;
               *explorer)
+                echo ">> Only explorer will be deployed"
                 projects_array=(explorer)
                 projects_e2e_array=(explorer)
               ;;
+              *)
+                echo ">> All apps will be deployed"
+              ;;
             esac
           fi
 
@@ -231,7 +237,7 @@ jobs:
   publish-dist:
     needs: lint-test-build
     name: '(CD) publish dist'
-    # if: ${{ needs.lint-test-build.outputs.projects != '[]' }}
+    if: ${{ (github.event_name == 'pull_request' &&  github.event.pull_request.head.repo.full_name == 'vegaprotocol/frontend-monorepo') || github.event_name == 'push' }}
     uses: ./.github/workflows/publish-dist.yml
     secrets: inherit
     with:
@@ -242,7 +248,7 @@ jobs:
     needs:
       - publish-dist
       - lint-test-build
-    if: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target' }}
+    if: ${{ github.event_name == 'pull_request' &&  github.event.pull_request.head.repo.full_name == 'vegaprotocol/frontend-monorepo' }}
     timeout-minutes: 60
     name: '(CD) comment preview links'
     steps:
@@ -288,7 +294,7 @@ jobs:
         with:
           issue-number: ${{ github.event.pull_request.number }}
           body: |
-            Previews:
+            Previews
             * governance: ${{ needs.lint-test-build.outputs.preview_governance }}
             * explorer: ${{ needs.lint-test-build.outputs.preview_explorer  }}
             * trading: ${{ needs.lint-test-build.outputs.preview_trading }}

.github/workflows/publish-dist.yml

@@ -30,7 +30,7 @@ jobs:
           echo IS_IPFS_RELEASE=false >> $GITHUB_ENV
 
       - name: Is PR
-        if: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target' }}
+        if: ${{ github.event_name == 'pull_request' }}
         run: |
           echo IS_PR=true >> $GITHUB_ENV
 
@@ -96,8 +96,8 @@ jobs:
           bucketName=''
 
           if [[ "${{ github.ref }}" =~ .*release/.* ]]; then
-            # remove prefixing release/ and take the first string limited by / which is supposed to be name of the environment for releasing
-            envName="$(echo ${{ github.ref }} | sed -e "s|release/||" | cut -d '/' -f 1 )"
+            # remove prefixing release/ and take the first string limited by - which is supposed to be name of the environment for releasing (format: release/testnet-trading)
+            envName="$(echo ${{ github.ref }} | sed -e "s|refs/heads/release/||" | cut -d '-' -f 1 )"
           elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then
             envName="stagnet1"
             if [[ "${{ matrix.app }}" = "multisig-signer" ]]; then
@@ -112,7 +112,7 @@ jobs:
               envName="mainnet"
               bucketName="ui.vega.rocks"
             fi
-          elif [[ "${{ github.ref }}" =~ .*main$ ]]; then
+          elif [[ "${{ github.ref }}" =~ .*mainnet$ ]]; then
             envName="mainnet"
           fi
 
@@ -282,7 +282,7 @@ jobs:
         # release to ipfs happens only on mainnet (represented by main branch) for trading
         if: ${{ env.IS_IPFS_RELEASE == 'true' }}
         run: |
-          if echo ${{ github.ref }} | grep -q main; then
+          if [[ "${{ env.IS_MAINNET_RELEASE }}" = "true" ]]; then
             # display info about app
             curl --fail -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
               -H "Content-Type: application/json" \
@@ -295,7 +295,7 @@ jobs:
               -d '{"query": "mutation{triggerDeploy(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id status}}"}' \
               https://api.fleek.co/graphql
 
-          elif echo ${{ github.ref }} | grep -q release/testnet; then
+          elif [[ "${{ env.IS_TESTNET_RELEASE }}" = "true" ]]; then
             # display info about app
             curl --fail -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
               -H "Content-Type: application/json" \

apps/governance-e2e/src/integration/flow/proposal-flow.cy.ts

@@ -320,8 +320,8 @@ context(
       // 3001-VOTE-076
       cy.getByTestId(connectToVegaWalletButton)
         .should('be.visible')
-        .and('have.text', 'Connect Vega wallet')
-        .click();
+        .and('have.text', 'Connect Vega wallet');
+      cy.getByTestId(connectToVegaWalletButton).click();
       cy.getByTestId('connector-jsonRpc').click();
       cy.getByTestId(vegaWalletNameElement).should('be.visible');
       cy.getByTestId(connectToVegaWalletButton).should('not.exist');

apps/governance-e2e/src/integration/view/home.cy.ts

@@ -161,7 +161,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
       cy.getByTestId('menu-drawer').should('be.visible');
     });
 
-    it.skip('should have link for proposal page', function () {
+    it('should have link for proposal page', function () {
       cy.getByTestId('menu-drawer').within(() => {
         cy.get('[href="/proposals"]')
           .should('exist')

apps/governance-e2e/src/integration/view/pubkey-view.cy.ts

@@ -1,13 +1,12 @@
 /// <reference types="cypress" />
 
 import {
-  navigateTo,
-  navigation,
   turnTelemetryOff,
   waitForSpinner,
 } from '../../support/common.functions';
 import {
-  enterUniqueFreeFormProposalBody,
+  createTenDigitUnixTimeStampForSpecifiedDays,
+  enterRawProposalBody,
   goToMakeNewProposal,
   governanceProposalType,
 } from '../../support/governance.functions';
@@ -47,12 +46,11 @@ context('View functionality with public key', { tags: '@smoke' }, function () {
       .and('contain.text', 'USDC (fake)');
   });
 
-  it.skip('Unable to submit proposal with public key', function () {
+  it('Unable to submit proposal with public key', function () {
     const expectedErrorTxt = `You are connected in a view only state for public key: ${vegaWalletPubKey}. In order to send transactions you must connect to a real wallet.`;
 
-    navigateTo(navigation.proposals);
-    goToMakeNewProposal(governanceProposalType.FREEFORM);
-    enterUniqueFreeFormProposalBody('50', 'pub key proposal test');
+    goToMakeNewProposal(governanceProposalType.RAW);
+    enterRawProposalBody(createTenDigitUnixTimeStampForSpecifiedDays(8));
     cy.getByTestId('dialog-content')
       .first()
       .within(() => {