From 951aae189289d7e3fae6d28a9d5b9e03436c7d17 Mon Sep 17 00:00:00 2001
From: Daniel Dimitrov <daniel@compojoom.com>
Date: Mon, 16 Dec 2024 09:36:25 +0100
Subject: [PATCH] Refactor: extract CGW types into a package (#57)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* refactor: make prettier config global

* feature: extract store gateway to separate package

I’ve moved the autogenerated gateway API code to a separate package.
This will allow us to reuse it in the web application.

In the process I created 2 more configuration packages:
- config/tsconfig
- config/jest-presets

The goal of those is to offer base tsconfig and jest presets for reuse
across packages.

* fix: improve yarn installation instructions

* fix: tsx & linting issues
---
 .github/workflows/mobile-lint.yml             |   2 +
 .lintstagedrc.json                            |   5 +-
 .../mobile/.prettierignore => .prettierignore |   2 +
 apps/mobile/.prettierrc => .prettierrc        |   0
 README.md                                     |  35 ++--
 apps/mobile/app/_layout.tsx                   |   2 +-
 apps/mobile/jest.config.js                    |   3 +
 apps/mobile/package.json                      |   3 +-
 .../components/SafeListItem/SafeListItem.tsx  |   2 +-
 apps/mobile/src/components/TxInfo/TxInfo.tsx  |   4 +-
 .../Card/TxBatchCard/TxBatchCard.stories.tsx  |   2 +-
 .../Card/TxBatchCard/TxBatchCard.test.tsx     |   2 +-
 .../Card/TxBatchCard/TxBatchCard.tsx          |   4 +-
 .../TxConflictingCard/TxConflictingCard.tsx   |   2 +-
 .../TxContractInteractionCard.stories.tsx     |   4 +-
 .../TxContractInteractionCard.test.tsx        |   4 +-
 .../TxContractInteractionCard.tsx             |   4 +-
 .../TxCreationCard/TxCreationCard.stories.tsx |   4 +-
 .../TxCreationCard/TxCreationCard.test.tsx    |   4 +-
 .../Card/TxCreationCard/TxCreationCard.tsx    |   2 +-
 .../TxGroupedCard/TxGroupedCard.stories.tsx   |   4 +-
 .../Card/TxGroupedCard/TxGroupedCard.test.tsx |   4 +-
 .../Card/TxGroupedCard/TxGroupedCard.tsx      |   4 +-
 .../TxRejectionCard.stories.tsx               |   2 +-
 .../TxRejectionCard/TxRejectionCard.test.tsx  |   2 +-
 .../Card/TxRejectionCard/TxRejectionCard.tsx  |   4 +-
 .../TxSafeAppCard/TxSafeAppCard.stories.tsx   |   2 +-
 .../Card/TxSafeAppCard/TxSafeAppCard.test.tsx |   2 +-
 .../Card/TxSafeAppCard/TxSafeAppCard.tsx      |   4 +-
 .../TxSettingsCard/TxSettingCard.stories.tsx  |   4 +-
 .../TxSettingsCard/TxSettingCard.test.tsx     |   4 +-
 .../Card/TxSettingsCard/TxSettingsCard.tsx    |   4 +-
 .../Card/TxSwapCard/TxSwapCard.stories.tsx    |   2 +-
 .../Card/TxSwapCard/TxSwapCard.test.tsx       |   2 +-
 .../Card/TxSwapCard/TxSwapCard.tsx            |   4 +-
 .../Card/TxTokenCard/TxTokenCard.stories.tsx  |   4 +-
 .../Card/TxTokenCard/TxTokenCard.tsx          |   4 +-
 .../components/Balance/Balance.container.tsx  |   7 +-
 .../Assets/components/Balance/Balance.tsx     |   4 +-
 .../Assets/components/Balance/ChainItems.tsx  |   2 +-
 .../Assets/components/NFTs/NFTItem.tsx        |   2 +-
 .../Assets/components/NFTs/NFTs.container.tsx |   2 +-
 .../components/Tokens/Tokens.container.tsx    |   8 +-
 .../PendingTxList/PendingTxList.container.tsx |   4 +-
 apps/mobile/src/features/PendingTx/utils.tsx  |   4 +-
 .../features/Settings/Settings.container.tsx  |   4 +-
 .../mobile/src/features/Settings/Settings.tsx |   2 +-
 .../TxHistory/TxHistory.container.tsx         |   4 +-
 .../TxHistoryList/TxHistoryList.tsx           |   4 +-
 apps/mobile/src/features/TxHistory/utils.tsx  |   4 +-
 apps/mobile/src/hooks/usePendingTxs/index.ts  |   4 +-
 .../src/hooks/useTransactionType/index.tsx    |   6 +-
 .../useTransactionType.test.tsx               |   2 +-
 apps/mobile/src/store/activeChainSlice.ts     |   2 +-
 apps/mobile/src/store/chains/index.ts         |  15 ++
 apps/mobile/src/store/gateway/cgwClient.ts    |   7 -
 apps/mobile/src/store/gateway/utils.ts        |   9 -
 .../mobile/src/store/hooks/storeHooks.test.ts |   2 +-
 apps/mobile/src/store/index.ts                |   5 +-
 apps/mobile/src/store/txHistorySlice.ts       |   2 +-
 apps/mobile/src/tests/mocks.ts                |   4 +-
 apps/mobile/src/utils/gateway.ts              |   2 +-
 .../src/utils/transaction-guards.test.ts      |   2 +-
 apps/mobile/src/utils/transaction-guards.ts   |   6 +-
 apps/mobile/src/utils/transactions.tsx        |   2 +-
 apps/mobile/tsconfig.json                     |   3 +-
 config/jest-presets/package.json              |  12 ++
 config/jest-presets/presets/jest-preset.js    |  24 +++
 config/tsconfig/confs/base.json               |  41 +++++
 config/tsconfig/package.json                  |   8 +
 package.json                                  |   9 +-
 packages/store/README.md                      |  39 +++++
 packages/store/jest.config.js                 |   5 +
 packages/store/package.json                   |  13 ++
 .../store/scripts}/api-schema/schema.json     |   0
 packages/store/scripts/openapi-config.ts      |  73 ++++++++
 .../src}/gateway/AUTO_GENERATED/about.ts      |   0
 .../src}/gateway/AUTO_GENERATED/accounts.ts   |   0
 .../store/src}/gateway/AUTO_GENERATED/auth.ts |   0
 .../src}/gateway/AUTO_GENERATED/balances.ts   |   0
 .../src}/gateway/AUTO_GENERATED/chains.ts     |   0
 .../gateway/AUTO_GENERATED/collectibles.ts    |   0
 .../src}/gateway/AUTO_GENERATED/community.ts  |   0
 .../src}/gateway/AUTO_GENERATED/contracts.ts  |   0
 .../gateway/AUTO_GENERATED/data-decoded.ts    |   0
 .../src}/gateway/AUTO_GENERATED/delegates.ts  |   0
 .../gateway/AUTO_GENERATED/estimations.ts     |   0
 .../src}/gateway/AUTO_GENERATED/messages.ts   |   0
 .../gateway/AUTO_GENERATED/notifications.ts   |   0
 .../src}/gateway/AUTO_GENERATED/owners.ts     |   0
 .../src}/gateway/AUTO_GENERATED/relay.ts      |   0
 .../src}/gateway/AUTO_GENERATED/safe-apps.ts  |   0
 .../src}/gateway/AUTO_GENERATED/safes.ts      |   0
 .../AUTO_GENERATED/targeted-messages.ts       |   0
 .../gateway/AUTO_GENERATED/transactions.ts    |   0
 packages/store/src/gateway/cgwClient.test.ts  |  67 ++++++++
 packages/store/src/gateway/cgwClient.ts       |  37 ++++
 .../store/src}/gateway/chains/index.ts        |  24 +--
 .../store/src}/gateway/index.ts               |   0
 .../store/src}/gateway/types.ts               |   2 +-
 packages/store/src/index.ts                   |   3 +
 packages/store/tsconfig.json                  |   7 +
 yarn.lock                                     | 160 ++++++++++++++++--
 103 files changed, 632 insertions(+), 162 deletions(-)
 rename apps/mobile/.prettierignore => .prettierignore (78%)
 rename apps/mobile/.prettierrc => .prettierrc (100%)
 create mode 100644 apps/mobile/src/store/chains/index.ts
 delete mode 100644 apps/mobile/src/store/gateway/cgwClient.ts
 delete mode 100644 apps/mobile/src/store/gateway/utils.ts
 create mode 100644 config/jest-presets/package.json
 create mode 100644 config/jest-presets/presets/jest-preset.js
 create mode 100644 config/tsconfig/confs/base.json
 create mode 100644 config/tsconfig/package.json
 create mode 100644 packages/store/README.md
 create mode 100644 packages/store/jest.config.js
 create mode 100644 packages/store/package.json
 rename {apps/mobile/src/store/gateway => packages/store/scripts}/api-schema/schema.json (100%)
 create mode 100644 packages/store/scripts/openapi-config.ts
 rename {apps/mobile/src/store => packages/store/src}/gateway/AUTO_GENERATED/about.ts (100%)
 rename {apps/mobile/src/store => packages/store/src}/gateway/AUTO_GENERATED/accounts.ts (100%)
 rename {apps/mobile/src/store => packages/store/src}/gateway/AUTO_GENERATED/auth.ts (100%)
 rename {apps/mobile/src/store => packages/store/src}/gateway/AUTO_GENERATED/balances.ts (100%)
 rename {apps/mobile/src/store => packages/store/src}/gateway/AUTO_GENERATED/chains.ts (100%)
 rename {apps/mobile/src/store => packages/store/src}/gateway/AUTO_GENERATED/collectibles.ts (100%)
 rename {apps/mobile/src/store => packages/store/src}/gateway/AUTO_GENERATED/community.ts (100%)
 rename {apps/mobile/src/store => packages/store/src}/gateway/AUTO_GENERATED/contracts.ts (100%)
 rename {apps/mobile/src/store => packages/store/src}/gateway/AUTO_GENERATED/data-decoded.ts (100%)
 rename {apps/mobile/src/store => packages/store/src}/gateway/AUTO_GENERATED/delegates.ts (100%)
 rename {apps/mobile/src/store => packages/store/src}/gateway/AUTO_GENERATED/estimations.ts (100%)
 rename {apps/mobile/src/store => packages/store/src}/gateway/AUTO_GENERATED/messages.ts (100%)
 rename {apps/mobile/src/store => packages/store/src}/gateway/AUTO_GENERATED/notifications.ts (100%)
 rename {apps/mobile/src/store => packages/store/src}/gateway/AUTO_GENERATED/owners.ts (100%)
 rename {apps/mobile/src/store => packages/store/src}/gateway/AUTO_GENERATED/relay.ts (100%)
 rename {apps/mobile/src/store => packages/store/src}/gateway/AUTO_GENERATED/safe-apps.ts (100%)
 rename {apps/mobile/src/store => packages/store/src}/gateway/AUTO_GENERATED/safes.ts (100%)
 rename {apps/mobile/src/store => packages/store/src}/gateway/AUTO_GENERATED/targeted-messages.ts (100%)
 rename {apps/mobile/src/store => packages/store/src}/gateway/AUTO_GENERATED/transactions.ts (100%)
 create mode 100644 packages/store/src/gateway/cgwClient.test.ts
 create mode 100644 packages/store/src/gateway/cgwClient.ts
 rename {apps/mobile/src/store => packages/store/src}/gateway/chains/index.ts (56%)
 rename {apps/mobile/src/store => packages/store/src}/gateway/index.ts (100%)
 rename {apps/mobile/src/store => packages/store/src}/gateway/types.ts (97%)
 create mode 100644 packages/store/src/index.ts
 create mode 100644 packages/store/tsconfig.json

diff --git a/.github/workflows/mobile-lint.yml b/.github/workflows/mobile-lint.yml
index 0d485c2496..b8be43d5a1 100644
--- a/.github/workflows/mobile-lint.yml
+++ b/.github/workflows/mobile-lint.yml
@@ -6,9 +6,11 @@ on:
       - main
     paths:
       - apps/mobile/**
+      - packages/store/**
   pull_request:
     paths:
       - apps/mobile/**
+      - packages/store/**
 
 jobs:
   lint:
diff --git a/.lintstagedrc.json b/.lintstagedrc.json
index c9e38faadb..021c37f754 100644
--- a/.lintstagedrc.json
+++ b/.lintstagedrc.json
@@ -1,5 +1,8 @@
 {
   "*.ts": ["yarn prettier:fix", "yarn eslint"],
   "*.tsx": ["yarn prettier:fix", "yarn eslint"],
-  "apps/mobile/assets/fonts/safe-icons/selection.json": ["node ./apps/mobile/scripts/generateIconTypes.js", "git add ./apps/mobile/src/types/iconTypes.ts"]
+  "apps/mobile/assets/fonts/safe-icons/selection.json": [
+    "node ./apps/mobile/scripts/generateIconTypes.js",
+    "git add ./apps/mobile/src/types/iconTypes.ts"
+  ]
 }
diff --git a/apps/mobile/.prettierignore b/.prettierignore
similarity index 78%
rename from apps/mobile/.prettierignore
rename to .prettierignore
index 6482fc9c60..bd82d1908e 100644
--- a/apps/mobile/.prettierignore
+++ b/.prettierignore
@@ -6,3 +6,5 @@ html
 ios
 android
 /assets
+
+apps/mobile/assets
diff --git a/apps/mobile/.prettierrc b/.prettierrc
similarity index 100%
rename from apps/mobile/.prettierrc
rename to .prettierrc
diff --git a/README.md b/README.md
index 22fff027f4..bb0f170cf3 100644
--- a/README.md
+++ b/README.md
@@ -18,12 +18,27 @@ To get started, ensure you have the required tools installed and follow these st
 ### Prerequisites
 
 - **Node.js**: Install the latest stable version from [Node.js](https://nodejs.org/).
-- **Yarn**: Use Yarn version 4.5.3 or later. You can install it globally:
+- **Yarn**: Use Yarn version 4.5.3 or later
+
+to install it with the latest node version you can simply do
+
+```bash
+corepack enable
+```
+
+and then just run
 
 ```bash
-npm install -g yarn
+yarn
 ```
 
+This will install the required version of yarn and resolve all dependencies.
+
+> [!INFO]
+>
+> Corepack is a tool to help with managing versions of your package managers. It exposes binary proxies for each supported package manager that, when called, will identify whatever package manager is
+> configured for the current project, download it if needed, and finally run it.
+
 ### Initial Setup
 
 1. Clone the repository:
@@ -52,7 +67,7 @@ yarn workspace <workspace-name> <script>
 ```
 
 Example:
- 
+
 ```bash
 yarn workspace @safe-global/mobile start
 ```
@@ -64,20 +79,21 @@ yarn workspace <workspace-name> add <package-name>
 ```
 
 - **Remove a dependency from a specific workspace:**
+
 ```bash
 yarn workspace <workspace-name> remove <package-name>
 ```
-  
+
 > [!Note]
-> 
-> Yarn treats commands that contain a semicolon as global commands. For example if you have a 
+>
+> Yarn treats commands that contain a semicolon as global commands. For example if you have a
 > command in a workspace that has a semicolon and there isn't another workspace that has the same command,
->you can run the command without specifying the workspace name. For example:
-> 
+> you can run the command without specifying the workspace name. For example:
+>
 > ```bash
 > yarn start:ios
 > ```
-> 
+>
 > is equivalent to:
 >
 > ```bash
@@ -137,4 +153,3 @@ yarn install
 
 If you have any questions or run into issues, feel free to open a discussion or contact the maintainers. Happy coding!
 🚀
-
diff --git a/apps/mobile/app/_layout.tsx b/apps/mobile/app/_layout.tsx
index 286b4a8958..2865ab4c46 100644
--- a/apps/mobile/app/_layout.tsx
+++ b/apps/mobile/app/_layout.tsx
@@ -5,7 +5,7 @@ import { Provider } from 'react-redux'
 import { persistor, store } from '@/src/store'
 import { PersistGate } from 'redux-persist/integration/react'
 import { isStorybookEnv } from '@/src/config/constants'
-import { apiSliceWithChainsConfig } from '@/src/store/gateway/chains/index'
+import { apiSliceWithChainsConfig } from '@safe-global/store/gateway/chains'
 import { GestureHandlerRootView } from 'react-native-gesture-handler'
 import { HeaderBackButton } from '@react-navigation/elements'
 import { BottomSheetModalProvider } from '@gorhom/bottom-sheet'
diff --git a/apps/mobile/jest.config.js b/apps/mobile/jest.config.js
index 4b48e3f29f..06451fc0d8 100644
--- a/apps/mobile/jest.config.js
+++ b/apps/mobile/jest.config.js
@@ -1,4 +1,7 @@
+const preset = require('../../config/jest-presets/presets/jest-preset')
+
 module.exports = {
+  ...preset,
   preset: 'jest-expo',
   collectCoverage: true,
   collectCoverageFrom: [
diff --git a/apps/mobile/package.json b/apps/mobile/package.json
index 19851757fd..fa56976785 100644
--- a/apps/mobile/package.json
+++ b/apps/mobile/package.json
@@ -28,7 +28,6 @@
     "storybook-generate": "sb-rn-get-stories",
     "generate:icons": "node ./scripts/generateIconTypes.js",
     "prepare": "husky",
-    "api-generate": " npx @rtk-query/codegen-openapi openapi-config.ts",
     "build-storybook": "STORYBOOK_WEB='true' storybook build",
     "e2e:metro-ios": "EXPO_PUBLIC_ENV=e2e NODE_ENV=test RN_SRC_EXT=e2e.ts,e2e.tsx expo run:ios",
     "e2e:metro-android": "EXPO_PUBLIC_ENV=e2e NODE_ENV=test RN_SRC_EXT=e2e.ts,e2e.tsx expo run:android",
@@ -48,6 +47,7 @@
     "@react-navigation/material-top-tabs": "^7.0.1",
     "@react-navigation/native": "^7.0.0",
     "@reduxjs/toolkit": "^2.4.0",
+    "@safe-global/store": "workspace:^",
     "@storybook/addon-react-native-web": "^0.0.26",
     "@storybook/addon-webpack5-compiler-babel": "^3.0.3",
     "@tamagui/animations-moti": "^1.117.1",
@@ -128,7 +128,6 @@
     "globals": "^15.11.0",
     "jest": "^29.7.0",
     "jest-expo": "~52.0.2",
-    "prettier": "3.3.3",
     "react-native-svg": "15.8.0",
     "redux-devtools-expo-dev-plugin": "^1.0.0",
     "storybook": "^8.4.6",
diff --git a/apps/mobile/src/components/SafeListItem/SafeListItem.tsx b/apps/mobile/src/components/SafeListItem/SafeListItem.tsx
index c3af8977c0..9e71f252f8 100644
--- a/apps/mobile/src/components/SafeListItem/SafeListItem.tsx
+++ b/apps/mobile/src/components/SafeListItem/SafeListItem.tsx
@@ -4,7 +4,7 @@ import { Text, Theme, ThemeName, View } from 'tamagui'
 import { IconProps, SafeFontIcon } from '../SafeFontIcon/SafeFontIcon'
 import { ellipsis } from '@/src/utils/formatters'
 import { isMultisigExecutionInfo } from '@/src/utils/transaction-guards'
-import { Transaction } from '@/src/store/gateway/AUTO_GENERATED/transactions'
+import { Transaction } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
 import { Badge } from '../Badge'
 
 interface SafeListItemProps {
diff --git a/apps/mobile/src/components/TxInfo/TxInfo.tsx b/apps/mobile/src/components/TxInfo/TxInfo.tsx
index c734391023..8921e3865d 100644
--- a/apps/mobile/src/components/TxInfo/TxInfo.tsx
+++ b/apps/mobile/src/components/TxInfo/TxInfo.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
-import { TransactionInfoType } from '@/src/store/gateway/types'
-import { type Transaction } from '@/src/store/gateway/AUTO_GENERATED/transactions'
+import { TransactionInfoType } from '@safe-global/store/gateway/types'
+import { type Transaction } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
 import { useTransactionType } from '@/src/hooks/useTransactionType'
 import { TxTokenCard } from '@/src/components/transactions-list/Card/TxTokenCard'
 import { TxSettingsCard } from '@/src/components/transactions-list/Card/TxSettingsCard'
diff --git a/apps/mobile/src/components/transactions-list/Card/TxBatchCard/TxBatchCard.stories.tsx b/apps/mobile/src/components/transactions-list/Card/TxBatchCard/TxBatchCard.stories.tsx
index cec5db036e..52e6c4ad65 100644
--- a/apps/mobile/src/components/transactions-list/Card/TxBatchCard/TxBatchCard.stories.tsx
+++ b/apps/mobile/src/components/transactions-list/Card/TxBatchCard/TxBatchCard.stories.tsx
@@ -1,7 +1,7 @@
 import type { Meta, StoryObj } from '@storybook/react'
 import { TxBatchCard } from '@/src/components/transactions-list/Card/TxBatchCard'
 import { mockTransferWithInfo } from '@/src/tests/mocks'
-import { MultiSend, TransactionInfoType } from '@/src/store/gateway/types'
+import { MultiSend, TransactionInfoType } from '@safe-global/store/gateway/types'
 
 const meta: Meta<typeof TxBatchCard> = {
   title: 'TransactionsList/TxBatchCard',
diff --git a/apps/mobile/src/components/transactions-list/Card/TxBatchCard/TxBatchCard.test.tsx b/apps/mobile/src/components/transactions-list/Card/TxBatchCard/TxBatchCard.test.tsx
index 77f9197961..6031fc4d82 100644
--- a/apps/mobile/src/components/transactions-list/Card/TxBatchCard/TxBatchCard.test.tsx
+++ b/apps/mobile/src/components/transactions-list/Card/TxBatchCard/TxBatchCard.test.tsx
@@ -1,7 +1,7 @@
 import { render } from '@/src/tests/test-utils'
 import { TxBatchCard } from '.'
 import { mockTransferWithInfo } from '@/src/tests/mocks'
-import { MultiSend, TransactionInfoType } from '@/src/store/gateway/types'
+import { MultiSend, TransactionInfoType } from '@safe-global/store/gateway/types'
 
 describe('TxBatchCard', () => {
   it('should render the default markup', () => {
diff --git a/apps/mobile/src/components/transactions-list/Card/TxBatchCard/TxBatchCard.tsx b/apps/mobile/src/components/transactions-list/Card/TxBatchCard/TxBatchCard.tsx
index c2bd7ef50c..c82326cd32 100644
--- a/apps/mobile/src/components/transactions-list/Card/TxBatchCard/TxBatchCard.tsx
+++ b/apps/mobile/src/components/transactions-list/Card/TxBatchCard/TxBatchCard.tsx
@@ -2,8 +2,8 @@ import React from 'react'
 import { Avatar, View } from 'tamagui'
 import { SafeListItem } from '@/src/components/SafeListItem'
 import { SafeFontIcon } from '@/src/components/SafeFontIcon/SafeFontIcon'
-import type { MultiSend } from '@/src/store/gateway/types'
-import type { Transaction } from '@/src/store/gateway/AUTO_GENERATED/transactions'
+import type { MultiSend } from '@safe-global/store/gateway/types'
+import type { Transaction } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
 
 interface TxBatchCardProps {
   txInfo: MultiSend
diff --git a/apps/mobile/src/components/transactions-list/Card/TxConflictingCard/TxConflictingCard.tsx b/apps/mobile/src/components/transactions-list/Card/TxConflictingCard/TxConflictingCard.tsx
index ab85e8ea7c..a0ca3f53d9 100644
--- a/apps/mobile/src/components/transactions-list/Card/TxConflictingCard/TxConflictingCard.tsx
+++ b/apps/mobile/src/components/transactions-list/Card/TxConflictingCard/TxConflictingCard.tsx
@@ -2,7 +2,7 @@ import React from 'react'
 import { Theme, View } from 'tamagui'
 import { TxInfo } from '@/src/components/TxInfo'
 import { Alert } from '@/src/components/Alert'
-import { TransactionQueuedItem } from '@/src/store/gateway/AUTO_GENERATED/transactions'
+import { TransactionQueuedItem } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
 
 interface TxConflictingCard {
   transactions: TransactionQueuedItem[]
diff --git a/apps/mobile/src/components/transactions-list/Card/TxContractInteractionCard/TxContractInteractionCard.stories.tsx b/apps/mobile/src/components/transactions-list/Card/TxContractInteractionCard/TxContractInteractionCard.stories.tsx
index c0e3be6663..82acbdd373 100644
--- a/apps/mobile/src/components/transactions-list/Card/TxContractInteractionCard/TxContractInteractionCard.stories.tsx
+++ b/apps/mobile/src/components/transactions-list/Card/TxContractInteractionCard/TxContractInteractionCard.stories.tsx
@@ -1,8 +1,8 @@
 import type { Meta, StoryObj } from '@storybook/react'
 import { TxContractInteractionCard } from '@/src/components/transactions-list/Card/TxContractInteractionCard'
 import { mockTransferWithInfo } from '@/src/tests/mocks'
-import { CustomTransactionInfo } from '@/src/store/gateway/AUTO_GENERATED/transactions'
-import { TransactionInfoType } from '@/src/store/gateway/types'
+import { CustomTransactionInfo } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
+import { TransactionInfoType } from '@safe-global/store/gateway/types'
 
 const meta: Meta<typeof TxContractInteractionCard> = {
   title: 'TransactionsList/TxContractInteractionCard',
diff --git a/apps/mobile/src/components/transactions-list/Card/TxContractInteractionCard/TxContractInteractionCard.test.tsx b/apps/mobile/src/components/transactions-list/Card/TxContractInteractionCard/TxContractInteractionCard.test.tsx
index 5fd08a0e07..99725f1fd7 100644
--- a/apps/mobile/src/components/transactions-list/Card/TxContractInteractionCard/TxContractInteractionCard.test.tsx
+++ b/apps/mobile/src/components/transactions-list/Card/TxContractInteractionCard/TxContractInteractionCard.test.tsx
@@ -1,8 +1,8 @@
 import { render } from '@/src/tests/test-utils'
 import { TxContractInteractionCard } from '.'
 import { mockTransferWithInfo } from '@/src/tests/mocks'
-import { TransactionInfoType } from '@/src/store/gateway/types'
-import { CustomTransactionInfo } from '@/src/store/gateway/AUTO_GENERATED/transactions'
+import { TransactionInfoType } from '@safe-global/store/gateway/types'
+import { CustomTransactionInfo } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
 
 describe('TxContractInteractionCard', () => {
   it('should render the default markup', () => {
diff --git a/apps/mobile/src/components/transactions-list/Card/TxContractInteractionCard/TxContractInteractionCard.tsx b/apps/mobile/src/components/transactions-list/Card/TxContractInteractionCard/TxContractInteractionCard.tsx
index ae7b8391cb..75c08f7dd7 100644
--- a/apps/mobile/src/components/transactions-list/Card/TxContractInteractionCard/TxContractInteractionCard.tsx
+++ b/apps/mobile/src/components/transactions-list/Card/TxContractInteractionCard/TxContractInteractionCard.tsx
@@ -2,8 +2,8 @@ import React from 'react'
 import { Avatar, Text, Theme, View } from 'tamagui'
 import { SafeListItem } from '@/src/components/SafeListItem'
 import { SafeFontIcon } from '@/src/components/SafeFontIcon/SafeFontIcon'
-import { MultiSend } from '@/src/store/gateway/types'
-import { Transaction, CustomTransactionInfo } from '@/src/store/gateway/AUTO_GENERATED/transactions'
+import { MultiSend } from '@safe-global/store/gateway/types'
+import { Transaction, CustomTransactionInfo } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
 
 interface TxContractInteractionCardProps {
   bordered?: boolean
diff --git a/apps/mobile/src/components/transactions-list/Card/TxCreationCard/TxCreationCard.stories.tsx b/apps/mobile/src/components/transactions-list/Card/TxCreationCard/TxCreationCard.stories.tsx
index 232091cd09..1f8ecf6dde 100644
--- a/apps/mobile/src/components/transactions-list/Card/TxCreationCard/TxCreationCard.stories.tsx
+++ b/apps/mobile/src/components/transactions-list/Card/TxCreationCard/TxCreationCard.stories.tsx
@@ -1,8 +1,8 @@
 import type { Meta, StoryObj } from '@storybook/react'
 import { TxCreationCard } from '@/src/components/transactions-list/Card/TxCreationCard'
 import { mockTransferWithInfo } from '@/src/tests/mocks'
-import { type CreationTransactionInfo } from '@/src/store/gateway/AUTO_GENERATED/transactions'
-import { TransactionInfoType } from '@/src/store/gateway/types'
+import { type CreationTransactionInfo } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
+import { TransactionInfoType } from '@safe-global/store/gateway/types'
 
 const meta: Meta<typeof TxCreationCard> = {
   title: 'TransactionsList/TxCreationCard',
diff --git a/apps/mobile/src/components/transactions-list/Card/TxCreationCard/TxCreationCard.test.tsx b/apps/mobile/src/components/transactions-list/Card/TxCreationCard/TxCreationCard.test.tsx
index 86429d425a..7d20459925 100644
--- a/apps/mobile/src/components/transactions-list/Card/TxCreationCard/TxCreationCard.test.tsx
+++ b/apps/mobile/src/components/transactions-list/Card/TxCreationCard/TxCreationCard.test.tsx
@@ -1,8 +1,8 @@
 import { render } from '@/src/tests/test-utils'
 import { TxCreationCard } from '.'
 import { mockTransferWithInfo } from '@/src/tests/mocks'
-import { TransactionInfoType } from '@/src/store/gateway/types'
-import { CreationTransactionInfo } from '@/src/store/gateway/AUTO_GENERATED/transactions'
+import { TransactionInfoType } from '@safe-global/store/gateway/types'
+import { CreationTransactionInfo } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
 
 describe('TxCreationCard', () => {
   it('should render the default markup', () => {
diff --git a/apps/mobile/src/components/transactions-list/Card/TxCreationCard/TxCreationCard.tsx b/apps/mobile/src/components/transactions-list/Card/TxCreationCard/TxCreationCard.tsx
index 061e29007b..4a052a937b 100644
--- a/apps/mobile/src/components/transactions-list/Card/TxCreationCard/TxCreationCard.tsx
+++ b/apps/mobile/src/components/transactions-list/Card/TxCreationCard/TxCreationCard.tsx
@@ -3,7 +3,7 @@ import { Theme, View } from 'tamagui'
 import { SafeListItem } from '@/src/components/SafeListItem'
 import { SafeFontIcon } from '@/src/components/SafeFontIcon/SafeFontIcon'
 import { shortenAddress } from '@/src/utils/formatters'
-import type { Transaction, CreationTransactionInfo } from '@/src/store/gateway/AUTO_GENERATED/transactions'
+import type { Transaction, CreationTransactionInfo } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
 
 interface TxCreationCardProps {
   txInfo: CreationTransactionInfo
diff --git a/apps/mobile/src/components/transactions-list/Card/TxGroupedCard/TxGroupedCard.stories.tsx b/apps/mobile/src/components/transactions-list/Card/TxGroupedCard/TxGroupedCard.stories.tsx
index 985e1551a8..409cbf6beb 100644
--- a/apps/mobile/src/components/transactions-list/Card/TxGroupedCard/TxGroupedCard.stories.tsx
+++ b/apps/mobile/src/components/transactions-list/Card/TxGroupedCard/TxGroupedCard.stories.tsx
@@ -1,7 +1,7 @@
 import type { Meta, StoryObj } from '@storybook/react'
 import { mockERC20Transfer, mockListItemByType, mockNFTTransfer } from '@/src/tests/mocks'
-import { TransactionItem } from '@/src/store/gateway/AUTO_GENERATED/transactions'
-import { TransactionListItemType, TransactionStatus } from '@/src/store/gateway/types'
+import { TransactionItem } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
+import { TransactionListItemType, TransactionStatus } from '@safe-global/store/gateway/types'
 import { TxGroupedCard } from '.'
 
 const meta: Meta<typeof TxGroupedCard> = {
diff --git a/apps/mobile/src/components/transactions-list/Card/TxGroupedCard/TxGroupedCard.test.tsx b/apps/mobile/src/components/transactions-list/Card/TxGroupedCard/TxGroupedCard.test.tsx
index fe4ad0bc66..2db0a34663 100644
--- a/apps/mobile/src/components/transactions-list/Card/TxGroupedCard/TxGroupedCard.test.tsx
+++ b/apps/mobile/src/components/transactions-list/Card/TxGroupedCard/TxGroupedCard.test.tsx
@@ -1,8 +1,8 @@
 import { render } from '@/src/tests/test-utils'
 import { TxGroupedCard } from '.'
 import { mockERC20Transfer, mockListItemByType, mockNFTTransfer, mockSwapTransfer } from '@/src/tests/mocks'
-import { TransactionListItemType, TransactionStatus } from '@/src/store/gateway/types'
-import { TransactionItem } from '@/src/store/gateway/AUTO_GENERATED/transactions'
+import { TransactionListItemType, TransactionStatus } from '@safe-global/store/gateway/types'
+import { TransactionItem } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
 
 describe('TxGroupedCard', () => {
   it('should render the default markup', () => {
diff --git a/apps/mobile/src/components/transactions-list/Card/TxGroupedCard/TxGroupedCard.tsx b/apps/mobile/src/components/transactions-list/Card/TxGroupedCard/TxGroupedCard.tsx
index 3fa970f767..0cebc6e7c5 100644
--- a/apps/mobile/src/components/transactions-list/Card/TxGroupedCard/TxGroupedCard.tsx
+++ b/apps/mobile/src/components/transactions-list/Card/TxGroupedCard/TxGroupedCard.tsx
@@ -5,8 +5,8 @@ import { SafeFontIcon } from '@/src/components/SafeFontIcon/SafeFontIcon'
 import { TxInfo } from '@/src/components/TxInfo'
 import { getOrderClass } from '@/src/hooks/useTransactionType'
 import { isSwapTransferOrderTxInfo } from '@/src/utils/transaction-guards'
-import { OrderTransactionInfo } from '@/src/store/gateway/types'
-import { TransactionQueuedItem, TransactionItem } from '@/src/store/gateway/AUTO_GENERATED/transactions'
+import { OrderTransactionInfo } from '@safe-global/store/gateway/types'
+import { TransactionQueuedItem, TransactionItem } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
 
 interface TxGroupedCard {
   transactions: (TransactionItem | TransactionQueuedItem)[]
diff --git a/apps/mobile/src/components/transactions-list/Card/TxRejectionCard/TxRejectionCard.stories.tsx b/apps/mobile/src/components/transactions-list/Card/TxRejectionCard/TxRejectionCard.stories.tsx
index efcbcbd527..5901b682df 100644
--- a/apps/mobile/src/components/transactions-list/Card/TxRejectionCard/TxRejectionCard.stories.tsx
+++ b/apps/mobile/src/components/transactions-list/Card/TxRejectionCard/TxRejectionCard.stories.tsx
@@ -1,7 +1,7 @@
 import type { Meta, StoryObj } from '@storybook/react'
 import { TxRejectionCard } from '@/src/components/transactions-list/Card/TxRejectionCard'
 import { mockTransferWithInfo } from '@/src/tests/mocks'
-import { Cancellation } from '@/src/store/gateway/types'
+import { Cancellation } from '@safe-global/store/gateway/types'
 
 const meta: Meta<typeof TxRejectionCard> = {
   title: 'TransactionsList/TxRejectionCard',
diff --git a/apps/mobile/src/components/transactions-list/Card/TxRejectionCard/TxRejectionCard.test.tsx b/apps/mobile/src/components/transactions-list/Card/TxRejectionCard/TxRejectionCard.test.tsx
index d72228a755..c11f4f3bee 100644
--- a/apps/mobile/src/components/transactions-list/Card/TxRejectionCard/TxRejectionCard.test.tsx
+++ b/apps/mobile/src/components/transactions-list/Card/TxRejectionCard/TxRejectionCard.test.tsx
@@ -1,7 +1,7 @@
 import { render } from '@/src/tests/test-utils'
 import { TxRejectionCard } from '.'
 import { mockTransferWithInfo } from '@/src/tests/mocks'
-import { Cancellation } from '@/src/store/gateway/types'
+import { Cancellation } from '@safe-global/store/gateway/types'
 
 describe('TxRejectionCard', () => {
   it('should render the default markup', () => {
diff --git a/apps/mobile/src/components/transactions-list/Card/TxRejectionCard/TxRejectionCard.tsx b/apps/mobile/src/components/transactions-list/Card/TxRejectionCard/TxRejectionCard.tsx
index 5119c936c1..afff4d9f7e 100644
--- a/apps/mobile/src/components/transactions-list/Card/TxRejectionCard/TxRejectionCard.tsx
+++ b/apps/mobile/src/components/transactions-list/Card/TxRejectionCard/TxRejectionCard.tsx
@@ -2,8 +2,8 @@ import React from 'react'
 import { View } from 'tamagui'
 import { SafeListItem } from '@/src/components/SafeListItem'
 import { SafeFontIcon } from '@/src/components/SafeFontIcon/SafeFontIcon'
-import type { Cancellation } from '@/src/store/gateway/types'
-import type { Transaction } from '@/src/store/gateway/AUTO_GENERATED/transactions'
+import type { Cancellation } from '@safe-global/store/gateway/types'
+import type { Transaction } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
 
 interface TxRejectionCardProps {
   bordered?: boolean
diff --git a/apps/mobile/src/components/transactions-list/Card/TxSafeAppCard/TxSafeAppCard.stories.tsx b/apps/mobile/src/components/transactions-list/Card/TxSafeAppCard/TxSafeAppCard.stories.tsx
index 27926b3451..57d77ed48e 100644
--- a/apps/mobile/src/components/transactions-list/Card/TxSafeAppCard/TxSafeAppCard.stories.tsx
+++ b/apps/mobile/src/components/transactions-list/Card/TxSafeAppCard/TxSafeAppCard.stories.tsx
@@ -1,7 +1,7 @@
 import type { Meta, StoryObj } from '@storybook/react'
 import { TxSafeAppCard } from '@/src/components/transactions-list/Card/TxSafeAppCard'
 import { mockTransferWithInfo } from '@/src/tests/mocks'
-import { MultiSend } from '@/src/store/gateway/types'
+import { MultiSend } from '@safe-global/store/gateway/types'
 
 const meta: Meta<typeof TxSafeAppCard> = {
   title: 'TransactionsList/TxSafeAppCard',
diff --git a/apps/mobile/src/components/transactions-list/Card/TxSafeAppCard/TxSafeAppCard.test.tsx b/apps/mobile/src/components/transactions-list/Card/TxSafeAppCard/TxSafeAppCard.test.tsx
index 8d95327393..051785e262 100644
--- a/apps/mobile/src/components/transactions-list/Card/TxSafeAppCard/TxSafeAppCard.test.tsx
+++ b/apps/mobile/src/components/transactions-list/Card/TxSafeAppCard/TxSafeAppCard.test.tsx
@@ -1,7 +1,7 @@
 import { render } from '@/src/tests/test-utils'
 import { TxSafeAppCard } from '.'
 import { mockTransferWithInfo } from '@/src/tests/mocks'
-import { MultiSend } from '@/src/store/gateway/types'
+import { MultiSend } from '@safe-global/store/gateway/types'
 
 describe('TxSafeAppCard', () => {
   it('should render the default markup', () => {
diff --git a/apps/mobile/src/components/transactions-list/Card/TxSafeAppCard/TxSafeAppCard.tsx b/apps/mobile/src/components/transactions-list/Card/TxSafeAppCard/TxSafeAppCard.tsx
index bde547f31a..6b4850f8fc 100644
--- a/apps/mobile/src/components/transactions-list/Card/TxSafeAppCard/TxSafeAppCard.tsx
+++ b/apps/mobile/src/components/transactions-list/Card/TxSafeAppCard/TxSafeAppCard.tsx
@@ -2,8 +2,8 @@ import React from 'react'
 import { Avatar, Text, View } from 'tamagui'
 import { SafeListItem } from '@/src/components/SafeListItem'
 import { SafeFontIcon } from '@/src/components/SafeFontIcon/SafeFontIcon'
-import type { MultiSend } from '@/src/store/gateway/types'
-import type { SafeAppInfo, Transaction } from '@/src/store/gateway/AUTO_GENERATED/transactions'
+import type { MultiSend } from '@safe-global/store/gateway/types'
+import type { SafeAppInfo, Transaction } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
 
 interface TxSafeAppCardProps {
   safeAppInfo: SafeAppInfo
diff --git a/apps/mobile/src/components/transactions-list/Card/TxSettingsCard/TxSettingCard.stories.tsx b/apps/mobile/src/components/transactions-list/Card/TxSettingsCard/TxSettingCard.stories.tsx
index a9c40d6392..3eb6822bea 100644
--- a/apps/mobile/src/components/transactions-list/Card/TxSettingsCard/TxSettingCard.stories.tsx
+++ b/apps/mobile/src/components/transactions-list/Card/TxSettingsCard/TxSettingCard.stories.tsx
@@ -1,8 +1,8 @@
 import type { Meta, StoryObj } from '@storybook/react'
 import { TxSettingsCard } from '@/src/components/transactions-list/Card/TxSettingsCard'
 import { mockTransferWithInfo } from '@/src/tests/mocks'
-import { SettingsChangeTransaction } from '@/src/store/gateway/AUTO_GENERATED/transactions'
-import { TransactionInfoType } from '@/src/store/gateway/types'
+import { SettingsChangeTransaction } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
+import { TransactionInfoType } from '@safe-global/store/gateway/types'
 
 const meta: Meta<typeof TxSettingsCard> = {
   title: 'TransactionsList/TxSettingsCard',
diff --git a/apps/mobile/src/components/transactions-list/Card/TxSettingsCard/TxSettingCard.test.tsx b/apps/mobile/src/components/transactions-list/Card/TxSettingsCard/TxSettingCard.test.tsx
index 93b46bbf87..d6e9a98a87 100644
--- a/apps/mobile/src/components/transactions-list/Card/TxSettingsCard/TxSettingCard.test.tsx
+++ b/apps/mobile/src/components/transactions-list/Card/TxSettingsCard/TxSettingCard.test.tsx
@@ -1,8 +1,8 @@
 import { render } from '@/src/tests/test-utils'
 import { TxSettingsCard } from '.'
 import { mockTransferWithInfo } from '@/src/tests/mocks'
-import { TransactionInfoType } from '@/src/store/gateway/types'
-import { SettingsChangeTransaction } from '@/src/store/gateway/AUTO_GENERATED/transactions'
+import { TransactionInfoType } from '@safe-global/store/gateway/types'
+import { SettingsChangeTransaction } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
 
 describe('TxSettingCard', () => {
   it('should render the default markup', () => {
diff --git a/apps/mobile/src/components/transactions-list/Card/TxSettingsCard/TxSettingsCard.tsx b/apps/mobile/src/components/transactions-list/Card/TxSettingsCard/TxSettingsCard.tsx
index dcd30f0b00..d0dbab637e 100644
--- a/apps/mobile/src/components/transactions-list/Card/TxSettingsCard/TxSettingsCard.tsx
+++ b/apps/mobile/src/components/transactions-list/Card/TxSettingsCard/TxSettingsCard.tsx
@@ -2,8 +2,8 @@ import React from 'react'
 import { Theme, View } from 'tamagui'
 import { SafeListItem } from '@/src/components/SafeListItem'
 import { SafeFontIcon } from '@/src/components/SafeFontIcon/SafeFontIcon'
-import { SettingsInfoType } from '@/src/store/gateway/types'
-import { SettingsChangeTransaction, Transaction } from '@/src/store/gateway/AUTO_GENERATED/transactions'
+import { SettingsInfoType } from '@safe-global/store/gateway/types'
+import { SettingsChangeTransaction, Transaction } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
 
 interface TxSettingsCardProps {
   txInfo: SettingsChangeTransaction
diff --git a/apps/mobile/src/components/transactions-list/Card/TxSwapCard/TxSwapCard.stories.tsx b/apps/mobile/src/components/transactions-list/Card/TxSwapCard/TxSwapCard.stories.tsx
index b8704be60d..47ab945cba 100644
--- a/apps/mobile/src/components/transactions-list/Card/TxSwapCard/TxSwapCard.stories.tsx
+++ b/apps/mobile/src/components/transactions-list/Card/TxSwapCard/TxSwapCard.stories.tsx
@@ -1,7 +1,7 @@
 import type { Meta, StoryObj } from '@storybook/react'
 import { TxSwapCard } from '@/src/components/transactions-list/Card/TxSwapCard'
 import { mockSwapTransfer } from '@/src/tests/mocks'
-import { OrderTransactionInfo } from '@/src/store/gateway/types'
+import { OrderTransactionInfo } from '@safe-global/store/gateway/types'
 
 const meta: Meta<typeof TxSwapCard> = {
   title: 'TransactionsList/TxSwapCard',
diff --git a/apps/mobile/src/components/transactions-list/Card/TxSwapCard/TxSwapCard.test.tsx b/apps/mobile/src/components/transactions-list/Card/TxSwapCard/TxSwapCard.test.tsx
index dbb6b1bd12..94e4414277 100644
--- a/apps/mobile/src/components/transactions-list/Card/TxSwapCard/TxSwapCard.test.tsx
+++ b/apps/mobile/src/components/transactions-list/Card/TxSwapCard/TxSwapCard.test.tsx
@@ -1,6 +1,6 @@
 import { render } from '@/src/tests/test-utils'
 import { TxSwapCard } from '.'
-import { OrderTransactionInfo } from '@/src/store/gateway/types'
+import { OrderTransactionInfo } from '@safe-global/store/gateway/types'
 import { mockSwapTransfer } from '@/src/tests/mocks'
 
 describe('TxSwapCard', () => {
diff --git a/apps/mobile/src/components/transactions-list/Card/TxSwapCard/TxSwapCard.tsx b/apps/mobile/src/components/transactions-list/Card/TxSwapCard/TxSwapCard.tsx
index b64e96c0af..bc01210024 100644
--- a/apps/mobile/src/components/transactions-list/Card/TxSwapCard/TxSwapCard.tsx
+++ b/apps/mobile/src/components/transactions-list/Card/TxSwapCard/TxSwapCard.tsx
@@ -2,8 +2,8 @@ import React from 'react'
 import { Avatar, Text, Theme, View } from 'tamagui'
 import { SafeListItem } from '@/src/components/SafeListItem'
 import { formatValue } from '@/src/utils/formatters'
-import { OrderTransactionInfo } from '@/src/store/gateway/types'
-import { Transaction } from '@/src/store/gateway/AUTO_GENERATED/transactions'
+import { OrderTransactionInfo } from '@safe-global/store/gateway/types'
+import { Transaction } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
 
 interface TxSwapCardProps {
   txInfo: OrderTransactionInfo
diff --git a/apps/mobile/src/components/transactions-list/Card/TxTokenCard/TxTokenCard.stories.tsx b/apps/mobile/src/components/transactions-list/Card/TxTokenCard/TxTokenCard.stories.tsx
index 44ee9d207c..ee710c8681 100644
--- a/apps/mobile/src/components/transactions-list/Card/TxTokenCard/TxTokenCard.stories.tsx
+++ b/apps/mobile/src/components/transactions-list/Card/TxTokenCard/TxTokenCard.stories.tsx
@@ -1,8 +1,8 @@
 import type { Meta, StoryObj } from '@storybook/react'
 import { TxTokenCard } from '@/src/components/transactions-list/Card/TxTokenCard'
 import { mockERC20Transfer, mockNFTTransfer } from '@/src/tests/mocks'
-import { TransactionStatus } from '@/src/store/gateway/types'
-import { type TransferTransactionInfo } from '@/src/store/gateway/AUTO_GENERATED/transactions'
+import { TransactionStatus } from '@safe-global/store/gateway/types'
+import { type TransferTransactionInfo } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
 
 const meta: Meta<typeof TxTokenCard> = {
   title: 'TransactionsList/TxTokenCard',
diff --git a/apps/mobile/src/components/transactions-list/Card/TxTokenCard/TxTokenCard.tsx b/apps/mobile/src/components/transactions-list/Card/TxTokenCard/TxTokenCard.tsx
index ac3b986f7a..eef29051e5 100644
--- a/apps/mobile/src/components/transactions-list/Card/TxTokenCard/TxTokenCard.tsx
+++ b/apps/mobile/src/components/transactions-list/Card/TxTokenCard/TxTokenCard.tsx
@@ -11,8 +11,8 @@ import {
 import { ellipsis, formatValue } from '@/src/utils/formatters'
 import { useSelector } from 'react-redux'
 import { selectNativeCurrency } from '@/src/store/activeChainSlice'
-import { TransferDirection } from '@/src/store/gateway/types'
-import { TransferTransactionInfo, Transaction } from '@/src/store/gateway/AUTO_GENERATED/transactions'
+import { TransferDirection } from '@safe-global/store/gateway/types'
+import { TransferTransactionInfo, Transaction } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
 import { Logo } from '@/src/components/Logo'
 
 interface TxTokenCardProps {
diff --git a/apps/mobile/src/features/Assets/components/Balance/Balance.container.tsx b/apps/mobile/src/features/Assets/components/Balance/Balance.container.tsx
index 739a089ec0..f9997d588c 100644
--- a/apps/mobile/src/features/Assets/components/Balance/Balance.container.tsx
+++ b/apps/mobile/src/features/Assets/components/Balance/Balance.container.tsx
@@ -1,10 +1,10 @@
 import { selectActiveChain, switchActiveChain } from '@/src/store/activeChainSlice'
 import { useDispatch, useSelector } from 'react-redux'
-import { useSafesGetSafeOverviewV1Query } from '@/src/store/gateway/AUTO_GENERATED/safes'
+import { useSafesGetSafeOverviewV1Query } from '@safe-global/store/gateway/AUTO_GENERATED/safes'
 import { selectActiveSafe } from '@/src/store/activeSafeSlice'
-import { SafeOverviewResult } from '@/src/store/gateway/types'
+import { SafeOverviewResult } from '@safe-global/store/gateway/types'
 import { POLLING_INTERVAL } from '@/src/config/constants'
-import { selectAllChains } from '@/src/store/gateway/chains'
+import { selectAllChains } from '@/src/store/chains'
 import { Balance } from './Balance'
 
 const makeSafeId = (chainId: string, address: string) => `${chainId}:${address}` as `${number}:0x${string}`
@@ -23,6 +23,7 @@ export function BalanceContainer() {
     },
     {
       pollingInterval: POLLING_INTERVAL,
+      skip: chains.length === 0,
     },
   )
 
diff --git a/apps/mobile/src/features/Assets/components/Balance/Balance.tsx b/apps/mobile/src/features/Assets/components/Balance/Balance.tsx
index 2836fc11f1..4636453345 100644
--- a/apps/mobile/src/features/Assets/components/Balance/Balance.tsx
+++ b/apps/mobile/src/features/Assets/components/Balance/Balance.tsx
@@ -4,8 +4,8 @@ import { Image, Spinner, View } from 'tamagui'
 import { Alert } from '@/src/components/Alert'
 import { Dropdown } from '@/src/components/Dropdown'
 import { Fiat } from '@/src/components/Fiat'
-import { SafeOverview } from '@/src/store/gateway/AUTO_GENERATED/safes'
-import { Chain } from '@/src/store/gateway/AUTO_GENERATED/chains'
+import { SafeOverview } from '@safe-global/store/gateway/AUTO_GENERATED/safes'
+import { Chain } from '@safe-global/store/gateway/AUTO_GENERATED/chains'
 
 import { ChainItems } from './ChainItems'
 
diff --git a/apps/mobile/src/features/Assets/components/Balance/ChainItems.tsx b/apps/mobile/src/features/Assets/components/Balance/ChainItems.tsx
index b3bfde3708..2bf3fd6514 100644
--- a/apps/mobile/src/features/Assets/components/Balance/ChainItems.tsx
+++ b/apps/mobile/src/features/Assets/components/Balance/ChainItems.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { View } from 'tamagui'
-import { Chain } from '@/src/store/gateway/AUTO_GENERATED/chains'
+import { Chain } from '@safe-global/store/gateway/AUTO_GENERATED/chains'
 import { AssetsCard } from '@/src/components/transactions-list/Card/AssetsCard'
 import { SafeFontIcon } from '@/src/components/SafeFontIcon/SafeFontIcon'
 import { TouchableOpacity } from 'react-native'
diff --git a/apps/mobile/src/features/Assets/components/NFTs/NFTItem.tsx b/apps/mobile/src/features/Assets/components/NFTs/NFTItem.tsx
index e1687c5d00..bb36487f78 100644
--- a/apps/mobile/src/features/Assets/components/NFTs/NFTItem.tsx
+++ b/apps/mobile/src/features/Assets/components/NFTs/NFTItem.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { AssetsCard } from '@/src/components/transactions-list/Card/AssetsCard'
-import { Collectible } from '@/src/store/gateway/AUTO_GENERATED/collectibles'
+import { Collectible } from '@safe-global/store/gateway/AUTO_GENERATED/collectibles'
 
 export function NFTItem({ item }: { item: Collectible }) {
   return (
diff --git a/apps/mobile/src/features/Assets/components/NFTs/NFTs.container.tsx b/apps/mobile/src/features/Assets/components/NFTs/NFTs.container.tsx
index d713475066..6ee3ca8e13 100644
--- a/apps/mobile/src/features/Assets/components/NFTs/NFTs.container.tsx
+++ b/apps/mobile/src/features/Assets/components/NFTs/NFTs.container.tsx
@@ -9,7 +9,7 @@ import {
   Collectible,
   CollectiblePage,
   useCollectiblesGetCollectiblesV2Query,
-} from '@/src/store/gateway/AUTO_GENERATED/collectibles'
+} from '@safe-global/store/gateway/AUTO_GENERATED/collectibles'
 
 import { Fallback } from '../Fallback'
 import { NFTItem } from './NFTItem'
diff --git a/apps/mobile/src/features/Assets/components/Tokens/Tokens.container.tsx b/apps/mobile/src/features/Assets/components/Tokens/Tokens.container.tsx
index f319433094..bba93e7497 100644
--- a/apps/mobile/src/features/Assets/components/Tokens/Tokens.container.tsx
+++ b/apps/mobile/src/features/Assets/components/Tokens/Tokens.container.tsx
@@ -7,19 +7,19 @@ import { SafeTab } from '@/src/components/SafeTab'
 import { AssetsCard } from '@/src/components/transactions-list/Card/AssetsCard'
 import { POLLING_INTERVAL } from '@/src/config/constants'
 import { selectActiveSafe } from '@/src/store/activeSafeSlice'
-import { Balance, useBalancesGetBalancesV1Query } from '@/src/store/gateway/AUTO_GENERATED/balances'
+import { Balance, useBalancesGetBalancesV1Query } from '@safe-global/store/gateway/AUTO_GENERATED/balances'
 import { formatValue } from '@/src/utils/formatters'
-import { selectActiveChain } from '@/src/store/activeChainSlice'
+// import { selectActiveChain } from '@/src/store/activeChainSlice'
 
 import { Fallback } from '../Fallback'
 
 export function TokensContainer() {
   const activeSafe = useSelector(selectActiveSafe)
-  const activeChain = useSelector(selectActiveChain)
+  // const activeChain = useSelector(selectActiveChain)
 
   const { data, isLoading, error } = useBalancesGetBalancesV1Query(
     {
-      chainId: activeChain?.chainId,
+      chainId: activeSafe.chainId,
       fiatCode: 'USD',
       safeAddress: activeSafe.address,
       excludeSpam: false,
diff --git a/apps/mobile/src/features/PendingTx/components/PendingTxList/PendingTxList.container.tsx b/apps/mobile/src/features/PendingTx/components/PendingTxList/PendingTxList.container.tsx
index 4598e0121d..21622f85f3 100644
--- a/apps/mobile/src/features/PendingTx/components/PendingTxList/PendingTxList.container.tsx
+++ b/apps/mobile/src/features/PendingTx/components/PendingTxList/PendingTxList.container.tsx
@@ -6,8 +6,8 @@ import { Badge } from '@/src/components/Badge'
 import { NavBarTitle } from '@/src/components/Title/NavBarTitle'
 import { LargeHeaderTitle } from '@/src/components/Title/LargeHeaderTitle'
 import { useScrollableHeader } from '@/src/navigation/useScrollableHeader'
-import { TransactionQueuedItem } from '@/src/store/gateway/AUTO_GENERATED/transactions'
-import { PendingTransactionItems } from '@/src/store/gateway/types'
+import { TransactionQueuedItem } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
+import { PendingTransactionItems } from '@safe-global/store/gateway/types'
 import { keyExtractor, renderItem } from '@/src/features/PendingTx/utils'
 
 export interface GroupedPendingTxsWithTitle {
diff --git a/apps/mobile/src/features/PendingTx/utils.tsx b/apps/mobile/src/features/PendingTx/utils.tsx
index ff59407a70..8db8a49bd6 100644
--- a/apps/mobile/src/features/PendingTx/utils.tsx
+++ b/apps/mobile/src/features/PendingTx/utils.tsx
@@ -1,4 +1,4 @@
-import { TransactionQueuedItem } from '@/src/store/gateway/AUTO_GENERATED/transactions'
+import { TransactionQueuedItem } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
 import {
   getBulkGroupTxHash,
   getTxHash,
@@ -7,7 +7,7 @@ import {
   isTransactionListItem,
 } from '@/src/utils/transaction-guards'
 import { groupBulkTxs } from '@/src/utils/transactions'
-import { type PendingTransactionItems, TransactionListItemType } from '@/src/store/gateway/types'
+import { type PendingTransactionItems, TransactionListItemType } from '@safe-global/store//src/gateway/types'
 import { View } from 'tamagui'
 import { TxGroupedCard } from '@/src/components/transactions-list/Card/TxGroupedCard'
 import { TxConflictingCard } from '@/src/components/transactions-list/Card/TxConflictingCard'
diff --git a/apps/mobile/src/features/Settings/Settings.container.tsx b/apps/mobile/src/features/Settings/Settings.container.tsx
index 9a460c3489..f5eb3930d5 100644
--- a/apps/mobile/src/features/Settings/Settings.container.tsx
+++ b/apps/mobile/src/features/Settings/Settings.container.tsx
@@ -1,5 +1,5 @@
-import { useGetSafeQuery } from '@/src/store/gateway'
-import { SafeState } from '@/src/store/gateway/AUTO_GENERATED/safes'
+import { useGetSafeQuery } from '@safe-global/store/gateway'
+import { SafeState } from '@safe-global/store/gateway/AUTO_GENERATED/safes'
 import { useSelector } from 'react-redux'
 import { selectActiveSafe } from '@/src/store/activeSafeSlice'
 import { Settings } from './Settings'
diff --git a/apps/mobile/src/features/Settings/Settings.tsx b/apps/mobile/src/features/Settings/Settings.tsx
index 078eda2274..f4246cfc25 100644
--- a/apps/mobile/src/features/Settings/Settings.tsx
+++ b/apps/mobile/src/features/Settings/Settings.tsx
@@ -5,7 +5,7 @@ import { SafeListItem } from '@/src/components/SafeListItem'
 import { Skeleton } from 'moti/skeleton'
 import { Pressable } from 'react-native'
 import { EthAddress } from '@/src/components/EthAddress'
-import { SafeState } from '@/src/store/gateway/AUTO_GENERATED/safes'
+import { SafeState } from '@safe-global/store/gateway/AUTO_GENERATED/safes'
 import { Address } from '@/src/types/address'
 import { router } from 'expo-router'
 import { IdenticonWithBadge } from '@/src/features/Settings/components/IdenticonWithBadge'
diff --git a/apps/mobile/src/features/TxHistory/TxHistory.container.tsx b/apps/mobile/src/features/TxHistory/TxHistory.container.tsx
index 101a4928d5..1adb86a82d 100644
--- a/apps/mobile/src/features/TxHistory/TxHistory.container.tsx
+++ b/apps/mobile/src/features/TxHistory/TxHistory.container.tsx
@@ -2,8 +2,8 @@ import React, { useEffect, useState } from 'react'
 import { useSelector } from 'react-redux'
 import { safelyDecodeURIComponent } from 'expo-router/build/fork/getStateFromPath-forks'
 
-import { useGetTxsHistoryQuery } from '@/src/store/gateway'
-import type { TransactionItemPage } from '@/src/store/gateway/AUTO_GENERATED/transactions'
+import { useGetTxsHistoryQuery } from '@safe-global/store/gateway'
+import type { TransactionItemPage } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
 import { selectActiveSafe } from '@/src/store/activeSafeSlice'
 import { TxHistoryList } from '@/src/features/TxHistory/components/TxHistoryList'
 
diff --git a/apps/mobile/src/features/TxHistory/components/TxHistoryList/TxHistoryList.tsx b/apps/mobile/src/features/TxHistory/components/TxHistoryList/TxHistoryList.tsx
index 9975d88edc..fda4ac0a8b 100644
--- a/apps/mobile/src/features/TxHistory/components/TxHistoryList/TxHistoryList.tsx
+++ b/apps/mobile/src/features/TxHistory/components/TxHistoryList/TxHistoryList.tsx
@@ -3,9 +3,9 @@ import React, { useMemo } from 'react'
 import { SectionList } from 'react-native'
 
 import { SafeListItem } from '@/src/components/SafeListItem'
-import { TransactionItem } from '@/src/store/gateway/AUTO_GENERATED/transactions'
+import { TransactionItem } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
 import { getTxHash, GroupedTxsWithTitle, groupTxsByDate } from '@/src/features/TxHistory/utils'
-import { HistoryTransactionItems } from '@/src/store/gateway/types'
+import { HistoryTransactionItems } from '@safe-global/store/gateway/types'
 import { renderItem } from '@/src/features/TxHistory/utils'
 
 interface TxHistoryList {
diff --git a/apps/mobile/src/features/TxHistory/utils.tsx b/apps/mobile/src/features/TxHistory/utils.tsx
index 23d1b94e2c..1106268ee4 100644
--- a/apps/mobile/src/features/TxHistory/utils.tsx
+++ b/apps/mobile/src/features/TxHistory/utils.tsx
@@ -1,8 +1,8 @@
-import { DateLabel, TransactionItem } from '@/src/store/gateway/AUTO_GENERATED/transactions'
+import { DateLabel, TransactionItem } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
 import { groupBulkTxs } from '@/src/utils/transactions'
 import { formatWithSchema } from '@/src/utils/date'
 import { isDateLabel } from '@/src/utils/transaction-guards'
-import { HistoryTransactionItems } from '@/src/store/gateway/types'
+import { HistoryTransactionItems } from '@safe-global/store/gateway/types'
 import { View } from 'tamagui'
 import { TxGroupedCard } from '@/src/components/transactions-list/Card/TxGroupedCard'
 import { TxInfo } from '@/src/components/TxInfo'
diff --git a/apps/mobile/src/hooks/usePendingTxs/index.ts b/apps/mobile/src/hooks/usePendingTxs/index.ts
index 278193abec..ec803e2a06 100644
--- a/apps/mobile/src/hooks/usePendingTxs/index.ts
+++ b/apps/mobile/src/hooks/usePendingTxs/index.ts
@@ -1,7 +1,7 @@
-import { useGetPendingTxsQuery } from '@/src/store/gateway'
+import { useGetPendingTxsQuery } from '@safe-global/store/gateway'
 import { useEffect, useMemo, useState } from 'react'
 import { useSelector } from 'react-redux'
-import { QueuedItemPage } from '@/src/store/gateway/AUTO_GENERATED/transactions'
+import { QueuedItemPage } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
 import { groupPendingTxs } from '@/src/features/PendingTx/utils'
 import { selectActiveSafe } from '@/src/store/activeSafeSlice'
 
diff --git a/apps/mobile/src/hooks/useTransactionType/index.tsx b/apps/mobile/src/hooks/useTransactionType/index.tsx
index 663d09356f..f7d39b775f 100644
--- a/apps/mobile/src/hooks/useTransactionType/index.tsx
+++ b/apps/mobile/src/hooks/useTransactionType/index.tsx
@@ -1,7 +1,7 @@
 import { useMemo } from 'react'
 import type { AnyAppDataDocVersion, latest } from '@cowprotocol/app-data'
-import { SettingsInfoType, TransactionInfoType } from '@/src/store/gateway/types'
-import type { Transaction, AddressInfo } from '@/src/store/gateway/AUTO_GENERATED/transactions'
+import { SettingsInfoType, TransactionInfoType } from '@safe-global/store/gateway/types'
+import type { Transaction, AddressInfo } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
 import {
   isCancellationTxInfo,
   isModuleExecutionInfo,
@@ -10,7 +10,7 @@ import {
   isTxQueued,
 } from '@/src/utils/transaction-guards'
 import { SafeFontIcon } from '@/src/components/SafeFontIcon/SafeFontIcon'
-import { SwapOrderTransactionInfo } from '@/src/store/gateway/AUTO_GENERATED/transactions'
+import { SwapOrderTransactionInfo } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
 
 const getTxTo = ({ txInfo }: Pick<Transaction, 'txInfo'>): AddressInfo | undefined => {
   switch (txInfo.type) {
diff --git a/apps/mobile/src/hooks/useTransactionType/useTransactionType.test.tsx b/apps/mobile/src/hooks/useTransactionType/useTransactionType.test.tsx
index 858740139c..429fb848c1 100644
--- a/apps/mobile/src/hooks/useTransactionType/useTransactionType.test.tsx
+++ b/apps/mobile/src/hooks/useTransactionType/useTransactionType.test.tsx
@@ -1,7 +1,7 @@
 import { renderHook } from '@/src/tests/test-utils'
 import { useTransactionType } from '.'
 import { mockTransactionSummary, mockTransferWithInfo } from '@/src/tests/mocks'
-import { TransactionInfoType, TransactionStatus, TransferDirection } from '@/src/store/gateway/types'
+import { TransactionInfoType, TransactionStatus, TransferDirection } from '@safe-global/store/gateway/types'
 
 describe('useTransactionType', () => {
   it('should be a Received transaction', () => {
diff --git a/apps/mobile/src/store/activeChainSlice.ts b/apps/mobile/src/store/activeChainSlice.ts
index 78cddaf727..fc5dc964e6 100644
--- a/apps/mobile/src/store/activeChainSlice.ts
+++ b/apps/mobile/src/store/activeChainSlice.ts
@@ -1,6 +1,6 @@
 import { createSelector, createSlice, PayloadAction } from '@reduxjs/toolkit'
 import { RootState } from '.'
-import { selectChainById } from './gateway/chains'
+import { selectChainById } from './chains'
 
 const initialState = { id: '1' }
 
diff --git a/apps/mobile/src/store/chains/index.ts b/apps/mobile/src/store/chains/index.ts
new file mode 100644
index 0000000000..ed675e21b7
--- /dev/null
+++ b/apps/mobile/src/store/chains/index.ts
@@ -0,0 +1,15 @@
+import { apiSliceWithChainsConfig, chainsAdapter, initialState } from '@safe-global/store/gateway/chains'
+import { createSelector } from '@reduxjs/toolkit'
+import { RootState } from '..'
+
+const selectChainsResult = apiSliceWithChainsConfig.endpoints.getChainsConfig.select()
+
+const selectChainsData = createSelector(selectChainsResult, (result) => {
+  return result.data ?? initialState
+})
+
+const { selectAll: selectAllChains, selectById } = chainsAdapter.getSelectors(selectChainsData)
+
+export const selectChainById = (state: RootState, chainId: string) => selectById(state, chainId)
+export const { useGetChainsConfigQuery } = apiSliceWithChainsConfig
+export { selectAllChains }
diff --git a/apps/mobile/src/store/gateway/cgwClient.ts b/apps/mobile/src/store/gateway/cgwClient.ts
deleted file mode 100644
index f132eda01e..0000000000
--- a/apps/mobile/src/store/gateway/cgwClient.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react'
-import { GATEWAY_URL } from '@/src/config/constants'
-
-export const cgwClient = createApi({
-  baseQuery: fetchBaseQuery({ baseUrl: GATEWAY_URL }),
-  endpoints: () => ({}),
-})
diff --git a/apps/mobile/src/store/gateway/utils.ts b/apps/mobile/src/store/gateway/utils.ts
deleted file mode 100644
index 7fb509aa95..0000000000
--- a/apps/mobile/src/store/gateway/utils.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { asError } from '@/src/services/exceptions/utils'
-
-export async function buildQueryFn<T>(fn: () => Promise<T>) {
-  try {
-    return { data: await fn() }
-  } catch (error) {
-    return { error: asError(error) }
-  }
-}
diff --git a/apps/mobile/src/store/hooks/storeHooks.test.ts b/apps/mobile/src/store/hooks/storeHooks.test.ts
index 4317f98ac5..8a80d5977a 100644
--- a/apps/mobile/src/store/hooks/storeHooks.test.ts
+++ b/apps/mobile/src/store/hooks/storeHooks.test.ts
@@ -2,7 +2,7 @@ import { renderHook, act } from '@/src/tests/test-utils'
 import { useAppSelector, useAppDispatch } from '.'
 import { addTx, txHistorySelector } from '../txHistorySlice'
 import { mockHistoryPageItem } from '@/src/tests/mocks'
-import { TransactionListItemType } from '@/src/store/gateway/types'
+import { TransactionListItemType } from '@safe-global/store/gateway/types'
 
 const mockHook = () => {
   const dispatch = useAppDispatch()
diff --git a/apps/mobile/src/store/index.ts b/apps/mobile/src/store/index.ts
index 6e0ce10827..4f078cd2e3 100644
--- a/apps/mobile/src/store/index.ts
+++ b/apps/mobile/src/store/index.ts
@@ -4,10 +4,11 @@ import { reduxStorage } from './storage'
 import txHistory from './txHistorySlice'
 import activeChain from './activeChainSlice'
 import activeSafe from './activeSafeSlice'
-import { cgwClient } from '@/src/store/gateway/cgwClient'
+import { cgwClient, setBaseUrl } from '@safe-global/store/gateway/cgwClient'
 import devToolsEnhancer from 'redux-devtools-expo-dev-plugin'
-import { isTestingEnv } from '../config/constants'
+import { GATEWAY_URL, isTestingEnv } from '../config/constants'
 
+setBaseUrl(GATEWAY_URL)
 const persistConfig = {
   key: 'root',
   version: 1,
diff --git a/apps/mobile/src/store/txHistorySlice.ts b/apps/mobile/src/store/txHistorySlice.ts
index 6ed098c467..f64b20408b 100644
--- a/apps/mobile/src/store/txHistorySlice.ts
+++ b/apps/mobile/src/store/txHistorySlice.ts
@@ -1,6 +1,6 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit'
 import { RootState } from '.'
-import { TransactionItemPage } from '@/src/store/gateway/AUTO_GENERATED/transactions'
+import { TransactionItemPage } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
 
 const initialState: TransactionItemPage = { results: [] }
 
diff --git a/apps/mobile/src/tests/mocks.ts b/apps/mobile/src/tests/mocks.ts
index 57f8daf164..7b1b4861ec 100644
--- a/apps/mobile/src/tests/mocks.ts
+++ b/apps/mobile/src/tests/mocks.ts
@@ -8,7 +8,7 @@ import {
   ConflictType,
   TransactionListItemType,
   HistoryTransactionItems,
-} from '@/src/store/gateway/types'
+} from '@safe-global/store/gateway/types'
 import {
   TransferTransactionInfo,
   SwapTransferTransactionInfo,
@@ -18,7 +18,7 @@ import {
   ConflictHeaderQueuedItem,
   AddressInfo,
   Transaction,
-} from '@/src/store/gateway/AUTO_GENERATED/transactions'
+} from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
 
 export const fakeToken = {
   address: '0x1111111111',
diff --git a/apps/mobile/src/utils/gateway.ts b/apps/mobile/src/utils/gateway.ts
index 1f2bbc7650..770301365f 100644
--- a/apps/mobile/src/utils/gateway.ts
+++ b/apps/mobile/src/utils/gateway.ts
@@ -1,4 +1,4 @@
-import { type Chain } from '@/src/store/gateway/AUTO_GENERATED/chains'
+import { type Chain } from '@safe-global/store/gateway/AUTO_GENERATED/chains'
 
 export const _replaceTemplate = (uri: string, data: Record<string, string>): string => {
   // Template syntax returned from gateway is {{this}}
diff --git a/apps/mobile/src/utils/transaction-guards.test.ts b/apps/mobile/src/utils/transaction-guards.test.ts
index 555db1baf4..aab64ad884 100644
--- a/apps/mobile/src/utils/transaction-guards.test.ts
+++ b/apps/mobile/src/utils/transaction-guards.test.ts
@@ -5,7 +5,7 @@ import {
   TransactionListItemType,
   TransactionStatus,
   TransferDirection,
-} from '@/src/store/gateway/types'
+} from '@safe-global/store/gateway/types'
 import {
   isCancellationTxInfo,
   isCreationTxInfo,
diff --git a/apps/mobile/src/utils/transaction-guards.ts b/apps/mobile/src/utils/transaction-guards.ts
index 30d96c4add..f0e6fd90c7 100644
--- a/apps/mobile/src/utils/transaction-guards.ts
+++ b/apps/mobile/src/utils/transaction-guards.ts
@@ -7,7 +7,7 @@ import {
   TransactionListItemType,
   TransactionTokenType,
   TransferDirection,
-} from '@/src/store/gateway/types'
+} from '@safe-global/store/gateway/types'
 import type {
   ModuleExecutionInfo,
   TransactionDetails,
@@ -28,9 +28,9 @@ import type {
   Transaction,
   CreationTransactionInfo,
   CustomTransactionInfo,
-} from '@/src/store/gateway/AUTO_GENERATED/transactions'
+} from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
 
-import { HistoryTransactionItems, PendingTransactionItems } from '@/src/store/gateway/types'
+import { HistoryTransactionItems, PendingTransactionItems } from '@safe-global/store/gateway/types'
 
 const TransactionStatus = {
   AWAITING_CONFIRMATIONS: 'AWAITING_CONFIRMATIONS',
diff --git a/apps/mobile/src/utils/transactions.tsx b/apps/mobile/src/utils/transactions.tsx
index f2ee46f00d..87c4e487d2 100644
--- a/apps/mobile/src/utils/transactions.tsx
+++ b/apps/mobile/src/utils/transactions.tsx
@@ -1,5 +1,5 @@
 import { GroupedTxs } from '@/src/features/TxHistory/utils'
-import { Transaction } from '@/src/store/gateway/AUTO_GENERATED/transactions'
+import { Transaction } from '@safe-global/store/gateway/AUTO_GENERATED/transactions'
 
 export const groupBulkTxs = <T extends { type: string; transaction?: Transaction }>(
   list: GroupedTxs<T>,
diff --git a/apps/mobile/tsconfig.json b/apps/mobile/tsconfig.json
index 6552a6d2f4..a4564769f3 100644
--- a/apps/mobile/tsconfig.json
+++ b/apps/mobile/tsconfig.json
@@ -3,7 +3,8 @@
   "compilerOptions": {
     "strict": true,
     "paths": {
-      "@/*": ["./*"]
+      "@/*": ["./*"],
+      "@safe-global/store/*": ["../../packages/store/src/*"]
     },
     "types": ["jest", "node"]
   },
diff --git a/config/jest-presets/package.json b/config/jest-presets/package.json
new file mode 100644
index 0000000000..0951149bd2
--- /dev/null
+++ b/config/jest-presets/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "@safe-global/jest-presets",
+  "version": "0.0.0",
+  "dependencies": {
+    "ts-jest": "29.2.5"
+  },
+  "devDependencies": {
+    "jest-transform-stub": "2.0.0"
+  },
+  "license": "MIT",
+  "private": true
+}
diff --git a/config/jest-presets/presets/jest-preset.js b/config/jest-presets/presets/jest-preset.js
new file mode 100644
index 0000000000..d1882045a6
--- /dev/null
+++ b/config/jest-presets/presets/jest-preset.js
@@ -0,0 +1,24 @@
+/** @type any */
+module.exports = {
+  preset: 'ts-jest',
+  moduleDirectories: ['node_modules', 'src'],
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'mjs', 'cjs', 'jsx', 'json', 'node', 'mp4'],
+  moduleNameMapper: {
+    '.+\\.(css|style|less|sass|scss|png|jpg|ttf|woff|woff2|mp4)$': 'jest-transform-stub',
+    // Jest by default doesn't support absolute imports out of the box
+    '^src/(.*)$': '<rootDir>/src/$1',
+  },
+  modulePathIgnorePatterns: ['<rootDir>/node_modules'],
+  testPathIgnorePatterns: ['<rootDir>/node_modules', '<rootDir>/dist', '<rootDir>/e2e'],
+  testMatch: ['<rootDir>/**/*.(spec|test).[jt]s?(x)'],
+  // setupFilesAfterEnv: ['<rootDir>/../../config/jest-presets/jest/setup.js'],
+
+  transformIgnorePatterns: [
+    'node_modules/(?!((jest-)?react-native|@react-native(-community)?)|expo(nent)?|@expo(nent)?/.*|@expo-google-fonts/.*|react-navigation|@react-navigation/.*|@sentry/react-native|native-base|react-native-svg|react-redux|moti/.*)',
+  ],
+  coverageDirectory: '<rootDir>/coverage',
+  coverageReporters: ['json', 'lcov', 'html'],
+  collectCoverageFrom: ['<rootDir>/packages/**/src/**/*.ts'],
+  collectCoverage: false, // turn it on when you want to collect coverage
+  clearMocks: true,
+}
diff --git a/config/tsconfig/confs/base.json b/config/tsconfig/confs/base.json
new file mode 100644
index 0000000000..4d2c701606
--- /dev/null
+++ b/config/tsconfig/confs/base.json
@@ -0,0 +1,41 @@
+{
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "compilerOptions": {
+    "paths": {
+      "@safe-global/store/*": ["packages/store/src/*"]
+    },
+    "importHelpers": true,
+    "allowJs": false,
+    "allowSyntheticDefaultImports": true,
+    "downlevelIteration": true,
+    "esModuleInterop": true,
+    "preserveSymlinks": true,
+    "incremental": true,
+    "module": "ESNext",
+    "moduleResolution": "node",
+    "forceConsistentCasingInFileNames": true,
+    "noEmitOnError": false,
+    "noImplicitAny": false,
+    "noImplicitReturns": false,
+    "noUnusedLocals": false,
+    "noUnusedParameters": false,
+    "experimentalDecorators": true,
+    "useUnknownInCatchVariables": false,
+    "preserveConstEnums": true,
+    "removeComments": false,
+    "strict": true,
+    "skipLibCheck": true,
+    "typeRoots": ["../../../node_modules/@types"],
+    "sourceMap": false,
+    "target": "ESNext",
+    "types": ["node", "jest"],
+    "jsx": "react-jsx",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "resolveJsonModule": true,
+    "plugins": []
+  },
+  "exclude": ["_"],
+  "typeAcquisition": {
+    "enable": true
+  }
+}
diff --git a/config/tsconfig/package.json b/config/tsconfig/package.json
new file mode 100644
index 0000000000..bc7928be8e
--- /dev/null
+++ b/config/tsconfig/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "@safe-global/tsconfig",
+  "version": "0.0.0",
+  "files": [
+    "confs/base.json"
+  ],
+  "private": true
+}
diff --git a/package.json b/package.json
index abfa424189..e8acbc3db5 100644
--- a/package.json
+++ b/package.json
@@ -4,17 +4,20 @@
   "version": "1.0.0",
   "workspaces": [
     "apps/*",
+    "config/*",
     "packages/*"
   ],
   "scripts": {
     "lint": "yarn workspaces foreach --all -pt run lint",
     "test": "yarn workspaces foreach --all -pt run test",
-    "prettier:fix": "yarn workspaces foreach --all -pt run prettier:fix",
-    "eslint": "yarn workspaces foreach --all -pt run eslint"
+    "eslint": "yarn workspaces foreach --all -pt run eslint",
+    "prettier": "prettier --check \"**/*.{js,jsx,ts,tsx,json,md}\"",
+    "prettier:fix": "prettier --write \"**/*.{js,jsx,ts,tsx,json,md}\""
   },
   "devDependencies": {
     "husky": "^9.1.6",
-    "lint-staged": "^15.2.10"
+    "lint-staged": "^15.2.10",
+    "prettier": "^3.4.2"
   },
   "packageManager": "yarn@4.5.3"
 }
diff --git a/packages/store/README.md b/packages/store/README.md
new file mode 100644
index 0000000000..72435794cb
--- /dev/null
+++ b/packages/store/README.md
@@ -0,0 +1,39 @@
+# @safe-global/store
+
+This is a utility package that deals with the state management of the application. It uses the [Redux Toolkit](https://redux-toolkit.js.org/) to manage the state of the application.
+
+## Usage
+
+The use the generated API you first need to initialiize the baseURL of the API.
+
+```typescript
+import { setBaseUrl } from '@safe-global/store'
+
+setBaseUrl('YOUR_API_BASE_URL')
+```
+
+## Automatic code generation from the Client's Gateway OpenAPI
+
+This package includes a script to generate the necessary boilerplate API code from the Client-Gateway(CGW)'s OpenAPI specification using @rtk-query/codegen-openapi.
+
+## Prerequisites
+
+1. You've initialized the monorepo and installed all dependencies.
+2. The openapi-config.ts file is correctly configured in this package with your OpenAPI specification details.
+3. You've updated the scripts/api-schema/schema.json file with the latest OpenAPI specification.
+
+> [!NOTE]
+> To get the latest OpenAPI schema look at the output from the `/api-json` endpoint of the CGW.
+
+## Running the Code Generation Script
+
+From the mono-repo root directory, run the following command:
+
+```bash
+yarn workspace @safe-global/store generate-api
+```
+
+This will:
+
+- Use the configuration provided in the openapi-config.ts file.
+- Gerate the API code using @rtk-query/codegen-openapi.
diff --git a/packages/store/jest.config.js b/packages/store/jest.config.js
new file mode 100644
index 0000000000..943377aaf3
--- /dev/null
+++ b/packages/store/jest.config.js
@@ -0,0 +1,5 @@
+const preset = require('../../config/jest-presets/presets/jest-preset')
+
+module.exports = {
+  ...preset,
+}
diff --git a/packages/store/package.json b/packages/store/package.json
new file mode 100644
index 0000000000..e1ed003e57
--- /dev/null
+++ b/packages/store/package.json
@@ -0,0 +1,13 @@
+{
+  "private": true,
+  "name": "@safe-global/store",
+  "version": "1.0.0",
+  "scripts": {
+    "test": "jest",
+    "api-generate": " npx @rtk-query/codegen-openapi scripts/openapi-config.ts"
+  },
+  "devDependencies": {
+    "@types/jest": "^29.5.14",
+    "jest": "^29.7.0"
+  }
+}
diff --git a/apps/mobile/src/store/gateway/api-schema/schema.json b/packages/store/scripts/api-schema/schema.json
similarity index 100%
rename from apps/mobile/src/store/gateway/api-schema/schema.json
rename to packages/store/scripts/api-schema/schema.json
diff --git a/packages/store/scripts/openapi-config.ts b/packages/store/scripts/openapi-config.ts
new file mode 100644
index 0000000000..fd213327cb
--- /dev/null
+++ b/packages/store/scripts/openapi-config.ts
@@ -0,0 +1,73 @@
+import type { ConfigFile } from '@rtk-query/codegen-openapi'
+
+const config: ConfigFile = {
+  schemaFile: './api-schema/schema.json',
+  prettierConfigFile: '../../../.prettierrc',
+  apiFile: '../src/gateway/cgwClient.ts',
+  apiImport: 'cgwClient',
+  exportName: 'cgwApi',
+  hooks: true,
+  filterEndpoints: [/^(?!.*delegates).*/],
+  tag: true,
+  outputFiles: {
+    '../src/gateway/AUTO_GENERATED/about.ts': {
+      filterEndpoints: [/^about/],
+    },
+    '../src/gateway/AUTO_GENERATED/accounts.ts': {
+      filterEndpoints: [/^accounts/],
+    },
+    '../src/gateway/AUTO_GENERATED/auth.ts': {
+      filterEndpoints: [/^auth/],
+    },
+    '../src/gateway/AUTO_GENERATED/balances.ts': {
+      filterEndpoints: [/^balances/],
+    },
+    '../src/gateway/AUTO_GENERATED/chains.ts': {
+      filterEndpoints: [/^chains/],
+    },
+    '../src/gateway/AUTO_GENERATED/collectibles.ts': {
+      filterEndpoints: [/^collectibles/],
+    },
+    '../src/gateway/AUTO_GENERATED/community.ts': {
+      filterEndpoints: [/^community/],
+    },
+    '../src/gateway/AUTO_GENERATED/contracts.ts': {
+      filterEndpoints: [/^contracts/],
+    },
+    '../src/gateway/AUTO_GENERATED/data-decoded.ts': {
+      filterEndpoints: [/^dataDecoded/],
+    },
+    '../src/gateway/AUTO_GENERATED/delegates.ts': {
+      filterEndpoints: [/^delegates(?!DeleteSafeDelegateV1)/],
+    },
+    '../src/gateway/AUTO_GENERATED/estimations.ts': {
+      filterEndpoints: [/^estimations/],
+    },
+    '../src/gateway/AUTO_GENERATED/messages.ts': {
+      filterEndpoints: [/^messages/],
+    },
+    '../src/gateway/AUTO_GENERATED/notifications.ts': {
+      filterEndpoints: [/^notifications/],
+    },
+    '../src/gateway/AUTO_GENERATED/owners.ts': {
+      filterEndpoints: [/^owners/],
+    },
+    '../src/gateway/AUTO_GENERATED/relay.ts': {
+      filterEndpoints: [/^relay/],
+    },
+    '../src/gateway/AUTO_GENERATED/safe-apps.ts': {
+      filterEndpoints: [/^safeApps/],
+    },
+    '../src/gateway/AUTO_GENERATED/safes.ts': {
+      filterEndpoints: [/^safes/],
+    },
+    '../src/gateway/AUTO_GENERATED/targeted-messages.ts': {
+      filterEndpoints: [/^targetedMessaging/],
+    },
+    '../src/gateway/AUTO_GENERATED/transactions.ts': {
+      filterEndpoints: [/^transactions/],
+    },
+  },
+}
+
+export default config
diff --git a/apps/mobile/src/store/gateway/AUTO_GENERATED/about.ts b/packages/store/src/gateway/AUTO_GENERATED/about.ts
similarity index 100%
rename from apps/mobile/src/store/gateway/AUTO_GENERATED/about.ts
rename to packages/store/src/gateway/AUTO_GENERATED/about.ts
diff --git a/apps/mobile/src/store/gateway/AUTO_GENERATED/accounts.ts b/packages/store/src/gateway/AUTO_GENERATED/accounts.ts
similarity index 100%
rename from apps/mobile/src/store/gateway/AUTO_GENERATED/accounts.ts
rename to packages/store/src/gateway/AUTO_GENERATED/accounts.ts
diff --git a/apps/mobile/src/store/gateway/AUTO_GENERATED/auth.ts b/packages/store/src/gateway/AUTO_GENERATED/auth.ts
similarity index 100%
rename from apps/mobile/src/store/gateway/AUTO_GENERATED/auth.ts
rename to packages/store/src/gateway/AUTO_GENERATED/auth.ts
diff --git a/apps/mobile/src/store/gateway/AUTO_GENERATED/balances.ts b/packages/store/src/gateway/AUTO_GENERATED/balances.ts
similarity index 100%
rename from apps/mobile/src/store/gateway/AUTO_GENERATED/balances.ts
rename to packages/store/src/gateway/AUTO_GENERATED/balances.ts
diff --git a/apps/mobile/src/store/gateway/AUTO_GENERATED/chains.ts b/packages/store/src/gateway/AUTO_GENERATED/chains.ts
similarity index 100%
rename from apps/mobile/src/store/gateway/AUTO_GENERATED/chains.ts
rename to packages/store/src/gateway/AUTO_GENERATED/chains.ts
diff --git a/apps/mobile/src/store/gateway/AUTO_GENERATED/collectibles.ts b/packages/store/src/gateway/AUTO_GENERATED/collectibles.ts
similarity index 100%
rename from apps/mobile/src/store/gateway/AUTO_GENERATED/collectibles.ts
rename to packages/store/src/gateway/AUTO_GENERATED/collectibles.ts
diff --git a/apps/mobile/src/store/gateway/AUTO_GENERATED/community.ts b/packages/store/src/gateway/AUTO_GENERATED/community.ts
similarity index 100%
rename from apps/mobile/src/store/gateway/AUTO_GENERATED/community.ts
rename to packages/store/src/gateway/AUTO_GENERATED/community.ts
diff --git a/apps/mobile/src/store/gateway/AUTO_GENERATED/contracts.ts b/packages/store/src/gateway/AUTO_GENERATED/contracts.ts
similarity index 100%
rename from apps/mobile/src/store/gateway/AUTO_GENERATED/contracts.ts
rename to packages/store/src/gateway/AUTO_GENERATED/contracts.ts
diff --git a/apps/mobile/src/store/gateway/AUTO_GENERATED/data-decoded.ts b/packages/store/src/gateway/AUTO_GENERATED/data-decoded.ts
similarity index 100%
rename from apps/mobile/src/store/gateway/AUTO_GENERATED/data-decoded.ts
rename to packages/store/src/gateway/AUTO_GENERATED/data-decoded.ts
diff --git a/apps/mobile/src/store/gateway/AUTO_GENERATED/delegates.ts b/packages/store/src/gateway/AUTO_GENERATED/delegates.ts
similarity index 100%
rename from apps/mobile/src/store/gateway/AUTO_GENERATED/delegates.ts
rename to packages/store/src/gateway/AUTO_GENERATED/delegates.ts
diff --git a/apps/mobile/src/store/gateway/AUTO_GENERATED/estimations.ts b/packages/store/src/gateway/AUTO_GENERATED/estimations.ts
similarity index 100%
rename from apps/mobile/src/store/gateway/AUTO_GENERATED/estimations.ts
rename to packages/store/src/gateway/AUTO_GENERATED/estimations.ts
diff --git a/apps/mobile/src/store/gateway/AUTO_GENERATED/messages.ts b/packages/store/src/gateway/AUTO_GENERATED/messages.ts
similarity index 100%
rename from apps/mobile/src/store/gateway/AUTO_GENERATED/messages.ts
rename to packages/store/src/gateway/AUTO_GENERATED/messages.ts
diff --git a/apps/mobile/src/store/gateway/AUTO_GENERATED/notifications.ts b/packages/store/src/gateway/AUTO_GENERATED/notifications.ts
similarity index 100%
rename from apps/mobile/src/store/gateway/AUTO_GENERATED/notifications.ts
rename to packages/store/src/gateway/AUTO_GENERATED/notifications.ts
diff --git a/apps/mobile/src/store/gateway/AUTO_GENERATED/owners.ts b/packages/store/src/gateway/AUTO_GENERATED/owners.ts
similarity index 100%
rename from apps/mobile/src/store/gateway/AUTO_GENERATED/owners.ts
rename to packages/store/src/gateway/AUTO_GENERATED/owners.ts
diff --git a/apps/mobile/src/store/gateway/AUTO_GENERATED/relay.ts b/packages/store/src/gateway/AUTO_GENERATED/relay.ts
similarity index 100%
rename from apps/mobile/src/store/gateway/AUTO_GENERATED/relay.ts
rename to packages/store/src/gateway/AUTO_GENERATED/relay.ts
diff --git a/apps/mobile/src/store/gateway/AUTO_GENERATED/safe-apps.ts b/packages/store/src/gateway/AUTO_GENERATED/safe-apps.ts
similarity index 100%
rename from apps/mobile/src/store/gateway/AUTO_GENERATED/safe-apps.ts
rename to packages/store/src/gateway/AUTO_GENERATED/safe-apps.ts
diff --git a/apps/mobile/src/store/gateway/AUTO_GENERATED/safes.ts b/packages/store/src/gateway/AUTO_GENERATED/safes.ts
similarity index 100%
rename from apps/mobile/src/store/gateway/AUTO_GENERATED/safes.ts
rename to packages/store/src/gateway/AUTO_GENERATED/safes.ts
diff --git a/apps/mobile/src/store/gateway/AUTO_GENERATED/targeted-messages.ts b/packages/store/src/gateway/AUTO_GENERATED/targeted-messages.ts
similarity index 100%
rename from apps/mobile/src/store/gateway/AUTO_GENERATED/targeted-messages.ts
rename to packages/store/src/gateway/AUTO_GENERATED/targeted-messages.ts
diff --git a/apps/mobile/src/store/gateway/AUTO_GENERATED/transactions.ts b/packages/store/src/gateway/AUTO_GENERATED/transactions.ts
similarity index 100%
rename from apps/mobile/src/store/gateway/AUTO_GENERATED/transactions.ts
rename to packages/store/src/gateway/AUTO_GENERATED/transactions.ts
diff --git a/packages/store/src/gateway/cgwClient.test.ts b/packages/store/src/gateway/cgwClient.test.ts
new file mode 100644
index 0000000000..4b4b12aa53
--- /dev/null
+++ b/packages/store/src/gateway/cgwClient.test.ts
@@ -0,0 +1,67 @@
+import type { FetchArgs, BaseQueryApi } from '@reduxjs/toolkit/query/react'
+
+describe('dynamicBaseQuery', () => {
+  const api: BaseQueryApi = {
+    dispatch: jest.fn(),
+    getState: jest.fn(),
+    abort: jest.fn(),
+    signal: new AbortController().signal,
+    extra: {},
+    endpoint: 'testEndpoint',
+    type: 'query',
+  }
+
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
+  it('throws an error if baseUrl is not set', async () => {
+    jest.isolateModules(async () => {
+      const { dynamicBaseQuery } = await import('./cgwClient')
+      // Note: We do NOT set baseUrl here, so it remains null by default.
+      await expect(dynamicBaseQuery('/test', api, {})).rejects.toThrow(
+        'baseUrl not set. Call setBaseUrl before using the cgwClient',
+      )
+    })
+  })
+
+  it('calls rawBaseQuery with correct url when baseUrl is set and args is a string', async () => {
+    jest.isolateModules(async () => {
+      // Re-import a fresh instance of the module
+      const { dynamicBaseQuery, setBaseUrl, rawBaseQuery } = await import('./cgwClient')
+      // Mock rawBaseQuery
+      const mockRawBaseQuery = jest.fn().mockResolvedValue({ data: 'stringResult' })
+      Object.assign(rawBaseQuery, mockRawBaseQuery)
+
+      // Set the baseUrl
+      setBaseUrl('http://example.com')
+
+      const result = await dynamicBaseQuery('/test', api, {})
+
+      expect(mockRawBaseQuery).toHaveBeenCalledWith('http://example.com//test', api)
+      expect(result).toEqual({ data: 'stringResult' })
+    })
+  })
+
+  it('calls rawBaseQuery with correct url when baseUrl is set and args is FetchArgs', async () => {
+    jest.isolateModules(async () => {
+      const { dynamicBaseQuery, setBaseUrl, rawBaseQuery } = await import('./cgwClient')
+      const mockRawBaseQuery = jest.fn().mockResolvedValue({ data: 'objectResult' })
+      Object.assign(rawBaseQuery, mockRawBaseQuery)
+
+      setBaseUrl('http://example.com')
+
+      const args: FetchArgs = { url: 'endpoint', method: 'POST', body: { hello: 'world' } }
+      const extraOptions = { credentials: 'include' }
+
+      const result = await dynamicBaseQuery(args, api, extraOptions)
+
+      expect(mockRawBaseQuery).toHaveBeenCalledWith(
+        { url: 'http://example.com//endpoint', method: 'POST', body: { hello: 'world' } },
+        api,
+        extraOptions,
+      )
+      expect(result).toEqual({ data: 'objectResult' })
+    })
+  })
+})
diff --git a/packages/store/src/gateway/cgwClient.ts b/packages/store/src/gateway/cgwClient.ts
new file mode 100644
index 0000000000..7414d044b5
--- /dev/null
+++ b/packages/store/src/gateway/cgwClient.ts
@@ -0,0 +1,37 @@
+import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react'
+import type { BaseQueryFn, FetchArgs, FetchBaseQueryError } from '@reduxjs/toolkit/query/react'
+
+let baseUrl: null | string = null
+export const setBaseUrl = (url: string) => {
+  baseUrl = url
+}
+
+export const getBaseUrl = () => {
+  return baseUrl
+}
+export const rawBaseQuery = fetchBaseQuery({
+  baseUrl: '/',
+})
+
+export const dynamicBaseQuery: BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError> = async (
+  args,
+  api,
+  extraOptions,
+) => {
+  const resolvedBaseUrl = getBaseUrl()
+
+  if (!resolvedBaseUrl) {
+    throw new Error('baseUrl not set. Call setBaseUrl before using the cgwClient')
+  }
+
+  const urlEnd = typeof args === 'string' ? args : args.url
+  const adjustedUrl = `${resolvedBaseUrl}/${urlEnd}`
+  const adjustedArgs = typeof args === 'string' ? adjustedUrl : { ...args, url: adjustedUrl }
+
+  return rawBaseQuery(adjustedArgs, api, extraOptions)
+}
+
+export const cgwClient = createApi({
+  baseQuery: dynamicBaseQuery,
+  endpoints: () => ({}),
+})
diff --git a/apps/mobile/src/store/gateway/chains/index.ts b/packages/store/src/gateway/chains/index.ts
similarity index 56%
rename from apps/mobile/src/store/gateway/chains/index.ts
rename to packages/store/src/gateway/chains/index.ts
index da8ada79b3..2316641354 100644
--- a/apps/mobile/src/store/gateway/chains/index.ts
+++ b/packages/store/src/gateway/chains/index.ts
@@ -1,15 +1,13 @@
-import { type Chain as ChainInfo } from '@/src/store/gateway/AUTO_GENERATED/chains'
-import { GATEWAY_URL } from '@/src/config/constants'
+import { type Chain as ChainInfo } from '../AUTO_GENERATED/chains'
 import { createEntityAdapter, createSelector, EntityState } from '@reduxjs/toolkit'
-import { RootState } from '../..'
-import { cgwClient } from '@/src/store/gateway/cgwClient'
+import { cgwClient, getBaseUrl } from '../cgwClient'
 import { QueryReturnValue, FetchBaseQueryError, FetchBaseQueryMeta } from '@reduxjs/toolkit/dist/query'
 
-const chainsAdapter = createEntityAdapter<ChainInfo, string>({ selectId: (chain: ChainInfo) => chain.chainId })
-const initialState = chainsAdapter.getInitialState()
+export const chainsAdapter = createEntityAdapter<ChainInfo, string>({ selectId: (chain: ChainInfo) => chain.chainId })
+export const initialState = chainsAdapter.getInitialState()
 
 const getChainsConfigs = async (
-  url = `${GATEWAY_URL}/v1/chains`,
+  url = `${getBaseUrl()}/v1/chains`,
   results: ChainInfo[] = [],
 ): Promise<EntityState<ChainInfo, string>> => {
   const response = await fetch(url)
@@ -48,15 +46,3 @@ export const apiSliceWithChainsConfig = cgwClient.injectEndpoints({
   }),
   overrideExisting: true,
 })
-
-const selectChainsResult = apiSliceWithChainsConfig.endpoints.getChainsConfig.select()
-
-const selectChainsData = createSelector(selectChainsResult, (result) => {
-  return result.data ?? initialState
-})
-
-const { selectAll: selectAllChains, selectById } = chainsAdapter.getSelectors(selectChainsData)
-
-export const selectChainById = (state: RootState, chainId: string) => selectById(state, chainId)
-export const { useGetChainsConfigQuery } = apiSliceWithChainsConfig
-export { selectAllChains }
diff --git a/apps/mobile/src/store/gateway/index.ts b/packages/store/src/gateway/index.ts
similarity index 100%
rename from apps/mobile/src/store/gateway/index.ts
rename to packages/store/src/gateway/index.ts
diff --git a/apps/mobile/src/store/gateway/types.ts b/packages/store/src/gateway/types.ts
similarity index 97%
rename from apps/mobile/src/store/gateway/types.ts
rename to packages/store/src/gateway/types.ts
index 436e89bf9f..3e0758e0a7 100644
--- a/apps/mobile/src/store/gateway/types.ts
+++ b/packages/store/src/gateway/types.ts
@@ -7,7 +7,7 @@ import {
   SwapTransferTransactionInfo,
   ModuleExecutionInfo,
   MultisigExecutionInfo,
-} from '@/src/store/gateway/AUTO_GENERATED/transactions'
+} from './AUTO_GENERATED/transactions'
 import { SafeOverview } from './AUTO_GENERATED/safes'
 
 export type ExecutionInfo = ModuleExecutionInfo | MultisigExecutionInfo
diff --git a/packages/store/src/index.ts b/packages/store/src/index.ts
new file mode 100644
index 0000000000..c1b461c27d
--- /dev/null
+++ b/packages/store/src/index.ts
@@ -0,0 +1,3 @@
+import { setBaseUrl, cgwClient } from '@safe-global/store/src/gateway/cgwClient'
+
+export { setBaseUrl, cgwClient }
diff --git a/packages/store/tsconfig.json b/packages/store/tsconfig.json
new file mode 100644
index 0000000000..c31f8ba2f2
--- /dev/null
+++ b/packages/store/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../config/tsconfig/confs/base.json",
+  "compilerOptions": {
+    "rootDir": "./"
+  },
+  "include": ["**/*.ts"]
+}
diff --git a/yarn.lock b/yarn.lock
index c2795612da..a3a943326b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3693,6 +3693,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@safe-global/jest-presets@workspace:config/jest-presets":
+  version: 0.0.0-use.local
+  resolution: "@safe-global/jest-presets@workspace:config/jest-presets"
+  dependencies:
+    jest-transform-stub: "npm:2.0.0"
+    ts-jest: "npm:29.2.5"
+  languageName: unknown
+  linkType: soft
+
 "@safe-global/mobile@workspace:apps/mobile":
   version: 0.0.0-use.local
   resolution: "@safe-global/mobile@workspace:apps/mobile"
@@ -3716,6 +3725,7 @@ __metadata:
     "@react-navigation/native": "npm:^7.0.0"
     "@reduxjs/toolkit": "npm:^2.4.0"
     "@rtk-query/codegen-openapi": "npm:^2.0.0"
+    "@safe-global/store": "workspace:^"
     "@storybook/addon-essentials": "npm:^8.4.6"
     "@storybook/addon-interactions": "npm:^8.4.6"
     "@storybook/addon-onboarding": "npm:^8.4.6"
@@ -3768,7 +3778,6 @@ __metadata:
     jest-expo: "npm:~52.0.2"
     lodash: "npm:^4.17.21"
     moti: "npm:^0.29.0"
-    prettier: "npm:3.3.3"
     react: "npm:18.3.1"
     react-dom: "npm:^18.3.1"
     react-native: "npm:0.76.3"
@@ -3801,6 +3810,22 @@ __metadata:
   dependencies:
     husky: "npm:^9.1.6"
     lint-staged: "npm:^15.2.10"
+    prettier: "npm:^3.4.2"
+  languageName: unknown
+  linkType: soft
+
+"@safe-global/store@workspace:^, @safe-global/store@workspace:packages/store":
+  version: 0.0.0-use.local
+  resolution: "@safe-global/store@workspace:packages/store"
+  dependencies:
+    "@types/jest": "npm:^29.5.14"
+    jest: "npm:^29.7.0"
+  languageName: unknown
+  linkType: soft
+
+"@safe-global/tsconfig@workspace:config/tsconfig":
+  version: 0.0.0-use.local
+  resolution: "@safe-global/tsconfig@workspace:config/tsconfig"
   languageName: unknown
   linkType: soft
 
@@ -6313,7 +6338,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/jest@npm:^29.5.12":
+"@types/jest@npm:^29.5.12, @types/jest@npm:^29.5.14":
   version: 29.5.14
   resolution: "@types/jest@npm:29.5.14"
   dependencies:
@@ -7394,6 +7419,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"async@npm:^3.2.3":
+  version: 3.2.6
+  resolution: "async@npm:3.2.6"
+  checksum: 10/cb6e0561a3c01c4b56a799cc8bab6ea5fef45f069ab32500b6e19508db270ef2dffa55e5aed5865c5526e9907b1f8be61b27530823b411ffafb5e1538c86c368
+  languageName: node
+  linkType: hard
+
 "asynckit@npm:^0.4.0":
   version: 0.4.0
   resolution: "asynckit@npm:0.4.0"
@@ -7793,6 +7825,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bs-logger@npm:^0.2.6":
+  version: 0.2.6
+  resolution: "bs-logger@npm:0.2.6"
+  dependencies:
+    fast-json-stable-stringify: "npm:2.x"
+  checksum: 10/e6d3ff82698bb3f20ce64fb85355c5716a3cf267f3977abe93bf9c32a2e46186b253f48a028ae5b96ab42bacd2c826766d9ae8cf6892f9b944656be9113cf212
+  languageName: node
+  linkType: hard
+
 "bser@npm:2.1.1":
   version: 2.1.1
   resolution: "bser@npm:2.1.1"
@@ -8049,7 +8090,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chalk@npm:^4.0.0, chalk@npm:^4.1.0, chalk@npm:^4.1.2":
+"chalk@npm:^4.0.0, chalk@npm:^4.0.2, chalk@npm:^4.1.0, chalk@npm:^4.1.2":
   version: 4.1.2
   resolution: "chalk@npm:4.1.2"
   dependencies:
@@ -9269,6 +9310,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ejs@npm:^3.1.10":
+  version: 3.1.10
+  resolution: "ejs@npm:3.1.10"
+  dependencies:
+    jake: "npm:^10.8.5"
+  bin:
+    ejs: bin/cli.js
+  checksum: 10/a9cb7d7cd13b7b1cd0be5c4788e44dd10d92f7285d2f65b942f33e127230c054f99a42db4d99f766d8dbc6c57e94799593ee66a14efd7c8dd70c4812bf6aa384
+  languageName: node
+  linkType: hard
+
 "electron-to-chromium@npm:^1.5.41":
   version: 1.5.71
   resolution: "electron-to-chromium@npm:1.5.71"
@@ -10450,7 +10502,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-json-stable-stringify@npm:^2.0.0, fast-json-stable-stringify@npm:^2.1.0":
+"fast-json-stable-stringify@npm:2.x, fast-json-stable-stringify@npm:^2.0.0, fast-json-stable-stringify@npm:^2.1.0":
   version: 2.1.0
   resolution: "fast-json-stable-stringify@npm:2.1.0"
   checksum: 10/2c20055c1fa43c922428f16ca8bb29f2807de63e5c851f665f7ac9790176c01c3b40335257736b299764a8d383388dabc73c8083b8e1bc3d99f0a941444ec60e
@@ -10550,6 +10602,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"filelist@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "filelist@npm:1.0.4"
+  dependencies:
+    minimatch: "npm:^5.0.1"
+  checksum: 10/4b436fa944b1508b95cffdfc8176ae6947b92825483639ef1b9a89b27d82f3f8aa22b21eed471993f92709b431670d4e015b39c087d435a61e1bb04564cf51de
+  languageName: node
+  linkType: hard
+
 "fill-range@npm:^7.1.1":
   version: 7.1.1
   resolution: "fill-range@npm:7.1.1"
@@ -12363,6 +12424,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jake@npm:^10.8.5":
+  version: 10.9.2
+  resolution: "jake@npm:10.9.2"
+  dependencies:
+    async: "npm:^3.2.3"
+    chalk: "npm:^4.0.2"
+    filelist: "npm:^1.0.4"
+    minimatch: "npm:^3.1.2"
+  bin:
+    jake: bin/cli.js
+  checksum: 10/3be324708f99f031e0aec49ef8fd872eb4583cbe8a29a0c875f554f6ac638ee4ea5aa759bb63723fd54f77ca6d7db851eaa78353301734ed3700db9cb109a0cd
+  languageName: node
+  linkType: hard
+
 "jest-changed-files@npm:^29.7.0":
   version: 29.7.0
   resolution: "jest-changed-files@npm:29.7.0"
@@ -12778,7 +12853,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-util@npm:^29.7.0":
+"jest-transform-stub@npm:2.0.0":
+  version: 2.0.0
+  resolution: "jest-transform-stub@npm:2.0.0"
+  checksum: 10/c46134257e5fb047f5952e4a4a1339925dd009da15aa8d3310ba1d3e4d22266ed6c675cd18e58c9d5ca2246718d6cc8ff00ea6a4b6f3b2a6b285b6426f6ae8fe
+  languageName: node
+  linkType: hard
+
+"jest-util@npm:^29.0.0, jest-util@npm:^29.7.0":
   version: 29.7.0
   resolution: "jest-util@npm:29.7.0"
   dependencies:
@@ -13429,6 +13511,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lodash.memoize@npm:^4.1.2":
+  version: 4.1.2
+  resolution: "lodash.memoize@npm:4.1.2"
+  checksum: 10/192b2168f310c86f303580b53acf81ab029761b9bd9caa9506a019ffea5f3363ea98d7e39e7e11e6b9917066c9d36a09a11f6fe16f812326390d8f3a54a1a6da
+  languageName: node
+  linkType: hard
+
 "lodash.merge@npm:^4.6.2":
   version: 4.6.2
   resolution: "lodash.merge@npm:4.6.2"
@@ -13584,7 +13673,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"make-error@npm:^1.1.1":
+"make-error@npm:^1.1.1, make-error@npm:^1.3.6":
   version: 1.3.6
   resolution: "make-error@npm:1.3.6"
   checksum: 10/b86e5e0e25f7f777b77fabd8e2cbf15737972869d852a22b7e73c17623928fccb826d8e46b9951501d3f20e51ad74ba8c59ed584f610526a48f8ccf88aaec402
@@ -14070,6 +14159,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"minimatch@npm:^5.0.1":
+  version: 5.1.6
+  resolution: "minimatch@npm:5.1.6"
+  dependencies:
+    brace-expansion: "npm:^2.0.1"
+  checksum: 10/126b36485b821daf96d33b5c821dac600cc1ab36c87e7a532594f9b1652b1fa89a1eebcaad4dff17c764dce1a7ac1531327f190fed5f97d8f6e5f889c116c429
+  languageName: node
+  linkType: hard
+
 "minimatch@npm:^9.0.4":
   version: 9.0.5
   resolution: "minimatch@npm:9.0.5"
@@ -15373,15 +15471,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:3.3.3":
-  version: 3.3.3
-  resolution: "prettier@npm:3.3.3"
-  bin:
-    prettier: bin/prettier.cjs
-  checksum: 10/5beac1f30b5b40162532b8e2f7c3a4eb650910a2695e9c8512a62ffdc09dae93190c29db9107fa7f26d1b6c71aad3628ecb9b5de1ecb0911191099be109434d7
-  languageName: node
-  linkType: hard
-
 "prettier@npm:^2.4.1":
   version: 2.8.8
   resolution: "prettier@npm:2.8.8"
@@ -15391,7 +15480,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:^3.2.5":
+"prettier@npm:^3.2.5, prettier@npm:^3.4.2":
   version: 3.4.2
   resolution: "prettier@npm:3.4.2"
   bin:
@@ -16849,7 +16938,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:^7.1.3, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.1, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0, semver@npm:^7.6.2, semver@npm:~7.6.3":
+"semver@npm:^7.1.3, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.1, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0, semver@npm:^7.6.2, semver@npm:^7.6.3, semver@npm:~7.6.3":
   version: 7.6.3
   resolution: "semver@npm:7.6.3"
   bin:
@@ -18293,6 +18382,43 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ts-jest@npm:29.2.5":
+  version: 29.2.5
+  resolution: "ts-jest@npm:29.2.5"
+  dependencies:
+    bs-logger: "npm:^0.2.6"
+    ejs: "npm:^3.1.10"
+    fast-json-stable-stringify: "npm:^2.1.0"
+    jest-util: "npm:^29.0.0"
+    json5: "npm:^2.2.3"
+    lodash.memoize: "npm:^4.1.2"
+    make-error: "npm:^1.3.6"
+    semver: "npm:^7.6.3"
+    yargs-parser: "npm:^21.1.1"
+  peerDependencies:
+    "@babel/core": ">=7.0.0-beta.0 <8"
+    "@jest/transform": ^29.0.0
+    "@jest/types": ^29.0.0
+    babel-jest: ^29.0.0
+    jest: ^29.0.0
+    typescript: ">=4.3 <6"
+  peerDependenciesMeta:
+    "@babel/core":
+      optional: true
+    "@jest/transform":
+      optional: true
+    "@jest/types":
+      optional: true
+    babel-jest:
+      optional: true
+    esbuild:
+      optional: true
+  bin:
+    ts-jest: cli.js
+  checksum: 10/f89e562816861ec4510840a6b439be6145f688b999679328de8080dc8e66481325fc5879519b662163e33b7578f35243071c38beb761af34e5fe58e3e326a958
+  languageName: node
+  linkType: hard
+
 "ts-node@npm:^10.9.2":
   version: 10.9.2
   resolution: "ts-node@npm:10.9.2"