Merge remote-tracking branch 'origin/dev' into feat/eip5792-update

.github/workflows/deploy-production.yml

@@ -51,21 +51,17 @@ jobs:
 
       # Update the GitHub release with a checksummed archive
       - name: Upload archive
-        uses: actions/upload-release-asset@v1
+      - uses: Shopify/upload-[email protected]
         with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ env.ARCHIVE_NAME }}.tar.gz
-          asset_name: ${{ env.ARCHIVE_NAME }}.tar.gz
-          asset_content_type: application/gzip
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
+          path: ${{ env.ARCHIVE_NAME }}.tar.gz
+          name: ${{ env.ARCHIVE_NAME }}.tar.gz
+          content-type: application/gzip
+          repo-token: ${{ github.token }}
 
       - name: Upload checksum
-        uses: actions/upload-release-asset@v1
+        uses: Shopify/upload-[email protected]
         with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ env.ARCHIVE_NAME }}-sha256-checksum.txt
-          asset_name: ${{ env.ARCHIVE_NAME }}-sha256-checksum.txt
-          asset_content_type: text/plain
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
+          path: ${{ env.ARCHIVE_NAME }}-sha256-checksum.txt
+          name: ${{ env.ARCHIVE_NAME }}-sha256-checksum.txt
+          content-type: text/plain
+          repo-token: ${{ github.token }}

README.md

@@ -43,8 +43,6 @@ Here's the list of all the environment variables:
 | `NEXT_PUBLIC_FIREBASE_VAPID_KEY_PRODUCTION`            | FCM vapid key on production
 | `NEXT_PUBLIC_FIREBASE_OPTIONS_STAGING`                 | FCM `initializeApp` options on staging
 | `NEXT_PUBLIC_FIREBASE_VAPID_KEY_STAGING`               | FCM vapid key on staging
-| `NEXT_PUBLIC_SOCIAL_WALLET_OPTIONS_PRODUCTION`         | Web3Auth and Google credentials (production)
-| `NEXT_PUBLIC_SOCIAL_WALLET_OPTIONS_STAGING`            | Web3Auth and Google credentials (staging)
 | `NEXT_PUBLIC_SPINDL_SDK_KEY`                           | [Spindl](http://spindl.xyz) SDK key
 
 If you don't provide some of the variables, the corresponding features will be disabled in the UI.

cypress/e2e/pages/create_wallet.pages.js

@@ -87,22 +87,6 @@ export function verifySponsorMessageIsPresent() {
   cy.get(networkFeeSection).contains(sponsorStr).should('exist')
 }
 
-export function verifyGoogleConnectBtnIsDisabled() {
-  cy.get(googleConnectBtn).should('be.disabled')
-}
-
-export function verifyGoogleConnectBtnIsEnabled() {
-  cy.get(googleConnectBtn).should('not.be.disabled')
-}
-
-export function verifyGoogleSignin() {
-  return cy.get(googleSignedinBtn).should('exist')
-}
-
-export function verifyGoogleAccountInfoInHeader() {
-  return cy.get(accountInfoHeader).should('exist')
-}
-
 export function verifyPolicy1_1() {
   cy.contains(policy1_2).should('exist')
   // TOD: Need data-cy for containers

cypress/e2e/pages/owners.pages.js

@@ -242,5 +242,5 @@ export function verifyThreshold(startValue, endValue) {
   cy.get(thresholdInput).parent().click()
   cy.get(thresholdList).contains(endValue).should('be.visible')
   cy.get(thresholdList).find('li').should('have.length', endValue)
-  cy.get('body').click()
+  cy.get('body').click({ force: true })
 }

cypress/support/constants.js

@@ -62,7 +62,7 @@ export const getPermissionsUrl = '/get-permissions'
 export const appSettingsUrl = '/settings/safe-apps'
 export const setupUrl = '/settings/setup?safe='
 export const dataSettingsUrl = '/settings/data?safe='
-export const securityUrl = '/settings/security-login?safe='
+export const securityUrl = '/settings/setup?safe='
 export const invalidAppUrl = 'https://my-invalid-custom-app.com/manifest.json'
 export const validAppUrlJson = 'https://my-valid-custom-app.com/manifest.json'
 export const validAppUrl = 'https://my-valid-custom-app.com'

package.json

@@ -2,7 +2,7 @@
   "name": "safe-wallet-web",
   "homepage": "https://github.com/safe-global/safe-wallet-web",
   "license": "GPL-3.0",
-  "version": "1.36.5",
+  "version": "1.37.0",
   "type": "module",
   "scripts": {
     "dev": "next dev",
@@ -62,7 +62,6 @@
     "@safe-global/safe-modules-deployments": "^1.2.0",
     "@sentry/react": "^7.91.0",
     "@spindl-xyz/attribution-lite": "^1.4.0",
-    "@tkey-mpc/common-types": "^8.2.2",
     "@truffle/hdwallet-provider": "^2.1.4",
     "@walletconnect/utils": "^2.13.1",
     "@walletconnect/web3wallet": "^1.12.1",
@@ -73,20 +72,17 @@
     "@web3-onboard/ledger": "2.3.2",
     "@web3-onboard/trezor": "^2.4.2",
     "@web3-onboard/walletconnect": "^2.5.4",
-    "@web3auth/mpc-core-kit": "^1.1.3",
     "blo": "^1.1.1",
-    "bn.js": "^5.2.1",
     "classnames": "^2.3.1",
     "date-fns": "^2.30.0",
     "ethers": "^6.11.1",
     "exponential-backoff": "^3.1.0",
     "firebase": "^10.3.1",
-    "framer-motion": "^10.13.1",
     "fuse.js": "^6.6.2",
     "idb-keyval": "^6.2.1",
     "js-cookie": "^3.0.1",
     "lodash": "^4.17.21",
-    "next": "^14.1.0",
+    "next": "^14.1.1",
     "papaparse": "^5.3.2",
     "qrcode.react": "^3.1.0",
     "react": "^18.2.0",

src/components/balances/AssetsHeader/index.tsx

@@ -1,19 +1,24 @@
-import type { ReactElement, ReactNode } from 'react'
+import { useMemo, type ReactElement, type ReactNode } from 'react'
 
 import NavTabs from '@/components/common/NavTabs'
 import PageHeader from '@/components/common/PageHeader'
 import { balancesNavItems } from '@/components/sidebar/SidebarNavigation/config'
 
 import css from '@/components/common/PageHeader/styles.module.css'
+import { useCurrentChain } from '@/hooks/useChains'
+import { isRouteEnabled } from '@/utils/chains'
 
 const AssetsHeader = ({ children }: { children?: ReactNode }): ReactElement => {
+  const chain = useCurrentChain()
+  const navItems = useMemo(() => balancesNavItems.filter((item) => isRouteEnabled(item.href, chain)), [chain])
+
   return (
     <PageHeader
       title="Assets"
       action={
         <div className={css.pageHeader}>
           <div className={css.navWrapper}>
-            <NavTabs tabs={balancesNavItems} />
+            <NavTabs tabs={navItems} />
           </div>
           {children && <div className={css.actionsWrapper}>{children}</div>}
         </div>

src/components/batch/BatchSidebar/BatchTxItem.tsx

@@ -6,7 +6,6 @@ import { type DraftBatchItem } from '@/store/batchSlice'
 import TxType from '@/components/transactions/TxType'
 import TxInfo from '@/components/transactions/TxInfo'
 import DeleteIcon from '@/public/images/common/delete.svg'
-import DragIcon from '@/public/images/common/drag.svg'
 import TxData from '@/components/transactions/TxDetails/TxData'
 import { MethodDetails } from '@/components/transactions/TxDetails/TxData/DecodedData/MethodDetails'
 import { TxDataRow } from '@/components/transactions/TxDetails/Summary/TxDataRow'
@@ -17,19 +16,9 @@ type BatchTxItemProps = DraftBatchItem & {
   id: string
   count: number
   onDelete?: (id: string) => void
-  draggable?: boolean
-  dragging?: boolean
 }
 
-const BatchTxItem = ({
-  id,
-  count,
-  timestamp,
-  txDetails,
-  onDelete,
-  dragging = false,
-  draggable = false,
-}: BatchTxItemProps) => {
+const BatchTxItem = ({ id, count, timestamp, txDetails, onDelete }: BatchTxItemProps) => {
   const txSummary = useMemo(
     () => ({
       timestamp,
@@ -61,18 +50,8 @@ const BatchTxItem = ({
       <div className={css.number}>{count}</div>
 
       <Accordion elevation={0} sx={{ flex: 1 }} onChange={handleExpand}>
-        <AccordionSummary expandIcon={<ExpandMoreIcon />} disabled={dragging} className={css.accordion}>
+        <AccordionSummary expandIcon={<ExpandMoreIcon />} className={css.accordion}>
           <Box flex={1} display="flex" alignItems="center" gap={2} py={0.4} width="100%">
-            {draggable && (
-              <SvgIcon
-                component={DragIcon}
-                inheritViewBox
-                fontSize="small"
-                className={css.dragHandle}
-                onClick={(e: MouseEvent) => e.stopPropagation()}
-              />
-            )}
-
             <TxType tx={txSummary} />
 
             <Box flex={1}>

src/components/batch/BatchSidebar/index.tsx

@@ -1,6 +1,5 @@
 import { type SyntheticEvent, useEffect } from 'react'
 import { useCallback, useContext } from 'react'
-import dynamic from 'next/dynamic'
 import { Button, Divider, Drawer, IconButton, SvgIcon, Typography } from '@mui/material'
 import CloseIcon from '@mui/icons-material/Close'
 import { useDraftBatch, useUpdateBatch } from '@/hooks/useDraftBatch'
@@ -13,13 +12,12 @@ import { BATCH_EVENTS } from '@/services/analytics'
 import CheckWallet from '@/components/common/CheckWallet'
 import PlusIcon from '@/public/images/common/plus.svg'
 import EmptyBatch from './EmptyBatch'
-
-const BatchReorder = dynamic(() => import('./BatchReorder'))
+import BatchTxList from './BatchTxList'
 
 const BatchSidebar = ({ isOpen, onToggle }: { isOpen: boolean; onToggle: (open: boolean) => void }) => {
   const { txFlow, setTxFlow } = useContext(TxModalContext)
   const batchTxs = useDraftBatch()
-  const [, deleteTx, onReorder] = useUpdateBatch()
+  const [, deleteTx] = useUpdateBatch()
 
   const closeSidebar = useCallback(() => {
     onToggle(false)
@@ -73,7 +71,7 @@ const BatchSidebar = ({ isOpen, onToggle }: { isOpen: boolean; onToggle: (open:
         {batchTxs.length ? (
           <>
             <div className={css.txs}>
-              <BatchReorder txItems={batchTxs} onDelete={deleteTx} onReorder={onReorder} />
+              <BatchTxList txItems={batchTxs} onDelete={deleteTx} />
             </div>
 
             <CheckWallet>