fix nits

coinbase · Aug 29, 2024 · 6220921 · 6220921
1 parent 1ee8544
commit 6220921
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 19 deletions.
diff --git a/src/swap/hooks/useFromTo.test.ts b/src/swap/hooks/useFromTo.test.ts
@@ -22,42 +22,42 @@ describe('useFromTo', () => {
     (useSwapBalances as vi.Mock).mockReturnValue({
       fromBalanceString: '100',
       fromTokenBalanceError: null,
+      fromTokenResponse: { refetch: vi.fn() },
       toBalanceString: '200',
       toTokenBalanceError: null,
-      fromTokenResponse: { refetch: vi.fn() },
       toTokenResponse: { refetch: vi.fn() },
     });
     (useValue as vi.Mock).mockImplementation((props) => ({
       ...props,
       amount: '100',
+      response: props.response,
       setAmount: vi.fn(),
-      token: USDC_TOKEN,
-      setToken: vi.fn(),
       setLoading: vi.fn(),
-      response: props.response,
+      setToken: vi.fn(),
+      token: USDC_TOKEN,
     }));
     const { result } = renderHook(() => useFromTo('0x123'));
     expect(result.current.from).toEqual({
-      balance: '100',
       amount: '100',
-      setAmount: expect.any(Function),
-      token: USDC_TOKEN,
-      setToken: expect.any(Function),
-      loading: false,
-      setLoading: expect.any(Function),
+      balance: '100',
       error: null,
+      loading: false,
       response: { refetch: expect.any(Function) },
+      setAmount: expect.any(Function),
+      setLoading: expect.any(Function),
+      setToken: expect.any(Function),
+      token: USDC_TOKEN,
     });
     expect(result.current.to).toEqual({
-      balance: '200',
       amount: '100',
-      setAmount: expect.any(Function),
-      token: USDC_TOKEN,
-      setToken: expect.any(Function),
-      loading: false,
-      setLoading: expect.any(Function),
+      balance: '200',
       error: null,
+      loading: false,
       response: { refetch: expect.any(Function) },
+      setAmount: expect.any(Function),
+      setLoading: expect.any(Function),
+      setToken: expect.any(Function),
+      token: USDC_TOKEN,
     });
   });
 

diff --git a/src/swap/hooks/useSwapBalances.tsx b/src/swap/hooks/useSwapBalances.tsx
@@ -56,11 +56,10 @@ export function useSwapBalances({
   return useValue({
     fromBalanceString,
     fromTokenBalanceError,
+    fromTokenResponse,
 
     toBalanceString,
     toTokenBalanceError,
-
-    fromTokenResponse,
     toTokenResponse,
   });
 }
diff --git a/src/swap/types.ts b/src/swap/types.ts
@@ -239,7 +239,7 @@ export type SwapUnit = {
   balance?: string;
   error?: SwapError;
   loading: boolean;
-  response: UseBalanceReturnType | UseReadContractReturnType | undefined;
+  response?: UseBalanceReturnType | UseReadContractReturnType;
   setAmount: Dispatch<SetStateAction<string>>;
   setLoading: Dispatch<SetStateAction<boolean>>;
   setToken: Dispatch<SetStateAction<Token | undefined>>;