chore: Fix merge conflicts

cartesi · Nov 27, 2023 · beb13d5 · beb13d5
1 parent 19a6451
commit beb13d5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/apps/web/src/app/shell.tsx b/apps/web/src/app/shell.tsx
@@ -2,6 +2,7 @@
 import {
     ERC20DepositForm,
     EtherDepositForm,
+    RawInputForm,
 } from "@cartesi/rollups-explorer-ui";
 import {
     AppShell,
@@ -43,6 +44,7 @@ const Shell: FC<{ children: ReactNode }> = ({ children }) => {
     const [navDepositOpened, { toggle: toggleNavDeposit }] =
         useDisclosure(false);
     const [etherDeposit, { open: openEtherDeposit, close: closeEtherDeposit }] =
+        useDisclosure(false);
     const [rawInput, { open: openRawInput, close: closeRawInput }] =
         useDisclosure(false);
     const theme = useMantineTheme();
@@ -95,6 +97,8 @@ const Shell: FC<{ children: ReactNode }> = ({ children }) => {
                 title="Deposit Ether"
             >
                 <EtherDepositForm applications={applications} />
+            </Modal>
+            <Modal
                 opened={rawInput}
                 onClose={closeRawInput}
                 title="Send raw input"
@@ -133,6 +137,9 @@ const Shell: FC<{ children: ReactNode }> = ({ children }) => {
                                 data-testid="deposit-ether-button"
                             >
                                 Deposit Ether
+                            </Button>
+                            <Button
+                                variant="subtle"
                                 leftSection={<TbInbox />}
                                 onClick={openRawInput}
                                 disabled={!isConnected}

diff --git a/packages/ui/src/index.tsx b/packages/ui/src/index.tsx
@@ -7,6 +7,7 @@ export {
 } from "./InputDetails";
 export { ERC20DepositForm } from "./ERC20DepositForm";
 export { RawInputForm } from "./RawInputForm";
+export { EtherDepositForm } from "./EtherDepositForm";
 export { Summary } from "./Summary";
 export { SummaryCard } from "./SummaryCard";
 export { TransactionProgress } from "./TransactionProgress";