chore: merge main to dev (#5238)

* fix: allow any safe-like apps * chore: release main (#5237) * feat: fix pagination for fills (#5228) * feat: fix pagination for fills * fix: remove unnecessary tag --------- Co-authored-by: Alexandr Kazachenko <[email protected]>
cowprotocol · Dec 19, 2024 · c3529aa · c3529aa
1 parent 28fcda9
commit c3529aa
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -17,7 +17,7 @@
   "libs/tokens": "1.13.1",
   "libs/types": "1.5.0",
   "libs/ui": "1.17.0",
-  "libs/wallet": "1.8.0",
+  "libs/wallet": "1.8.1",
   "apps/cow-fi": "1.19.3",
   "libs/wallet-provider": "1.0.0",
   "libs/ui-utils": "1.1.0",

diff --git a/apps/explorer/src/components/orders/OrderDetails/FillsTableWithData.tsx b/apps/explorer/src/components/orders/OrderDetails/FillsTableWithData.tsx
@@ -18,7 +18,7 @@ type Props = {
 }
 
 export const FillsTableWithData: React.FC<Props> = ({ areTokensLoaded, order, isPriceInverted, invertPrice }) => {
-  const { trades, tableState } = useContext(FillsTableContext)
+  const { data: trades, tableState } = useContext(FillsTableContext)
   const isFirstRender = useFirstRender()
 
   return isFirstRender || !areTokensLoaded ? (

diff --git a/apps/explorer/src/components/orders/OrderDetails/context/FillsTableContext.tsx b/apps/explorer/src/components/orders/OrderDetails/context/FillsTableContext.tsx
@@ -5,7 +5,7 @@ import { Trade } from 'api/operator'
 import { TableState, TableStateSetters } from '../../../../explorer/components/TokensTableWidget/useTable'
 
 type CommonState = {
-  trades: Trade[]
+  data: Trade[]
   isLoading: boolean
   tableState: TableState
 } & TableStateSetters

diff --git a/apps/explorer/src/components/orders/OrderDetails/index.tsx b/apps/explorer/src/components/orders/OrderDetails/index.tsx
@@ -72,7 +72,7 @@ export type Props = {
 
 export enum TabView {
   OVERVIEW = 1,
-  FILLS,
+  FILLS = 2,
 }
 
 const DEFAULT_TAB = TabView[1]
@@ -225,7 +225,7 @@ export const OrderDetails: React.FC<Props> = (props) => {
       ))}
       <FillsTableContext.Provider
         value={{
-          trades,
+          data: trades,
           isLoading: areTradesLoading,
           tableState,
           setPageSize,

diff --git a/libs/wallet/CHANGELOG.md b/libs/wallet/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.8.1](https://github.com/cowprotocol/cowswap/compare/wallet-v1.8.0...wallet-v1.8.1) (2024-12-19)
+
+
+### Bug Fixes
+
+* allow any safe-like apps ([26e68ab](https://github.com/cowprotocol/cowswap/commit/26e68ab1d75905e33cc0c44fec050697447377be))
+
 ## [1.8.0](https://github.com/cowprotocol/cowswap/compare/wallet-v1.7.0...wallet-v1.8.0) (2024-12-18)
 
 

diff --git a/libs/wallet/package.json b/libs/wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cowprotocol/wallet",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "main": "./index.js",
   "types": "./index.d.ts",
   "exports": {