Release 1.49.0

.github/ISSUE_TEMPLATE/bug-report.md

@@ -1,7 +1,7 @@
 ---
 name: Bug report
 about: Create an issue to fix a bug
-labels: ["bug"]
+labels: ['bug']
 ---
 
 <!--
@@ -11,12 +11,14 @@ BEFORE SUBMITTING: Please search to make sure this issue hasn't been reported al
 ## Bug description
 
 ## Environment
- - Browser: Chrome
- - Wallet: MetaMask
- - Chain: Ethereum mainnet
+
+- Browser: Chrome
+- Wallet: MetaMask
+- Chain: Ethereum mainnet
 
 ## Steps to reproduce
- 1. Go to
+
+1.  Go to
 
 ## Expected result
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -9,6 +9,7 @@ Resolves #
 ## Screenshots
 
 ## Checklist
-* [ ] I've tested the branch on mobile 📱
-* [ ] I've documented how it affects the analytics (if at all) 📊
-* [ ] I've written a unit/e2e test for it (if applicable) 🧑‍💻
+
+- [ ] I've tested the branch on mobile 📱
+- [ ] I've documented how it affects the analytics (if at all) 📊
+- [ ] I've written a unit/e2e test for it (if applicable) 🧑‍💻

.github/workflows/build-storybook/action.yml → .github/actions/build-storybook/action.yml

@@ -11,4 +11,4 @@ runs:
   steps:
     - name: Build Storybook
       shell: bash
-      run: yarn build-storybook -o ./out/storybook
+      run: yarn workspace @safe-global/web build-storybook -o ./out/storybook

.github/workflows/build/action.yml → .github/actions/build/action.yml

@@ -5,6 +5,7 @@ description: 'Build the app'
 inputs:
   secrets:
     required: true
+    description: 'GitHub secrets as JSON'
 
   prod: # id of input
     description: 'Production build flag'
@@ -18,6 +19,12 @@ runs:
   using: 'composite'
 
   steps:
+    - name: Restore Next.js Build Cache & Cypress cache
+      id: restore-nc
+      uses: ./.github/actions/cache-deps
+      with:
+        mode: restore-nc
+
     - name: Set environment variables
       shell: bash
       run: |
@@ -31,7 +38,7 @@ runs:
 
     - name: Build
       shell: bash
-      run: yarn build
+      run: yarn workspace @safe-global/web build
       env:
         NEXT_PUBLIC_IS_PRODUCTION: ${{ inputs.prod }}
         NEXT_PUBLIC_CYPRESS_MNEMONIC: ${{ inputs.e2e_mnemonic }}
@@ -51,6 +58,8 @@ runs:
         NEXT_PUBLIC_SAFE_RELAY_SERVICE_URL_PRODUCTION: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_SAFE_GELATO_RELAY_SERVICE_URL_PRODUCTION }}
         NEXT_PUBLIC_SAFE_RELAY_SERVICE_URL_STAGING: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_SAFE_GELATO_RELAY_SERVICE_URL_STAGING }}
         NEXT_PUBLIC_IS_OFFICIAL_HOST: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_IS_OFFICIAL_HOST }}
+        NEXT_PUBLIC_BRAND_LOGO: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_BRAND_LOGO }}
+        NEXT_PUBLIC_BRAND_NAME: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_BRAND_NAME }}
         NEXT_PUBLIC_BLOCKAID_CLIENT_ID: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_BLOCKAID_CLIENT_ID }}
         NEXT_PUBLIC_SOCIAL_WALLET_OPTIONS_STAGING: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_SOCIAL_WALLET_OPTIONS_STAGING }}
         NEXT_PUBLIC_SOCIAL_WALLET_OPTIONS_PRODUCTION: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_SOCIAL_WALLET_OPTIONS_PRODUCTION }}
@@ -60,3 +69,10 @@ runs:
         NEXT_PUBLIC_FIREBASE_VAPID_KEY_STAGING: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_FIREBASE_VAPID_KEY_STAGING }}
         NEXT_PUBLIC_SPINDL_SDK_KEY: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_SPINDL_SDK_KEY }}
         NEXT_PUBLIC_ECOSYSTEM_ID_ADDRESS: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_ECOSYSTEM_ID_ADDRESS }}
+
+    - name: Save Next.js Build Cache & Cypress cache
+      if: steps.restore-nc.outputs.cache-hit-nc != 'true'
+      uses: ./.github/actions/cache-deps
+      with:
+        mode: save-nc
+        key: ${{ steps.restore-nc.outputs.computed-cache-key-nc }}

.github/actions/cache-deps/action.yml

@@ -0,0 +1,85 @@
+name: "Cache Yarn Dependencies"
+description: "Restore or save yarn dependencies"
+inputs:
+  mode:
+    description: "restore-yarn | save-yarn | restore-nc | safe-nc"
+    required: true
+  key:
+    description: "The cache key to use to safe. Attention! Make sure to use the correct computed cache key depending on the mode"
+    required: false
+
+outputs:
+  cache-hit-yarn:
+    value: ${{ steps.restore.outputs.cache-hit }}
+    description: "Whether the cache was hit or not"
+  computed-cache-key-yarn:
+    value: ${{ steps.restore.outputs.cache-primary-key }}
+    description: "The computed cache key for yarn"
+  cache-hit-nc:
+    value: ${{ steps.restore-nc.outputs.cache-hit }}
+    description: "Whether the cache was hit or not"
+  computed-cache-key-nc:
+    value: ${{ steps.restore-nc.outputs.cache-primary-key }}
+    description: "The computed cache key for nextjs/cypress"
+
+runs:
+  using: "composite"
+  steps:
+    - name: Restore Yarn Cache
+      if: ${{ inputs.mode == 'restore-yarn' }}
+      id: restore
+      uses: actions/cache/restore@v4
+      with:
+        path: |
+          **/node_modules
+          /home/runner/.cache/Cypress
+          ${{ github.workspace }}/.yarn/install-state.gz
+          ${{ github.workspace }}/apps/web/src/types
+        key: ${{ runner.os }}-web-core-modules-${{ hashFiles('**/package.json','**/yarn.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-web-core-modules-
+
+    - name: Set composite outputs yarn
+      if: ${{ inputs.mode == 'restore-yarn' }}
+      shell: bash
+      run: | 
+        echo "cache-hit-yarn=${{ steps.restore.outputs.cache-hit }}" >> $GITHUB_OUTPUT
+        echo "computed-cache-key-yarn=${{ steps.restore.outputs.cache-primary-key }}" >> $GITHUB_OUTPUT
+
+    - name: Save Yarn Cache
+      if: ${{ inputs.mode == 'save-yarn' }}
+      uses: actions/cache/save@v4
+      with:
+        path: |
+          **/node_modules
+          /home/runner/.cache/Cypress
+          ${{ github.workspace }}/.yarn/install-state.gz
+          ${{ github.workspace }}/apps/web/src/types
+        key: ${{inputs.key}}
+
+    - name: Restore Next.js
+      if: ${{ inputs.mode == 'restore-nc' }}
+      id: restore-nc
+      uses: actions/cache/restore@v4
+      with:
+        path: |
+          ${{ github.workspace }}/apps/web/.next/cache
+        key: ${{ runner.os }}-nextjs-cypress-${{ hashFiles('apps/web/package.json', 'apps/web/yarn.lock') }}-${{ hashFiles('apps/web/src/**/*', 'apps/web/public/**/*', 'apps/web/*.{js,jsx,cjs,ts,mjs,tsx,json} ') }}
+        restore-keys: |
+          ${{ runner.os }}-nextjs-${{ hashFiles('apps/web/package.json', 'apps/web/yarn.lock') }}-
+
+    - name: Set composite outputs nc
+      if: ${{ inputs.mode == 'restore-nc' }}
+      shell: bash
+      run: | 
+        echo "cache-hit-nc=${{ steps.restore-nc.outputs.cache-hit }}" >> $GITHUB_OUTPUT
+        echo "computed-cache-key-nc=${{ steps.restore-nc.outputs.cache-primary-key }}" >> $GITHUB_OUTPUT
+
+
+    - name: Save Next.js
+      if: ${{ inputs.mode == 'save-nc' }}
+      uses: actions/cache/save@v4
+      with:
+        path: |
+          ${{ github.workspace }}/apps/web/.next/cache
+        key: ${{inputs.key}}

.github/actions/corepack/action.yml

@@ -0,0 +1,8 @@
+name: "Enable corepack"
+
+runs:
+  using: "composite"
+  steps:
+    - name: "Enable Corepack"
+      shell: bash
+      run: corepack enable

.github/workflows/cypress/action.yml → .github/actions/cypress/action.yml

@@ -30,27 +30,19 @@ inputs:
 runs:
   using: 'composite'
   steps:
-    - uses: ./.github/workflows/yarn
+    - uses: ./.github/actions/yarn
 
     - name: Install Latest stable Chrome Version
       shell: bash
       run: |
         curl -O 'https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb'
         sudo apt-get install ./google-chrome-stable_current_amd64.deb
 
-    - name: Install Cypress 13.15.2
-      shell: bash
-      run: yarn add -D [email protected]
-
-    - uses: ./.github/workflows/build
+    - uses: ./.github/actions/build
       with:
         secrets: ${{ inputs.secrets }}
         e2e_mnemonic: ${{ fromJSON(inputs.secrets).NEXT_PUBLIC_CYPRESS_MNEMONIC }}
 
-    - name: Serve
-      shell: bash
-      run: yarn serve &
-
     - uses: cypress-io/github-action@v6
       with:
         spec: ${{ inputs.spec }}
@@ -60,6 +52,9 @@ runs:
         record: true
         tag: ${{ inputs.tag }}
         config: baseUrl=http://localhost:8080
+        install: false
+        start: yarn workspace @safe-global/web serve
+        working-directory: apps/web
       env:
         CYPRESS_RECORD_KEY: ${{ inputs.record_key || fromJSON(inputs.secrets).CYPRESS_RECORD_KEY }}
         GITHUB_TOKEN: ${{ fromJSON(inputs.secrets).GITHUB_TOKEN }}

.github/actions/yarn/action.yml

@@ -0,0 +1,41 @@
+name: 'Yarn'
+
+description: 'Install the dependencies'
+
+runs:
+  using: 'composite'
+  steps:
+    # We require yarn v4 and installing through corepack is the easiest way to get it
+    - uses: actions/checkout@v4
+
+    - uses: ./.github/actions/corepack
+
+    - name: Restore Yarn Cache & Types
+      id: restore-yarn-types
+      uses: ./.github/actions/cache-deps
+      with:
+        mode: restore-yarn
+
+    - name: Echo cache hit
+      shell: bash
+      run: |
+        echo "Yarn cache hit: ${{ steps.restore-yarn-types.outputs.cache-hit-yarn }}"
+
+    - name: Yarn install
+      if: steps.restore-yarn-types.outputs.cache-hit-yarn != 'true'
+      shell: bash
+      run: |
+        yarn install --immutable
+
+    - name: Yarn after-install to generate contracts types
+      if: steps.restore-yarn-types.outputs.cache-hit-yarn != 'true'
+      shell: bash
+      run: |        
+        yarn workspace @safe-global/web after-install
+
+    - name: Save Yarn Cache & Types
+      if: steps.restore-yarn-types.outputs.cache-hit-yarn != 'true'
+      uses: ./.github/actions/cache-deps
+      with:
+        mode: save-yarn
+        key: ${{ steps.restore-yarn-types.outputs.computed-cache-key-yarn }}