fix merge conflict

rainlanguage · Feb 19, 2025 · bef8cbc · bef8cbc
1 parent 42d9bf3
commit bef8cbc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/packages/ui-components/src/lib/types/modal.ts b/packages/ui-components/src/lib/types/modal.ts
@@ -1,4 +1,4 @@
-import type { OrderSubgraph } from '@rainlanguage/orderbook/js_api';
+import type { SgOrder } from '@rainlanguage/orderbook/js_api';
 import type { DepositOrWithdrawArgs, OrderRemoveArgs, DeploymentArgs } from './transaction';
 
 export type DepositOrWithdrawModalProps = {
@@ -21,7 +21,7 @@ export type DisclaimerModalProps = {
 	onAccept: () => void;
 };
 export type QuoteDebugModalHandler = (
-	order: OrderSubgraph,
+	order: SgOrder,
 	rpcUrl: string,
 	orderbook: string,
 	inputIOIndex: number,

diff --git a/packages/ui-components/src/lib/types/transaction.ts b/packages/ui-components/src/lib/types/transaction.ts
@@ -1,7 +1,7 @@
 import type { ExtendedApprovalCalldata } from '$lib/stores/transactionStore';
 import type { DepositAndAddOrderCalldataResult } from '@rainlanguage/orderbook/js_api';
 import type { Hex } from 'viem';
-import type { OrderSubgraph, Vault } from '@rainlanguage/orderbook/js_api';
+import type { SgOrder, SgVault } from '@rainlanguage/orderbook/js_api';
 
 export type DeploymentArgs = {
 	approvals: ExtendedApprovalCalldata[];
@@ -13,7 +13,7 @@ export type DeploymentArgs = {
 };
 
 export type DepositOrWithdrawArgs = {
-	vault: Vault;
+	vault: SgVault;
 	onDepositOrWithdraw: () => void;
 	action: 'deposit' | 'withdraw';
 	chainId: number;
@@ -22,7 +22,7 @@ export type DepositOrWithdrawArgs = {
 };
 
 export type OrderRemoveArgs = {
-	order: OrderSubgraph;
+	order: SgOrder;
 	onRemove: () => void;
 	chainId: number;
 	orderbookAddress: Hex;