diff --git a/.github/workflows/store-codegen-drift.yml b/.github/workflows/store-codegen-drift.yml
index 66f916ecff..c0788fba85 100644
--- a/.github/workflows/store-codegen-drift.yml
+++ b/.github/workflows/store-codegen-drift.yml
@@ -31,6 +31,7 @@ jobs:
 
       - name: Open or update drift issue
         if: failure() && steps.drift.outcome == 'failure'
+        continue-on-error: true
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
@@ -78,6 +79,7 @@ jobs:
 
       - name: Close drift issue on success
         if: success()
+        continue-on-error: true
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
diff --git a/packages/store/scripts/api-schema/schema.json b/packages/store/scripts/api-schema/schema.json
index a68d4deaf6..2d2f76f15a 100644
--- a/packages/store/scripts/api-schema/schema.json
+++ b/packages/store/scripts/api-schema/schema.json
@@ -343,6 +343,239 @@
         ]
       }
     },
+    "/v1/billing/spaces/{spaceId}/subscriptions": {
+      "get": {
+        "operationId": "billingGetSubscriptionsV1",
+        "parameters": [
+          {
+            "name": "status",
+            "required": false,
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "spaceId",
+            "required": true,
+            "in": "path",
+            "description": "Space UUID",
+            "schema": {
+              "example": "123e4567-e89b-12d3-a456-426614174000",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/Subscription"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "summary": "Get a space subscriptions",
+        "tags": [
+          "billing"
+        ]
+      }
+    },
+    "/v1/billing/plans/{planId}": {
+      "get": {
+        "operationId": "billingGetPlanV1",
+        "parameters": [
+          {
+            "name": "planId",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Plan"
+                }
+              }
+            }
+          }
+        },
+        "summary": "Get a plan by id",
+        "tags": [
+          "billing"
+        ]
+      }
+    },
+    "/v1/billing/spaces/{spaceId}/session-url": {
+      "get": {
+        "operationId": "billingGetSessionUrlV1",
+        "parameters": [
+          {
+            "name": "returnUrl",
+            "required": true,
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "spaceId",
+            "required": true,
+            "in": "path",
+            "description": "Space UUID",
+            "schema": {
+              "example": "123e4567-e89b-12d3-a456-426614174000",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UrlResponse"
+                }
+              }
+            }
+          }
+        },
+        "summary": "Get the billing portal session URL for a space",
+        "tags": [
+          "billing"
+        ]
+      }
+    },
+    "/v1/billing/spaces/{spaceId}/payment-links": {
+      "get": {
+        "operationId": "billingGetSpacePaymentLinksV1",
+        "parameters": [
+          {
+            "name": "spaceId",
+            "required": true,
+            "in": "path",
+            "description": "Space UUID",
+            "schema": {
+              "example": "123e4567-e89b-12d3-a456-426614174000",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/PaymentLink"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "summary": "Get payment links for a space, plus the general catalog",
+        "tags": [
+          "billing"
+        ]
+      }
+    },
+    "/v1/billing/spaces/{spaceId}/payment-links/{paymentLinkId}/checkout-url": {
+      "get": {
+        "operationId": "billingGetCheckoutUrlV1",
+        "parameters": [
+          {
+            "name": "paymentLinkId",
+            "required": true,
+            "in": "path",
+            "description": "Payment link identifier",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "returnUrl",
+            "required": true,
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "spaceId",
+            "required": true,
+            "in": "path",
+            "description": "Space UUID",
+            "schema": {
+              "example": "123e4567-e89b-12d3-a456-426614174000",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/CheckoutSessionResult"
+                }
+              }
+            }
+          }
+        },
+        "summary": "Create a checkout session for a payment link",
+        "tags": [
+          "billing"
+        ]
+      }
+    },
+    "/v1/billing/sessions/{sessionId}": {
+      "get": {
+        "operationId": "billingGetCheckoutSessionV1",
+        "parameters": [
+          {
+            "name": "sessionId",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/CheckoutSession"
+                }
+              }
+            }
+          }
+        },
+        "summary": "Get a checkout session by id",
+        "tags": [
+          "billing"
+        ]
+      }
+    },
     "/v1/chains/{chainId}/safes/{safeAddress}/positions/{fiatCode}": {
       "get": {
         "operationId": "positionsGetPositionsV1",
@@ -495,7 +728,7 @@
         ]
       },
       "delete": {
-        "description": "Clears the cached portfolio data for a specific address",
+        "description": "Clears all cached Zerion portfolio data (overview, portfolio, positions) for a specific address",
         "operationId": "portfolioClearPortfolioV1",
         "parameters": [
           {
@@ -1480,7 +1713,7 @@
     },
     "/v1/chains/{chainId}/fees/{safeAddress}/preview": {
       "post": {
-        "description": "Calculates the estimated fees for executing a transaction via Pay with Safe, including gas costs, relay fees, and total costs in USD.",
+        "description": "Calculates the estimated fees for executing a transaction via Pay with Safe. The fee model applied is selected internally per-chain and is transparent to the caller.",
         "operationId": "feesGetFeePreviewV1",
         "parameters": [
           {
@@ -1505,7 +1738,7 @@
         ],
         "requestBody": {
           "required": true,
-          "description": "Transaction data for fee calculation including recipient, value, data, operation type, gas token, and number of signatures",
+          "description": "Transaction data for fee calculation including recipient, value, data, operation type, nonce, gas token, and number of signatures",
           "content": {
             "application/json": {
               "schema": {
@@ -1516,7 +1749,7 @@
         },
         "responses": {
           "200": {
-            "description": "Fee preview with transaction data, relay cost, and pricing context",
+            "description": "Fee preview with transaction data plus, depending on the fee model applied for the chain, either a relay cost or a fee breakdown",
             "content": {
               "application/json": {
                 "schema": {
@@ -4503,56 +4736,18 @@
         ]
       }
     },
-    "/v1/chains/{chainId}/multisig-transactions/{safeTxHash}/raw": {
-      "get": {
-        "deprecated": true,
-        "operationId": "transactionsGetDomainMultisigTransactionBySafeTxHashV1",
-        "parameters": [
-          {
-            "name": "chainId",
-            "required": true,
-            "in": "path",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "safeTxHash",
-            "required": true,
-            "in": "path",
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/TXSMultisigTransaction"
-                }
-              }
-            }
-          }
-        },
-        "summary": "Deprecated",
-        "tags": [
-          "transactions"
-        ]
-      }
-    },
-    "/v1/chains/{chainId}/safes/{safeAddress}/multisig-transactions/raw": {
+    "/v1/chains/{chainId}/safes/{safeAddress}/multisig-transactions": {
       "get": {
-        "deprecated": true,
-        "operationId": "transactionsGetDomainMultisigTransactionsV1",
+        "description": "Retrieves a paginated list of multisig transactions for a Safe with optional filtering by execution date, recipient, value, nonce, and execution status.",
+        "operationId": "transactionsGetMultisigTransactionsV1",
         "parameters": [
           {
             "name": "chainId",
             "required": true,
             "in": "path",
+            "description": "Chain ID where the Safe is deployed",
             "schema": {
+              "example": "1",
               "type": "string"
             }
           },
@@ -4560,317 +4755,67 @@
             "name": "safeAddress",
             "required": true,
             "in": "path",
+            "description": "Safe contract address (0x prefixed hex string)",
             "schema": {
               "type": "string"
             }
           },
           {
-            "name": "failed",
+            "name": "execution_date__gte",
             "required": false,
             "in": "query",
+            "description": "Filter by execution date greater than or equal to (ISO 8601 format)",
             "schema": {
-              "type": "boolean"
+              "type": "string"
             }
           },
           {
-            "name": "modified__lt",
+            "name": "execution_date__lte",
             "required": false,
             "in": "query",
+            "description": "Filter by execution date less than or equal to (ISO 8601 format)",
             "schema": {
               "type": "string"
             }
           },
           {
-            "name": "modified__gt",
+            "name": "to",
             "required": false,
             "in": "query",
+            "description": "Filter by recipient address (0x prefixed hex string)",
             "schema": {
               "type": "string"
             }
           },
           {
-            "name": "modified__lte",
+            "name": "value",
             "required": false,
             "in": "query",
+            "description": "Filter by transaction value in wei",
             "schema": {
               "type": "string"
             }
           },
           {
-            "name": "modified__gte",
+            "name": "nonce",
             "required": false,
             "in": "query",
+            "description": "Filter by transaction nonce",
             "schema": {
               "type": "string"
             }
           },
           {
-            "name": "nonce__lt",
+            "name": "executed",
             "required": false,
             "in": "query",
+            "description": "Filter by execution status (true for executed, false for pending)",
             "schema": {
-              "type": "number"
+              "type": "boolean"
             }
           },
           {
-            "name": "nonce__gt",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "number"
-            }
-          },
-          {
-            "name": "nonce__lte",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "number"
-            }
-          },
-          {
-            "name": "nonce__gte",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "number"
-            }
-          },
-          {
-            "name": "nonce",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "number"
-            }
-          },
-          {
-            "name": "safe_tx_hash",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "to",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "value__lt",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "number"
-            }
-          },
-          {
-            "name": "value__gt",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "number"
-            }
-          },
-          {
-            "name": "value",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "number"
-            }
-          },
-          {
-            "name": "executed",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "boolean"
-            }
-          },
-          {
-            "name": "has_confirmations",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "boolean"
-            }
-          },
-          {
-            "name": "trusted",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "boolean"
-            }
-          },
-          {
-            "name": "execution_date__gte",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "execution_date__lte",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "submission_date__gte",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "submission_date__lte",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "transaction_hash",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "ordering",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "limit",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "number"
-            }
-          },
-          {
-            "name": "offset",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "number"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/TXSMultisigTransactionPage"
-                }
-              }
-            }
-          }
-        },
-        "summary": "Deprecated",
-        "tags": [
-          "transactions"
-        ]
-      }
-    },
-    "/v1/chains/{chainId}/safes/{safeAddress}/multisig-transactions": {
-      "get": {
-        "description": "Retrieves a paginated list of multisig transactions for a Safe with optional filtering by execution date, recipient, value, nonce, and execution status.",
-        "operationId": "transactionsGetMultisigTransactionsV1",
-        "parameters": [
-          {
-            "name": "chainId",
-            "required": true,
-            "in": "path",
-            "description": "Chain ID where the Safe is deployed",
-            "schema": {
-              "example": "1",
-              "type": "string"
-            }
-          },
-          {
-            "name": "safeAddress",
-            "required": true,
-            "in": "path",
-            "description": "Safe contract address (0x prefixed hex string)",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "execution_date__gte",
-            "required": false,
-            "in": "query",
-            "description": "Filter by execution date greater than or equal to (ISO 8601 format)",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "execution_date__lte",
-            "required": false,
-            "in": "query",
-            "description": "Filter by execution date less than or equal to (ISO 8601 format)",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "to",
-            "required": false,
-            "in": "query",
-            "description": "Filter by recipient address (0x prefixed hex string)",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "value",
-            "required": false,
-            "in": "query",
-            "description": "Filter by transaction value in wei",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "nonce",
-            "required": false,
-            "in": "query",
-            "description": "Filter by transaction nonce",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "executed",
-            "required": false,
-            "in": "query",
-            "description": "Filter by execution status (true for executed, false for pending)",
-            "schema": {
-              "type": "boolean"
-            }
-          },
-          {
-            "name": "cursor",
+            "name": "cursor",
             "required": false,
             "in": "query",
             "description": "Pagination cursor for retrieving the next set of results",
@@ -5508,49 +5453,9 @@
         ]
       }
     },
-    "/v1/chains/{chainId}/safes/{safeAddress}/creation/raw": {
-      "get": {
-        "deprecated": true,
-        "operationId": "transactionsGetDomainCreationTransactionV1",
-        "parameters": [
-          {
-            "name": "chainId",
-            "required": true,
-            "in": "path",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "safeAddress",
-            "required": true,
-            "in": "path",
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/TXSCreationTransaction"
-                }
-              }
-            }
-          }
-        },
-        "summary": "Deprecated",
-        "tags": [
-          "transactions"
-        ]
-      }
-    },
-    "/v1/export/chains/{chainId}/{safeAddress}": {
-      "post": {
-        "operationId": "csvExportLaunchExportV1",
+    "/v1/export/chains/{chainId}/{safeAddress}": {
+      "post": {
+        "operationId": "csvExportLaunchExportV1",
         "parameters": [
           {
             "name": "chainId",
@@ -6611,20 +6516,411 @@
           "fiatTotal": {
             "type": "string"
           },
-          "items": {
-            "type": "array",
-            "items": {
-              "oneOf": [
-                {
-                  "$ref": "#/components/schemas/Balance"
-                }
-              ]
-            }
+          "items": {
+            "type": "array",
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/Balance"
+                }
+              ]
+            }
+          }
+        },
+        "required": [
+          "fiatTotal",
+          "items"
+        ]
+      },
+      "SubscriptionPlan": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "description": {
+            "type": "string",
+            "nullable": true
+          },
+          "currentPrice": {
+            "type": "number"
+          },
+          "originalPrice": {
+            "type": "number",
+            "nullable": true
+          },
+          "paymentMethod": {
+            "type": "string",
+            "enum": [
+              "fiat"
+            ]
+          },
+          "currency": {
+            "type": "string",
+            "enum": [
+              "usd",
+              "eur"
+            ]
+          },
+          "features": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "billingCycle": {
+            "type": "string",
+            "enum": [
+              "month",
+              "year"
+            ],
+            "nullable": true
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "standard",
+              "premium",
+              "enterprise"
+            ]
+          },
+          "product": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "required": [
+          "id",
+          "currentPrice",
+          "originalPrice",
+          "paymentMethod",
+          "currency",
+          "features",
+          "type",
+          "product"
+        ]
+      },
+      "Subscription": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "customerId": {
+            "type": "string"
+          },
+          "upstreamCustomerId": {
+            "type": "string"
+          },
+          "plan": {
+            "$ref": "#/components/schemas/SubscriptionPlan"
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "active",
+              "canceled",
+              "incomplete",
+              "incomplete_expired",
+              "past_due",
+              "paused",
+              "trialing",
+              "unpaid"
+            ]
+          },
+          "createdAt": {
+            "type": "number"
+          },
+          "startAt": {
+            "type": "number"
+          },
+          "cancelledAt": {
+            "type": "number",
+            "nullable": true
+          },
+          "cancelAt": {
+            "type": "number",
+            "nullable": true
+          },
+          "validUntil": {
+            "type": "number",
+            "nullable": true
+          },
+          "metadata": {
+            "type": "object",
+            "nullable": true
+          }
+        },
+        "required": [
+          "id",
+          "customerId",
+          "upstreamCustomerId",
+          "plan",
+          "status",
+          "createdAt",
+          "startAt",
+          "cancelledAt",
+          "cancelAt"
+        ]
+      },
+      "MarketingFeature": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "name"
+        ]
+      },
+      "Product": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "active": {
+            "type": "boolean"
+          },
+          "description": {
+            "type": "string"
+          },
+          "marketingFeatures": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/MarketingFeature"
+            }
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "name": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "id",
+          "active",
+          "description",
+          "marketingFeatures",
+          "metadata",
+          "name"
+        ]
+      },
+      "Plan": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "description": {
+            "type": "string",
+            "nullable": true
+          },
+          "currentPrice": {
+            "type": "number"
+          },
+          "originalPrice": {
+            "type": "number",
+            "nullable": true
+          },
+          "paymentMethod": {
+            "type": "string",
+            "enum": [
+              "fiat"
+            ]
+          },
+          "currency": {
+            "type": "string",
+            "enum": [
+              "usd",
+              "eur"
+            ]
+          },
+          "features": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "billingCycle": {
+            "type": "string",
+            "enum": [
+              "month",
+              "year"
+            ],
+            "nullable": true
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "standard",
+              "premium",
+              "enterprise"
+            ]
+          },
+          "product": {
+            "$ref": "#/components/schemas/Product"
+          }
+        },
+        "required": [
+          "id",
+          "currentPrice",
+          "originalPrice",
+          "paymentMethod",
+          "currency",
+          "features",
+          "type",
+          "product"
+        ]
+      },
+      "UrlResponse": {
+        "type": "object",
+        "properties": {
+          "url": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "url"
+        ]
+      },
+      "PaymentLink": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "url": {
+            "type": "string"
+          },
+          "active": {
+            "type": "boolean"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "customText": {
+            "type": "object"
+          },
+          "afterCompletion": {
+            "type": "object"
+          },
+          "lineItems": {
+            "type": "array",
+            "items": {
+              "type": "object"
+            }
+          }
+        },
+        "required": [
+          "id",
+          "url",
+          "active",
+          "metadata"
+        ]
+      },
+      "CheckoutSessionResult": {
+        "type": "object",
+        "properties": {
+          "sessionId": {
+            "type": "string"
+          },
+          "url": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "sessionId",
+          "url"
+        ]
+      },
+      "CheckoutSession": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "object": {
+            "type": "string"
+          },
+          "amountSubtotal": {
+            "type": "number"
+          },
+          "amountTotal": {
+            "type": "number"
+          },
+          "cancelUrl": {
+            "type": "string"
+          },
+          "clientReferenceId": {
+            "type": "object",
+            "nullable": true
+          },
+          "created": {
+            "type": "number"
+          },
+          "currency": {
+            "type": "string"
+          },
+          "customer": {
+            "type": "object",
+            "nullable": true
+          },
+          "expiresAt": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object"
+          },
+          "mode": {
+            "type": "string"
+          },
+          "paymentStatus": {
+            "type": "string"
+          },
+          "status": {
+            "type": "string"
+          },
+          "successUrl": {
+            "type": "string"
+          },
+          "url": {
+            "type": "object",
+            "nullable": true
+          },
+          "subscription": {
+            "type": "object",
+            "nullable": true
+          },
+          "invoice": {
+            "type": "object",
+            "nullable": true
           }
         },
         "required": [
-          "fiatTotal",
-          "items"
+          "id",
+          "object",
+          "amountSubtotal",
+          "amountTotal",
+          "cancelUrl",
+          "created",
+          "currency",
+          "expiresAt",
+          "metadata",
+          "mode",
+          "paymentStatus",
+          "status",
+          "successUrl"
         ]
       },
       "Position": {
@@ -8544,45 +8840,91 @@
           "fiatValue"
         ]
       },
-      "PriceSource": {
-        "type": "string",
-        "enum": [
-          "COINGECKO"
-        ],
-        "description": "Price data source"
+      "FeePreviewValuationDetail": {
+        "type": "object",
+        "properties": {
+          "tokenAddress": {
+            "type": "string",
+            "description": "Token contract address (absent for native transfers)"
+          },
+          "symbol": {
+            "type": "string",
+            "description": "Token symbol",
+            "example": "USDC"
+          },
+          "amount": {
+            "type": "string",
+            "description": "Token amount",
+            "example": "1000"
+          },
+          "priceUsd": {
+            "type": "number",
+            "description": "Token price in USD"
+          },
+          "valueUsd": {
+            "type": "number",
+            "description": "Token value in USD"
+          }
+        },
+        "required": [
+          "symbol",
+          "amount"
+        ]
       },
-      "FeePreviewPricingContext": {
+      "FeePreviewFeeBreakdown": {
         "type": "object",
         "properties": {
-          "phase": {
+          "txValueUsd": {
             "type": "number",
-            "description": "Pricing phase"
+            "description": "Transaction value in USD",
+            "example": 1000
           },
-          "priceSource": {
-            "description": "Price data source",
-            "example": "COINGECKO",
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/PriceSource"
-              }
-            ]
+          "trailingVolumeUsd": {
+            "type": "number",
+            "description": "Trailing volume in USD that fed tier selection",
+            "example": 0
           },
-          "priceTimestamp": {
+          "tierBps": {
             "type": "number",
-            "description": "Price snapshot Unix timestamp",
-            "example": 1700000000
+            "description": "Tier fee in basis points",
+            "example": 5
+          },
+          "gtfFeeUsd": {
+            "type": "number",
+            "description": "GTF fee in USD",
+            "example": 0.5
+          },
+          "relayCostUsd": {
+            "type": "number",
+            "description": "Relay cost in USD",
+            "example": 38.22
+          },
+          "totalUsd": {
+            "type": "number",
+            "description": "Total fee in USD",
+            "example": 38.72
           },
-          "gasPriceVolatilityBuffer": {
+          "numberSignatures": {
             "type": "number",
-            "description": "Gas price volatility buffer multiplier",
-            "example": 1.3
+            "description": "Number of signatures",
+            "example": 2
+          },
+          "valuationDetails": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FeePreviewValuationDetail"
+            }
           }
         },
         "required": [
-          "phase",
-          "priceSource",
-          "priceTimestamp",
-          "gasPriceVolatilityBuffer"
+          "txValueUsd",
+          "trailingVolumeUsd",
+          "tierBps",
+          "gtfFeeUsd",
+          "relayCostUsd",
+          "totalUsd",
+          "numberSignatures",
+          "valuationDetails"
         ]
       },
       "FeePreviewResponse": {
@@ -8592,16 +8934,28 @@
             "$ref": "#/components/schemas/FeePreviewTxData"
           },
           "relayCost": {
-            "$ref": "#/components/schemas/FeePreviewRelayCost"
+            "description": "Relay cost. Present when the relay fee flow applies.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/FeePreviewRelayCost"
+              }
+            ]
+          },
+          "feeBreakdown": {
+            "description": "GTF fee breakdown, as returned by the fee-engine service. Present when the GTF fee flow applies.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/FeePreviewFeeBreakdown"
+              }
+            ]
           },
-          "pricingContextSnapshot": {
-            "$ref": "#/components/schemas/FeePreviewPricingContext"
+          "maxFeeCapUsd": {
+            "type": "number",
+            "description": "Maximum fee cap in USD (buffered max fee). Present when the GTF fee flow applies."
           }
         },
         "required": [
-          "txData",
-          "relayCost",
-          "pricingContextSnapshot"
+          "txData"
         ]
       },
       "TypedDataParameter": {
@@ -11497,7 +11851,8 @@
             "enum": [
               "ERC20",
               "ERC721",
-              "ERC1155"
+              "ERC1155",
+              "NONERC"
             ]
           },
           "address": {
@@ -13794,169 +14149,6 @@
           "txStatus"
         ]
       },
-      "TXSMultisigTransaction": {
-        "type": "object",
-        "properties": {
-          "safe": {
-            "type": "string"
-          },
-          "to": {
-            "type": "string"
-          },
-          "value": {
-            "type": "string"
-          },
-          "data": {
-            "type": "object"
-          },
-          "operation": {
-            "description": "Operation type: 0 for CALL, 1 for DELEGATE",
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/Operation"
-              }
-            ]
-          },
-          "gasToken": {
-            "type": "object"
-          },
-          "safeTxGas": {
-            "type": "object"
-          },
-          "baseGas": {
-            "type": "object"
-          },
-          "gasPrice": {
-            "type": "object"
-          },
-          "proposer": {
-            "type": "object"
-          },
-          "proposedByDelegate": {
-            "type": "object"
-          },
-          "refundReceiver": {
-            "type": "object"
-          },
-          "nonce": {
-            "type": "number"
-          },
-          "executionDate": {
-            "type": "object"
-          },
-          "submissionDate": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "modified": {
-            "type": "object"
-          },
-          "blockNumber": {
-            "type": "object"
-          },
-          "transactionHash": {
-            "type": "object"
-          },
-          "safeTxHash": {
-            "type": "string"
-          },
-          "executor": {
-            "type": "object"
-          },
-          "isExecuted": {
-            "type": "boolean"
-          },
-          "isSuccessful": {
-            "type": "object"
-          },
-          "ethGasPrice": {
-            "type": "object"
-          },
-          "gasUsed": {
-            "type": "object"
-          },
-          "fee": {
-            "type": "object"
-          },
-          "payment": {
-            "type": "object"
-          },
-          "origin": {
-            "type": "object"
-          },
-          "confirmationsRequired": {
-            "type": "number"
-          },
-          "confirmations": {
-            "type": "object"
-          },
-          "signatures": {
-            "type": "object"
-          },
-          "trusted": {
-            "type": "boolean"
-          }
-        },
-        "required": [
-          "safe",
-          "to",
-          "value",
-          "data",
-          "operation",
-          "gasToken",
-          "safeTxGas",
-          "baseGas",
-          "gasPrice",
-          "proposer",
-          "proposedByDelegate",
-          "refundReceiver",
-          "nonce",
-          "executionDate",
-          "submissionDate",
-          "modified",
-          "blockNumber",
-          "transactionHash",
-          "safeTxHash",
-          "executor",
-          "isExecuted",
-          "isSuccessful",
-          "ethGasPrice",
-          "gasUsed",
-          "fee",
-          "payment",
-          "origin",
-          "confirmationsRequired",
-          "confirmations",
-          "signatures",
-          "trusted"
-        ]
-      },
-      "TXSMultisigTransactionPage": {
-        "type": "object",
-        "properties": {
-          "count": {
-            "type": "number",
-            "nullable": true
-          },
-          "next": {
-            "type": "string",
-            "nullable": true
-          },
-          "previous": {
-            "type": "string",
-            "nullable": true
-          },
-          "results": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/TXSMultisigTransaction"
-            }
-          }
-        },
-        "required": [
-          "results"
-        ]
-      },
       "ModuleExecutionInfo": {
         "type": "object",
         "properties": {
@@ -14658,42 +14850,6 @@
           "factoryAddress"
         ]
       },
-      "TXSCreationTransaction": {
-        "type": "object",
-        "properties": {
-          "created": {
-            "format": "date-time",
-            "type": "string"
-          },
-          "creator": {
-            "type": "string"
-          },
-          "transactionHash": {
-            "type": "string"
-          },
-          "factoryAddress": {
-            "type": "string"
-          },
-          "masterCopy": {
-            "type": "object"
-          },
-          "setupData": {
-            "type": "object"
-          },
-          "saltNonce": {
-            "type": "object"
-          }
-        },
-        "required": [
-          "created",
-          "creator",
-          "transactionHash",
-          "factoryAddress",
-          "masterCopy",
-          "setupData",
-          "saltNonce"
-        ]
-      },
       "TransactionExportDto": {
         "type": "object",
         "properties": {
diff --git a/packages/store/src/gateway/AUTO_GENERATED/.schema-hash b/packages/store/src/gateway/AUTO_GENERATED/.schema-hash
index 05a4d1e7e7..2a8adb52a2 100644
--- a/packages/store/src/gateway/AUTO_GENERATED/.schema-hash
+++ b/packages/store/src/gateway/AUTO_GENERATED/.schema-hash
@@ -1 +1 @@
-6be3fa3a8da88b152c0dcbacdeeec984c85d3aef673d767f43653fbe28161726
+d87ba47e4b0d1a80ef8a9c38bac6e6f9fff04131ec3587d79d8a08ce7ddd1810
diff --git a/packages/store/src/gateway/AUTO_GENERATED/safe-shield.ts b/packages/store/src/gateway/AUTO_GENERATED/safe-shield.ts
index 432731269d..dbb130c49d 100644
--- a/packages/store/src/gateway/AUTO_GENERATED/safe-shield.ts
+++ b/packages/store/src/gateway/AUTO_GENERATED/safe-shield.ts
@@ -314,7 +314,7 @@ export type TokenAssetDetailsDto = {
   /** URL to asset logo (if available) */
   logo_url?: string
   /** Asset type */
-  type: 'ERC20' | 'ERC721' | 'ERC1155'
+  type: 'ERC20' | 'ERC721' | 'ERC1155' | 'NONERC'
   /** Token contract address */
   address: string
 }
diff --git a/packages/store/src/gateway/AUTO_GENERATED/transactions.ts b/packages/store/src/gateway/AUTO_GENERATED/transactions.ts
index 46978e97a0..50d83d6eaa 100644
--- a/packages/store/src/gateway/AUTO_GENERATED/transactions.ts
+++ b/packages/store/src/gateway/AUTO_GENERATED/transactions.ts
@@ -13,52 +13,6 @@ const injectedRtkApi = api
         query: (queryArg) => ({ url: `/v1/chains/${queryArg.chainId}/transactions/${queryArg.id}` }),
         providesTags: ['transactions'],
       }),
-      transactionsGetDomainMultisigTransactionBySafeTxHashV1: build.query<
-        TransactionsGetDomainMultisigTransactionBySafeTxHashV1ApiResponse,
-        TransactionsGetDomainMultisigTransactionBySafeTxHashV1ApiArg
-      >({
-        query: (queryArg) => ({
-          url: `/v1/chains/${queryArg.chainId}/multisig-transactions/${queryArg.safeTxHash}/raw`,
-        }),
-        providesTags: ['transactions'],
-      }),
-      transactionsGetDomainMultisigTransactionsV1: build.query<
-        TransactionsGetDomainMultisigTransactionsV1ApiResponse,
-        TransactionsGetDomainMultisigTransactionsV1ApiArg
-      >({
-        query: (queryArg) => ({
-          url: `/v1/chains/${queryArg.chainId}/safes/${queryArg.safeAddress}/multisig-transactions/raw`,
-          params: {
-            failed: queryArg.failed,
-            modified__lt: queryArg.modifiedLt,
-            modified__gt: queryArg.modifiedGt,
-            modified__lte: queryArg.modifiedLte,
-            modified__gte: queryArg.modifiedGte,
-            nonce__lt: queryArg.nonceLt,
-            nonce__gt: queryArg.nonceGt,
-            nonce__lte: queryArg.nonceLte,
-            nonce__gte: queryArg.nonceGte,
-            nonce: queryArg.nonce,
-            safe_tx_hash: queryArg.safeTxHash,
-            to: queryArg.to,
-            value__lt: queryArg.valueLt,
-            value__gt: queryArg.valueGt,
-            value: queryArg.value,
-            executed: queryArg.executed,
-            has_confirmations: queryArg.hasConfirmations,
-            trusted: queryArg.trusted,
-            execution_date__gte: queryArg.executionDateGte,
-            execution_date__lte: queryArg.executionDateLte,
-            submission_date__gte: queryArg.submissionDateGte,
-            submission_date__lte: queryArg.submissionDateLte,
-            transaction_hash: queryArg.transactionHash,
-            ordering: queryArg.ordering,
-            limit: queryArg.limit,
-            offset: queryArg.offset,
-          },
-        }),
-        providesTags: ['transactions'],
-      }),
       transactionsGetMultisigTransactionsV1: build.query<
         TransactionsGetMultisigTransactionsV1ApiResponse,
         TransactionsGetMultisigTransactionsV1ApiArg
@@ -192,13 +146,6 @@ const injectedRtkApi = api
         }),
         providesTags: ['transactions'],
       }),
-      transactionsGetDomainCreationTransactionV1: build.query<
-        TransactionsGetDomainCreationTransactionV1ApiResponse,
-        TransactionsGetDomainCreationTransactionV1ApiArg
-      >({
-        query: (queryArg) => ({ url: `/v1/chains/${queryArg.chainId}/safes/${queryArg.safeAddress}/creation/raw` }),
-        providesTags: ['transactions'],
-      }),
     }),
     overrideExisting: false,
   })
@@ -211,43 +158,6 @@ export type TransactionsGetTransactionByIdV1ApiArg = {
   /** Transaction ID (safe transaction hash or multisig transaction ID) */
   id: string
 }
-export type TransactionsGetDomainMultisigTransactionBySafeTxHashV1ApiResponse =
-  /** status 200  */ TxsMultisigTransaction
-export type TransactionsGetDomainMultisigTransactionBySafeTxHashV1ApiArg = {
-  chainId: string
-  safeTxHash: string
-}
-export type TransactionsGetDomainMultisigTransactionsV1ApiResponse = /** status 200  */ TxsMultisigTransactionPage
-export type TransactionsGetDomainMultisigTransactionsV1ApiArg = {
-  chainId: string
-  safeAddress: string
-  failed?: boolean
-  modifiedLt?: string
-  modifiedGt?: string
-  modifiedLte?: string
-  modifiedGte?: string
-  nonceLt?: number
-  nonceGt?: number
-  nonceLte?: number
-  nonceGte?: number
-  nonce?: number
-  safeTxHash?: string
-  to?: string
-  valueLt?: number
-  valueGt?: number
-  value?: number
-  executed?: boolean
-  hasConfirmations?: boolean
-  trusted?: boolean
-  executionDateGte?: string
-  executionDateLte?: string
-  submissionDateGte?: string
-  submissionDateLte?: string
-  transactionHash?: string
-  ordering?: string
-  limit?: number
-  offset?: number
-}
 export type TransactionsGetMultisigTransactionsV1ApiResponse =
   /** status 200 Paginated list of multisig transactions */ MultisigTransactionPage
 export type TransactionsGetMultisigTransactionsV1ApiArg = {
@@ -385,11 +295,6 @@ export type TransactionsGetCreationTransactionV1ApiArg = {
   /** Safe contract address (0x prefixed hex string) */
   safeAddress: string
 }
-export type TransactionsGetDomainCreationTransactionV1ApiResponse = /** status 200  */ TxsCreationTransaction
-export type TransactionsGetDomainCreationTransactionV1ApiArg = {
-  chainId: string
-  safeAddress: string
-}
 export type AddressInfo = {
   value: string
   name?: string | null
@@ -926,46 +831,6 @@ export type TransactionDetails = {
   safeAppInfo?: SafeAppInfo | null
   note?: string | null
 }
-export type TxsMultisigTransaction = {
-  safe: string
-  to: string
-  value: string
-  data: object
-  /** Operation type: 0 for CALL, 1 for DELEGATE */
-  operation: Operation
-  gasToken: object
-  safeTxGas: object
-  baseGas: object
-  gasPrice: object
-  proposer: object
-  proposedByDelegate: object
-  refundReceiver: object
-  nonce: number
-  executionDate: object
-  submissionDate: string
-  modified: object
-  blockNumber: object
-  transactionHash: object
-  safeTxHash: string
-  executor: object
-  isExecuted: boolean
-  isSuccessful: object
-  ethGasPrice: object
-  gasUsed: object
-  fee: object
-  payment: object
-  origin: object
-  confirmationsRequired: number
-  confirmations: object
-  signatures: object
-  trusted: boolean
-}
-export type TxsMultisigTransactionPage = {
-  count?: number | null
-  next?: string | null
-  previous?: string | null
-  results: TxsMultisigTransaction[]
-}
 export type MultisigExecutionInfo = {
   type: 'MULTISIG'
   nonce: number
@@ -1128,22 +993,9 @@ export type CreationTransaction = {
   saltNonce?: string | null
   dataDecoded?: DataDecoded | null
 }
-export type TxsCreationTransaction = {
-  created: string
-  creator: string
-  transactionHash: string
-  factoryAddress: string
-  masterCopy: object
-  setupData: object
-  saltNonce: object
-}
 export const {
   useTransactionsGetTransactionByIdV1Query,
   useLazyTransactionsGetTransactionByIdV1Query,
-  useTransactionsGetDomainMultisigTransactionBySafeTxHashV1Query,
-  useLazyTransactionsGetDomainMultisigTransactionBySafeTxHashV1Query,
-  useTransactionsGetDomainMultisigTransactionsV1Query,
-  useLazyTransactionsGetDomainMultisigTransactionsV1Query,
   useTransactionsGetMultisigTransactionsV1Query,
   useLazyTransactionsGetMultisigTransactionsV1Query,
   useTransactionsDeleteTransactionV1Mutation,
@@ -1160,6 +1012,4 @@ export const {
   useTransactionsProposeTransactionV1Mutation,
   useTransactionsGetCreationTransactionV1Query,
   useLazyTransactionsGetCreationTransactionV1Query,
-  useTransactionsGetDomainCreationTransactionV1Query,
-  useLazyTransactionsGetDomainCreationTransactionV1Query,
 } = injectedRtkApi