fix: github actions on monorepo

.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/actions/build/action.yml

@@ -38,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 }}

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

@@ -34,7 +34,7 @@ runs:
           **/node_modules
           /home/runner/.cache/Cypress
           ${{ github.workspace }}/.yarn/install-state.gz
-          ${{ github.workspace }}/src/types
+          ${{ github.workspace }}/apps/web/src/types
         key: ${{ runner.os }}-web-core-modules-${{ hashFiles('**/package.json','**/yarn.lock') }}
         restore-keys: |
           ${{ runner.os }}-web-core-modules-
@@ -54,7 +54,7 @@ runs:
           **/node_modules
           /home/runner/.cache/Cypress
           ${{ github.workspace }}/.yarn/install-state.gz
-          ${{ github.workspace }}/src/types
+          ${{ github.workspace }}/apps/web/src/types
         key: ${{inputs.key}}
 
     - name: Restore Next.js
@@ -63,10 +63,10 @@ runs:
       uses: actions/cache/restore@v4
       with:
         path: |
-          ${{ github.workspace }}/.next/cache
-        key: ${{ runner.os }}-nextjs-cypress-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx') }}
+          ${{ 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('**/yarn.lock') }}-
+          ${{ runner.os }}-nextjs-${{ hashFiles('apps/web/package.json', 'apps/web/yarn.lock') }}-
 
     - name: Set composite outputs nc
       if: ${{ inputs.mode == 'restore-nc' }}
@@ -81,5 +81,5 @@ runs:
       uses: actions/cache/save@v4
       with:
         path: |
-          ${{ github.workspace }}/.next/cache
+          ${{ github.workspace }}/apps/web/.next/cache
         key: ${{inputs.key}}

.github/actions/cypress/action.yml

@@ -53,7 +53,8 @@ runs:
         tag: ${{ inputs.tag }}
         config: baseUrl=http://localhost:8080
         install: false
-        start: yarn serve
+        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

@@ -21,12 +21,17 @@ runs:
       run: |
         echo "Yarn cache hit: ${{ steps.restore-yarn-types.outputs.cache-hit-yarn }}"
 
-    - name: Yarn install & after-install generate types
+    - name: Yarn install
       if: steps.restore-yarn-types.outputs.cache-hit-yarn != 'true'
       shell: bash
       run: |
         yarn install --immutable
-        yarn after-install
+
+    - 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'

.github/workflows/deploy-dev.yml → .github/workflows/web-deploy-dev.yml

@@ -7,6 +7,8 @@ on:
     branches:
       - dev
       - main
+    paths:
+        - apps/web/**
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -56,14 +58,18 @@ jobs:
         if: startsWith(github.ref, 'refs/heads/main')
         env:
           BUCKET: s3://${{ secrets.AWS_STAGING_BUCKET_NAME }}/current
-        run: bash ./scripts/github/s3_upload.sh
+        run: |
+          cd ./apps/web
+          bash  ./scripts/github/s3_upload.sh
 
       # Dev
       - name: Deploy to the dev S3
         if: startsWith(github.ref, 'refs/heads/dev')
         env:
           BUCKET: s3://${{ secrets.AWS_DEVELOPMENT_BUCKET_NAME }}
-        run: bash ./scripts/github/s3_upload.sh
+        run: |
+          cd ./apps/web
+          bash  ./scripts/github/s3_upload.sh
 
       ### PRs ###
 
@@ -80,7 +86,9 @@ jobs:
         if: github.event.number
         env:
           BUCKET: s3://${{ secrets.AWS_REVIEW_BUCKET_NAME }}/walletweb/${{ steps.extract_branch.outputs.branch }}
-        run: bash ./scripts/github/s3_upload.sh
+        run: |
+          cd ./apps/web
+          bash  ./scripts/github/s3_upload.sh
 
       # Comment
       - name: Post a deployment link in the PR

.github/workflows/deploy-dockerhub.yml → .github/workflows/web-deploy-dockerhub.yml

@@ -7,6 +7,8 @@ on:
     branches:
       - main
       - dev
+    paths:
+      - apps/web/**
   release:
     types: [ released ]
 

.github/workflows/e2e-safe-apps.yml → .github/workflows/web-e2e-safe-apps.yml

@@ -2,6 +2,8 @@ name: Safe Apps e2e
 
 on:
   pull_request:
+    paths:
+      - apps/web/**
   workflow_dispatch:
 
 concurrency:

.github/workflows/e2e-smoke.yml → .github/workflows/web-e2e-smoke.yml

@@ -2,7 +2,8 @@ name: Smoke tests
 
 on:
   pull_request:
-
+    paths:
+      - apps/web/**
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true

.github/workflows/lint.yml → .github/workflows/web-lint.yml

@@ -1,5 +1,8 @@
 name: Lint
-on: [pull_request]
+on:
+  pull_request:
+    paths:
+      - apps/web/**
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -24,5 +27,5 @@ jobs:
           fail-check: true # optional
           github-token: ${{ secrets.GITHUB_TOKEN }} # optional
           directory: './' # optional
-          targets: 'src' # optional
-          config-path: './eslint.config.mjs'
+          targets: '/apps/web/src' # optional
+          config-path: './apps/web/eslint.config.mjs'

.github/workflows/nextjs-bundle-analysis.yml → .github/workflows/web-nextjs-bundle-analysis.yml

@@ -5,10 +5,13 @@ name: 'Next.js Bundle Analysis'
 
 on:
   pull_request:
+    paths:
+      - apps/web/**
   push:
     branches:
       - dev
-
+    paths:
+      - apps/web/**
 permissions:
   contents: read # for checkout repository
   actions: read # for fetching base branch bundle stats
@@ -29,29 +32,36 @@ jobs:
           secrets: ${{ toJSON(secrets) }}
 
       - name: Analyze bundle
-        run: npx -p nextjs-bundle-analysis report
+        run: |
+          cd apps/web
+          npx -p nextjs-bundle-analysis report
 
       - name: Upload bundle
         uses: actions/upload-artifact@v4
         with:
           name: bundle
-          path: .next/analyze/__bundle_analysis.json
+          path: apps/web/.next/analyze/__bundle_analysis.json
 
       - name: Download base branch bundle stats
         if: success() && github.event.number
-        run: bash ./scripts/github/download_bundle_analyser_artifact.sh
+        run: |
+          cd apps/web
+          bash ./scripts/github/download_bundle_analyser_artifact.sh
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Compare with base branch bundle
         if: success() && github.event.number
-        run: ls -laR .next/analyze/base && npx -p nextjs-bundle-analysis compare
+        run: |
+          cd apps/web
+          ls -laR .next/analyze/base && npx -p nextjs-bundle-analysis compare
 
       - name: Get Comment Body
         id: get-comment-body
         if: success() && github.event.number
         # https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings
         run: |
+          cd apps/web
           echo "body<<EOF" >> $GITHUB_OUTPUT
           echo "$(cat .next/analyze/__bundle_analysis_comment.txt)" >> $GITHUB_OUTPUT
           echo EOF >> $GITHUB_OUTPUT

.github/workflows/tag-release.yml → .github/workflows/web-tag-release.yml

@@ -5,6 +5,8 @@ on:
     branches:
       - main
     types: [closed]
+    paths:
+      - apps/web/**
 
 jobs:
   tag-release:

.github/workflows/unit-tests.yml → .github/workflows/web-unit-tests.yml

@@ -1,11 +1,14 @@
 name: Unit tests
 on:
   pull_request:
+    paths:
+      - apps/web/**
 
   push:
     branches:
       - main
-
+    paths:
+      - apps/web/**
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -30,6 +33,7 @@ jobs:
           annotations: failed-tests
           package-manager: yarn
           test-script: yarn test:ci
+          working-directory: apps/web
           github-token: ${{ secrets.GITHUB_TOKEN }}
         env:
           NEXT_PUBLIC_IS_OFFICIAL_HOST: true

apps/web/next.config.mjs

@@ -86,7 +86,7 @@ const nextConfig = {
         cacheGroups: {
           ...config.optimization.splitChunks.cacheGroups,
           customModule: {
-            test: /[\\/]node_modules[\\/](@safe-global|ethers)[\\/]/,
+            test: /[\\/]..[\\/]..[\\/]node_modules[\\/](@safe-global|ethers)[\\/]/,
             name: 'protocol-kit-ethers',
             chunks: 'all',
           },

apps/web/package.json

@@ -18,7 +18,7 @@
     "cmp": "./scripts/cmp.sh",
     "routes": "node scripts/generate-routes.js > src/config/routes.ts && prettier -w src/config/routes.ts && cat src/config/routes.ts",
     "css-vars": "npx -y tsx ./scripts/css-vars.ts > ./src/styles/vars.css && prettier -w src/styles/vars.css",
-    "generate-types": "typechain --target ethers-v6 --out-dir src/types/contracts ./node_modules/@safe-global/safe-deployments/dist/assets/**/*.json ./node_modules/@safe-global/safe-modules-deployments/dist/assets/**/*.json ./node_modules/@openzeppelin/contracts/build/contracts/ERC20.json ./node_modules/@openzeppelin/contracts/build/contracts/ERC721.json",
+    "generate-types": "typechain --target ethers-v6 --out-dir src/types/contracts ../../node_modules/@safe-global/safe-deployments/dist/assets/**/*.json ../../node_modules/@safe-global/safe-modules-deployments/dist/assets/**/*.json ../../node_modules/@openzeppelin/contracts/build/contracts/ERC20.json ../../node_modules/@openzeppelin/contracts/build/contracts/ERC721.json",
     "after-install": "yarn generate-types",
     "postinstall": "yarn after-install",
     "analyze": "cross-env ANALYZE=true yarn build",
@@ -62,10 +62,10 @@
     "@walletconnect/core": "^2.17.2",
     "@walletconnect/utils": "^2.17.3",
     "@web3-onboard/coinbase": "^2.4.1",
-    "@web3-onboard/core": "^2.21.4",
+    "@web3-onboard/core": "2.21.4",
     "@web3-onboard/injected-wallets": "^2.11.2",
     "@web3-onboard/ledger": "2.3.2",
-    "@web3-onboard/trezor": "^2.4.2",
+    "@web3-onboard/trezor": "2.4.3",
     "@web3-onboard/walletconnect": "^2.6.1",
     "blo": "^1.1.1",
     "classnames": "^2.5.1",

apps/web/src/components/safe-apps/AppFrame/useAppCommunicator.ts

@@ -24,10 +24,7 @@ import type {
   SafeInfoExtended,
 } from '@safe-global/safe-apps-sdk'
 import { Methods, RPC_CALLS } from '@safe-global/safe-apps-sdk'
-import type {
-  Permission,
-  PermissionRequest,
-} from 'node_modules/@safe-global/safe-apps-sdk/dist/types/types/permissions'
+import type { Permission, PermissionRequest } from '@safe-global/safe-apps-sdk/dist/types/types/permissions'
 import type { SafeSettings } from '@safe-global/safe-apps-sdk'
 import AppCommunicator from '@/services/safe-apps/AppCommunicator'
 import { Errors, logError } from '@/services/exceptions'

apps/web/src/components/safe-apps/PermissionsPrompt.tsx

@@ -1,5 +1,5 @@
 import type { ReactElement } from 'react'
-import type { PermissionRequest } from 'node_modules/@safe-global/safe-apps-sdk/dist/types/types/permissions'
+import type { PermissionRequest } from '@safe-global/safe-apps-sdk/dist/types/types/permissions'
 import { Button, Dialog, DialogActions, DialogContent, Divider, Typography } from '@mui/material'
 
 import { ModalDialogTitle } from '@/components/common/ModalDialog'

apps/web/src/features/recovery/services/__tests__/recovery-state.test.ts

@@ -2,7 +2,7 @@ import { faker } from '@faker-js/faker'
 import { id, zeroPadValue } from 'ethers'
 import { JsonRpcProvider } from 'ethers'
 import cloneDeep from 'lodash/cloneDeep'
-import type { Delay, TransactionAddedEvent } from 'node_modules/@gnosis.pm/zodiac/dist/cjs/types/Delay'
+import type { Delay, TransactionAddedEvent } from '@gnosis.pm/zodiac/dist/cjs/types/Delay'
 import type { TransactionReceipt } from 'ethers'
 
 import {

apps/web/src/features/recovery/services/recovery-sender.ts

@@ -1,7 +1,7 @@
 import { getModuleInstance, KnownContracts } from '@gnosis.pm/zodiac'
 import type { SafeInfo } from '@safe-global/safe-gateway-typescript-sdk'
 import type { SafeTransaction } from '@safe-global/safe-core-sdk-types'
-import type { TransactionAddedEvent } from 'node_modules/@gnosis.pm/zodiac/dist/cjs/types/Delay'
+import type { TransactionAddedEvent } from '@gnosis.pm/zodiac/dist/cjs/types/Delay'
 import type { Eip1193Provider, TransactionResponse } from 'ethers'
 
 import { didReprice, didRevert } from '@/utils/ethers-utils'

apps/web/src/features/recovery/services/recovery-state.ts

@@ -3,7 +3,7 @@ import memoize from 'lodash/memoize'
 import { getMultiSendCallOnlyDeployment } from '@safe-global/safe-deployments'
 import type { SafeInfo } from '@safe-global/safe-gateway-typescript-sdk'
 import type { Delay } from '@gnosis.pm/zodiac'
-import type { TransactionAddedEvent } from 'node_modules/@gnosis.pm/zodiac/dist/cjs/types/Delay'
+import type { TransactionAddedEvent } from '@gnosis.pm/zodiac/dist/cjs/types/Delay'
 import { toBeHex, type JsonRpcProvider, type TransactionReceipt } from 'ethers'
 import { trimTrailingSlash } from '@/utils/url'
 import { sameAddress } from '@/utils/addresses'

apps/web/src/features/swap/helpers/utils.ts

@@ -1,6 +1,6 @@
 import type { DataDecoded, Order as SwapOrder } from '@safe-global/safe-gateway-typescript-sdk'
 import { formatUnits } from 'ethers'
-import type { AnyAppDataDocVersion, latest, LatestAppDataDocVersion } from 'node_modules/@cowprotocol/app-data'
+import type { AnyAppDataDocVersion, latest, LatestAppDataDocVersion } from '@cowprotocol/app-data'
 
 import { TradeType, UiOrderType } from '@/features/swap/types'
 

apps/web/src/hooks/safe-apps/permissions/useSafePermissions.ts

@@ -4,7 +4,7 @@ import type {
   Permission,
   PermissionCaveat,
   PermissionRequest,
-} from 'node_modules/@safe-global/safe-apps-sdk/dist/types/types/permissions'
+} from '@safe-global/safe-apps-sdk/dist/types/types/permissions'
 
 import { PermissionStatus } from '@/components/safe-apps/types'
 import useLocalStorage from '@/services/local-storage/useLocalStorage'

apps/web/src/service-workers/firebase-messaging/firebase-messaging-sw.ts

@@ -67,7 +67,6 @@ export function firebaseMessagingSw() {
     self.registration.showNotification(notification.title || '', {
       icon: ICON_PATH,
       body: notification.body,
-      image: notification.image,
       data,
     })
   })

apps/web/src/store/batchSlice.ts

@@ -37,7 +37,6 @@ export const batchSlice = createSlice({
       state[chainId][safeAddress].push({
         id: Math.random().toString(36).slice(2),
         timestamp: Date.now(),
-        // @ts-expect-error
         txDetails,
       })
     },

apps/web/tsconfig.json

@@ -23,6 +23,15 @@
       "@/*": [
         "./src/*"
       ],
+      "@safe-global/safe-apps-sdk/*": [
+        "../../node_modules/@safe-global/safe-apps-sdk/*"
+      ],
+      "@gnosis.pm/zodiac/*": [
+        "../../node_modules/@gnosis.pm/zodiac/*"
+      ],
+      "@cowprotocol/app-data": [
+        "../../node_modules/@cowprotocol/app-data"
+      ],
       "@/public/*": [
         "./public/*"
       ]

package.json

@@ -16,7 +16,8 @@
     "@safe-global/safe-core-sdk-types/ethers": "6.13.4",
     "@safe-global/protocol-kit/ethers": "6.13.4",
     "@safe-global/api-kit/ethers": "6.13.4",
-    "@gnosis.pm/zodiac/ethers": "6.13.4"
+    "@gnosis.pm/zodiac/ethers": "6.13.4",
+    "@cowprotocol/events": "1.3.0"
   },
   "devDependencies": {
     "husky": "^9.1.6",