From cc41eefa69d38026e827b47ee6ebb0b7cce06734 Mon Sep 17 00:00:00 2001
From: Philipp Hoenisch <philipp@coblox.tech>
Date: Fri, 19 Jan 2024 22:29:38 +0100
Subject: [PATCH] chore: make all pages look the same

---
 webapp/frontend/lib/routes.dart               | 14 ++--
 webapp/frontend/lib/trade/trade_screen.dart   |  1 -
 webapp/frontend/lib/wallet/wallet_screen.dart | 79 +++++++++----------
 3 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/webapp/frontend/lib/routes.dart b/webapp/frontend/lib/routes.dart
index 6a3239194..c729479f2 100644
--- a/webapp/frontend/lib/routes.dart
+++ b/webapp/frontend/lib/routes.dart
@@ -22,7 +22,7 @@ final goRouter = GoRouter(
               GoRoute(
                 path: TradeScreen.route,
                 pageBuilder: (context, state) => NoTransitionPage(
-                  child: Scaffold(body: TradeScreen()),
+                  child: routeChild(const TradeScreen()),
                 ),
               ),
             ],
@@ -32,8 +32,8 @@ final goRouter = GoRouter(
             routes: [
               GoRoute(
                 path: WalletScreen.route,
-                pageBuilder: (context, state) => const NoTransitionPage(
-                  child: WalletScreen(),
+                pageBuilder: (context, state) => NoTransitionPage(
+                  child: routeChild(const WalletScreen()),
                 ),
               ),
             ],
@@ -43,8 +43,8 @@ final goRouter = GoRouter(
             routes: [
               GoRoute(
                 path: SettingsScreen.route,
-                pageBuilder: (context, state) => const NoTransitionPage(
-                  child: SettingsScreen(),
+                pageBuilder: (context, state) => NoTransitionPage(
+                  child: routeChild(const SettingsScreen()),
                 ),
               ),
             ],
@@ -52,3 +52,7 @@ final goRouter = GoRouter(
         ],
       )
     ]);
+
+Scaffold routeChild(Widget child) {
+  return Scaffold(body: Container(padding: const EdgeInsets.all(25), child: Center(child: child)));
+}
diff --git a/webapp/frontend/lib/trade/trade_screen.dart b/webapp/frontend/lib/trade/trade_screen.dart
index 1017d75f8..8e97123d2 100644
--- a/webapp/frontend/lib/trade/trade_screen.dart
+++ b/webapp/frontend/lib/trade/trade_screen.dart
@@ -22,7 +22,6 @@ class _TradeScreenState extends State<TradeScreen> with SingleTickerProviderStat
   @override
   Widget build(BuildContext context) {
     return Container(
-      padding: const EdgeInsets.all(25),
       width: 500,
       child: Column(
         mainAxisAlignment: MainAxisAlignment.start,
diff --git a/webapp/frontend/lib/wallet/wallet_screen.dart b/webapp/frontend/lib/wallet/wallet_screen.dart
index bd5df4cf4..f7ae3e752 100644
--- a/webapp/frontend/lib/wallet/wallet_screen.dart
+++ b/webapp/frontend/lib/wallet/wallet_screen.dart
@@ -18,50 +18,47 @@ class _WalletScreenState extends State<WalletScreen> with SingleTickerProviderSt
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      body: Container(
-        padding: const EdgeInsets.all(25),
-        width: 500,
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          crossAxisAlignment: CrossAxisAlignment.center,
-          children: [
-            TabBar(
-              unselectedLabelColor: Colors.black,
-              labelColor: tenTenOnePurple,
-              tabs: const [
-                Tab(
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      Icon(FontAwesomeIcons.arrowDown, size: 20),
-                      SizedBox(width: 10),
-                      Text("Receive")
-                    ],
-                  ),
+    return Container(
+      width: 500,
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        crossAxisAlignment: CrossAxisAlignment.center,
+        children: [
+          TabBar(
+            unselectedLabelColor: Colors.black,
+            labelColor: tenTenOnePurple,
+            tabs: const [
+              Tab(
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    Icon(FontAwesomeIcons.arrowDown, size: 20),
+                    SizedBox(width: 10),
+                    Text("Receive")
+                  ],
                 ),
-                Tab(
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      Icon(FontAwesomeIcons.arrowUp, size: 20),
-                      SizedBox(width: 10),
-                      Text("Withdraw")
-                    ],
-                  ),
-                )
-              ],
-              controller: _tabController,
-              indicatorSize: TabBarIndicatorSize.tab,
-            ),
-            Expanded(
-              child: TabBarView(
-                controller: _tabController,
-                children: const [ReceiveScreen(), SendScreen()],
               ),
+              Tab(
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    Icon(FontAwesomeIcons.arrowUp, size: 20),
+                    SizedBox(width: 10),
+                    Text("Withdraw")
+                  ],
+                ),
+              )
+            ],
+            controller: _tabController,
+            indicatorSize: TabBarIndicatorSize.tab,
+          ),
+          Expanded(
+            child: TabBarView(
+              controller: _tabController,
+              children: const [ReceiveScreen(), SendScreen()],
             ),
-          ],
-        ),
+          ),
+        ],
       ),
     );
   }