From 371cfb721bb0ff97476fc1745fb95e547e6b18d4 Mon Sep 17 00:00:00 2001
From: Adrian Pilarczyk <adrianpilarczyk314@gmail.com>
Date: Thu, 27 Apr 2023 09:34:33 +0200
Subject: [PATCH] refactor: :recycle: replace material-ui with macaw-ui; remove
 all views

---
 apps/taxes/src/modules/ui/app-layout.tsx | 6 ------
 apps/taxes/src/pages/_app.tsx            | 7 +------
 pnpm-lock.yaml                           | 8 ++++++++
 3 files changed, 9 insertions(+), 12 deletions(-)
 delete mode 100644 apps/taxes/src/modules/ui/app-layout.tsx

diff --git a/apps/taxes/src/modules/ui/app-layout.tsx b/apps/taxes/src/modules/ui/app-layout.tsx
deleted file mode 100644
index d748203..0000000
--- a/apps/taxes/src/modules/ui/app-layout.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import { Box } from "@saleor/macaw-ui/next";
-import React from "react";
-
-export const AppLayout = ({ children }: { children: React.ReactNode }) => {
-  return <Box padding={4}>{children}</Box>;
-};
diff --git a/apps/taxes/src/pages/_app.tsx b/apps/taxes/src/pages/_app.tsx
index be10502..4ca6776 100644
--- a/apps/taxes/src/pages/_app.tsx
+++ b/apps/taxes/src/pages/_app.tsx
@@ -10,7 +10,6 @@ import { useEffect } from "react";
 import { ThemeSynchronizer } from "../lib/theme-synchronizer";
 import { trpcClient } from "../modules/trpc/trpc-client";
 import { GraphQLProvider } from "../providers/GraphQLProvider";
-import { AppLayout } from "../modules/ui/app-layout";
 import { NoSSRWrapper } from "@saleor/apps-shared";
 
 /**
@@ -38,14 +37,10 @@ function NextApp({ Component, pageProps }: AppProps) {
           <ThemeProvider>
             <ThemeSynchronizer />
             <RoutePropagator />
-            <AppLayout>
-              <Component {...pageProps} />
-            </AppLayout>
+            <Component {...pageProps} />
           </ThemeProvider>
         </GraphQLProvider>
       </AppBridgeProvider>
     </NoSSRWrapper>
   );
 }
-
-export default trpcClient.withTRPC(NextApp);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bd535a9..ceaf034 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1516,7 +1516,11 @@ importers:
         version: link:../../packages/shared
       '@saleor/macaw-ui':
         specifier: ^0.8.0-pre.72
+<<<<<<< HEAD
         version: 0.8.0-pre.84(@types/react@18.0.38)(react-dom@18.2.0)(react@18.2.0)
+=======
+        version: 0.8.0-pre.76(@types/react@18.0.38)(react-dom@18.2.0)(react@18.2.0)
+>>>>>>> e847449 (refactor: :recycle: replace material-ui with macaw-ui; remove all views)
       '@sentry/nextjs':
         specifier: ^7.45.0
         version: 7.45.0(next@13.3.0)(react@18.2.0)
@@ -1640,7 +1644,11 @@ importers:
         version: 18.0.10
       '@vitejs/plugin-react':
         specifier: ^4.0.0
+<<<<<<< HEAD
         version: 4.0.0(vite@4.3.6)
+=======
+        version: 4.0.0(vite@4.3.1)
+>>>>>>> e847449 (refactor: :recycle: replace material-ui with macaw-ui; remove all views)
       eslint:
         specifier: 8.25.0
         version: 8.25.0