chore: Fix merge conflicts

cartesi · Nov 27, 2023 · c157406 · c157406
1 parent 55e2481
commit c157406
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/apps/web/src/app/shell.tsx b/apps/web/src/app/shell.tsx
@@ -92,7 +92,7 @@ const Shell: FC<{ children: ReactNode }> = ({ children }) => {
                                 onClick={openTransaction}
                                 disabled={!isConnected}
                                 visibleFrom="sm"
-                                data-testid="deposit-button"
+                                data-testid="transaction-button"
                             >
                                 Send Transaction
                             </Button>

diff --git a/apps/web/test/app/shell.test.tsx b/apps/web/test/app/shell.test.tsx
@@ -122,17 +122,12 @@ describe("Shell component", () => {
     });
 
     describe("Header", () => {
-        it("should display deposit links in header", () => {
+        it("should display transaction link in header", () => {
             render(<Component>Children</Component>);
 
             expect(
                 within(screen.getByTestId("header")).getByTestId(
-                    "deposit-button",
-                ),
-            ).toBeInTheDocument();
-            expect(
-                within(screen.getByTestId("header")).getByTestId(
-                    "deposit-ether-button",
+                    "transaction-button",
                 ),
             ).toBeInTheDocument();
         });

diff --git a/apps/web/test/components/sendTransaction.test.tsx b/apps/web/test/components/sendTransaction.test.tsx
@@ -195,7 +195,7 @@ describe("SendTransaction component", () => {
         render(<Component initialDepositType="erc20" />);
 
         const tokenAutocomplete = screen.queryByTestId(
-            "token-autocomplete",
+            "token-input",
         ) as HTMLFormElement;
 
         fireEvent.change(tokenAutocomplete, {