Merge branch 'master' into feature/oct-1345-disabled-add-to-allocate-patron-mode

Author: aziolek

.github/workflows/ci-run.yml

@@ -24,7 +24,6 @@ jobs:
     secrets: inherit
     with:
       env-type: e2e
-      delete-env: true
       pull-request-id: ${{ github.event.pull_request.number }}
       workflow-id: ${{ github.run_id }}
 
@@ -38,7 +37,6 @@ jobs:
     secrets: inherit
     with:
       env-type: apitest
-      delete-env: true
       pull-request-id: ${{ github.event.pull_request.number }}
       workflow-id: ${{ github.run_id }}
 
@@ -96,6 +94,7 @@ jobs:
         # Setup NVM to use Node version 16
         set +x
         source /usr/share/nvm/init-nvm.sh
+        nvm install 16
         nvm use 16
         set -x
         npm i -g yarn

.github/workflows/destroy-master.yml

@@ -10,3 +10,4 @@ jobs:
     secrets: inherit
     with:
       env-type: master
+      delete-env: false

.github/workflows/destroy-uat.yml

@@ -10,3 +10,4 @@ jobs:
     secrets: inherit
     with:
       env-type: uat
+      delete-env: false

.github/workflows/tpl-destroy-env.yml

@@ -14,6 +14,7 @@ on:
         type: string
       delete-env:
         required: false
+        default: true
         type: boolean
   pull_request:
     types: [ closed ]
@@ -68,17 +69,34 @@ jobs:
         echo "DEPLOYMENT_ID=$DEPLOYMENT_ID" >> $GITHUB_OUTPUT
       shell: bash
 
+    - uses: actions/github-script@v7
+      id: does-env-exist
+      if: always()
+      with:
+        result-encoding: string
+        script: |
+          try {
+            await github.rest.repos.getEnvironment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              environment_name: '${{ steps.destroy-env.outputs.DEPLOYMENT_ID }}',
+            });
+            return 'true';
+          } catch {
+            return 'false';
+          }
+
     - name: Delete Environment
       uses: bobheadxi/deployments@v1
-      if: always() && ${{ inputs.delete-env }}
+      if: ${{ (steps.does-env-exist.outputs.result == 'true') && (inputs.delete-env || github.event_name  == 'pull_request') }}
       with:
         step: delete-env
         token: ${{ secrets.GH_BOT_TOKEN }}
         env: ${{ steps.destroy-env.outputs.DEPLOYMENT_ID }}
 
     - name: Deactivate Environment
       uses: bobheadxi/deployments@v1
-      if: always() && ${{ !inputs.delete-env }}
+      if: ${{ (steps.does-env-exist.outputs.result == 'true') && !inputs.delete-env }}
       with:
         step: deactivate-env
         token: ${{ secrets.GH_BOT_TOKEN }}

backend/app/infrastructure/routes/rewards.py

@@ -203,6 +203,7 @@ def get(self, user_address, epoch):
         "epoch": "Epoch number",
     },
 )
+@ns.response(404, "User userAddress does not have a budget for epoch epochNumber")
 class EpochBudgets(OctantResource):
     @ns.marshal_with(epoch_budget_model)
     @ns.response(200, "Epoch individual budgets successfully retrieved")

ci/argocd/application.sh

@@ -124,7 +124,6 @@ elif [[ "$ACTION" == "update" ]]; then
 		-H "Authorization: Bearer ${ARGOCD_ACCESS_TOKEN}" \
 		-H "Content-type: application/json" \
 		"${ARGOCD_URL}/api/v1/applications/${DEPLOYMENT_ID}/sync"
-	sleep 30
 
 	# I'm leaving the previous hack for the time being in case it has to be used again
 	#

client/cypress/e2e/layout.cy.ts

@@ -23,11 +23,34 @@ Object.values(viewports).forEach(({ device, viewportWidth, viewportHeight }) =>
       cy.get('[data-test=MainLayout__Header]').should('be.visible');
     });
 
-    it('Octant logo redirects to projects view', () => {
+    it('Clicking on Octant logo scrolls view to the top on logo click (projects view)', () => {
+      cy.scrollTo(0, 500);
+      cy.get('[data-test=MainLayout__Logo]').click();
+      // waiting for scrolling to finish
+      cy.wait(2000);
+      cy.window().then(cyWindow => {
+        expect(cyWindow.scrollY).to.be.eq(0);
+      });
+    });
+
+    it('Clicking on Octant logo redirects to projects view (outside projects view)', () => {
+      cy.get('[data-test=Navbar__Button--Settings]').click();
+      cy.get('[data-test=SettingsView]').should('be.visible');
       cy.get('[data-test=MainLayout__Logo]').click();
       cy.get('[data-test=ProposalsView]').should('be.visible');
     });
 
+    it('Clicking on Octant logo redirects to projects view (outside projects view) with memorized scrollY', () => {
+      cy.scrollTo(0, 500);
+      cy.get('[data-test=Navbar__Button--Settings]').click();
+      cy.get('[data-test=SettingsView]').should('be.visible');
+      cy.get('[data-test=MainLayout__Logo]').click();
+      cy.get('[data-test=ProposalsView]').should('be.visible');
+      cy.window().then(cyWindow => {
+        expect(cyWindow.scrollY).to.be.eq(500);
+      });
+    });
+
     it('renders bottom navbar', () => {
       cy.get('[data-test=Navbar]').should('be.visible');
     });

client/cypress/e2e/settings.cy.ts

@@ -1,5 +1,3 @@
-import { BigNumber } from 'ethers';
-
 import { visitWithLoader, navigateWithCheck, mockCoinPricesServer } from 'cypress/utils/e2e';
 import viewports from 'cypress/utils/viewports';
 import { FIAT_CURRENCIES_SYMBOLS, DISPLAY_CURRENCIES } from 'src/constants/currencies';
@@ -74,7 +72,7 @@ Object.values(viewports).forEach(({ device, viewportWidth, viewportHeight }) =>
 
       const cryptoValue = getValueCryptoToDisplay({
         cryptoCurrency: 'golem',
-        valueCrypto: BigNumber.from(0),
+        valueCrypto: BigInt(0),
       });
 
       cy.get('[data-test=BoxGlmLock__Section--effective__DoubleValue__primary]')
@@ -91,7 +89,7 @@ Object.values(viewports).forEach(({ device, viewportWidth, viewportHeight }) =>
 
       const cryptoValue = getValueCryptoToDisplay({
         cryptoCurrency: 'golem',
-        valueCrypto: BigNumber.from(0),
+        valueCrypto: BigInt(0),
       });
 
       cy.get('[data-test=BoxGlmLock__Section--effective__DoubleValue__primary]')

client/global.d.ts

@@ -1,8 +1,15 @@
 import { QueryClient } from '@tanstack/react-query';
 
+import {
+  WINDOW_PROPOSALS_LOADED_ARCHIVED_EPOCHS_NUMBER,
+  WINDOW_PROPOSALS_SCROLL_Y,
+} from 'constants/window';
+
 export declare global {
   interface Window {
     Cypress?: Cypress.Cypress;
+    [WINDOW_PROPOSALS_LOADED_ARCHIVED_EPOCHS_NUMBER]?: number;
+    [WINDOW_PROPOSALS_SCROLL_Y]?: number;
     clientReactQuery?: QueryClient;
   }
 }

client/package.json

@@ -31,8 +31,6 @@
     "synpress:run": "synpress run --configFile synpress.config.ts"
   },
   "dependencies": {
-    "@ethersproject/constants": "^5.7.0",
-    "@ethersproject/providers": "^5.7.2",
     "@tanstack/react-query": "^5.18.0",
     "@wagmi/connectors": "^3.1.5",
     "@web3modal/ethereum": "2.7.1",
@@ -41,7 +39,6 @@
     "classnames": "^2.5.1",
     "date-fns": "^3.3.1",
     "dotenv": "^16.4.1",
-    "ethers": "^5.7.2",
     "formik": "^2.4.5",
     "framer-motion": "^11.0.3",
     "graphql": "^16.8.1",