fix merge conflicts with moved/modified code

Author: takenagain

lib/views/main_layout/main_layout.dart

@@ -67,20 +67,6 @@ class _MainLayoutState extends State<MainLayout> {
     );
   }
 
-  Widget _buildAppBody() {
-    return StreamBuilder<bool>(
-        initialData: startUpBloc.running,
-        stream: startUpBloc.outRunning,
-        builder: (context, snapshot) {
-          log('_LayoutWrapperState.build([context]) StreamBuilder: $snapshot');
-          if (!snapshot.hasData) {
-            return const Center(child: UiSpinner());
-          }
-
-          return MainLayoutRouter();
-        });
-  }
-
   // Method to show an alert dialog with an option to agree if the app is in
   // debug mode stating that trading features may not be used for actual trading
   // and that only test assets/networks may be used.

lib/views/wallet/coin_details/coin_details_info/coin_details_common_buttons.dart

@@ -17,15 +17,15 @@ class CoinDetailsCommonButtons extends StatelessWidget {
   const CoinDetailsCommonButtons({
     required this.isMobile,
     required this.selectWidget,
-    required this.clickSwapButton,
+    required this.onClickSwapButton,
     required this.coin,
     super.key,
   });
 
   final bool isMobile;
   final Coin coin;
   final void Function(CoinPageType) selectWidget;
-  final VoidCallback? clickSwapButton;
+  final VoidCallback? onClickSwapButton;
 
   @override
   Widget build(BuildContext context) {
@@ -34,14 +34,14 @@ class CoinDetailsCommonButtons extends StatelessWidget {
             coin: coin,
             isMobile: isMobile,
             selectWidget: selectWidget,
-            clickSwapButton: clickSwapButton,
+            clickSwapButton: onClickSwapButton,
             context: context,
           )
         : CoinDetailsCommonButtonsDesktopLayout(
             isMobile: isMobile,
             coin: coin,
             selectWidget: selectWidget,
-            clickSwapButton: clickSwapButton,
+            clickSwapButton: onClickSwapButton,
             context: context,
           );
   }
@@ -60,7 +60,7 @@ class CoinDetailsCommonButtonsMobileLayout extends StatelessWidget {
   final Coin coin;
   final bool isMobile;
   final void Function(CoinPageType p1) selectWidget;
-  final VoidCallback clickSwapButton;
+  final VoidCallback? clickSwapButton;
   final BuildContext context;
 
   @override
@@ -114,7 +114,7 @@ class CoinDetailsCommonButtonsMobileLayout extends StatelessWidget {
                 child: CoinDetailsSwapButton(
                   isMobile: isMobile,
                   coin: coin,
-                  clickSwapButton: clickSwapButton,
+                  onClickSwapButton: clickSwapButton,
                   context: context,
                 ),
               ),
@@ -138,7 +138,7 @@ class CoinDetailsCommonButtonsDesktopLayout extends StatelessWidget {
   final bool isMobile;
   final Coin coin;
   final void Function(CoinPageType p1) selectWidget;
-  final VoidCallback clickSwapButton;
+  final VoidCallback? clickSwapButton;
   final BuildContext context;
 
   @override
@@ -171,7 +171,7 @@ class CoinDetailsCommonButtonsDesktopLayout extends StatelessWidget {
             child: CoinDetailsSwapButton(
               isMobile: isMobile,
               coin: coin,
-              clickSwapButton: clickSwapButton,
+              onClickSwapButton: clickSwapButton,
               context: context,
             ),
           ),
@@ -291,14 +291,14 @@ class CoinDetailsSwapButton extends StatelessWidget {
   const CoinDetailsSwapButton({
     required this.isMobile,
     required this.coin,
-    required this.clickSwapButton,
+    required this.onClickSwapButton,
     required this.context,
     super.key,
   });
 
   final bool isMobile;
   final Coin coin;
-  final VoidCallback clickSwapButton;
+  final VoidCallback? onClickSwapButton;
   final BuildContext context;
 
   @override
@@ -322,7 +322,7 @@ class CoinDetailsSwapButton extends StatelessWidget {
           '$assetsPath/others/swap.svg',
         ),
       ),
-      onPressed: coin.isSuspended ? null : clickSwapButton,
+      onPressed: coin.isSuspended ? null : onClickSwapButton,
     );
   }
 }

lib/views/wallet/coin_details/coin_details_info/coin_details_info.dart

@@ -250,7 +250,7 @@ class _DesktopCoinDetails extends StatelessWidget {
             child: CoinDetailsCommonButtons(
               isMobile: false,
               selectWidget: setPageType,
-              clickSwapButton: MainMenuValue.dex.isEnabledInCurrentMode()
+              onClickSwapButton: MainMenuValue.dex.isEnabledInCurrentMode()
                   ? null
                   : () => _goToSwap(context, coin),
               coin: coin,
@@ -347,7 +347,7 @@ class _CoinDetailsInfoHeader extends StatelessWidget {
             child: CoinDetailsCommonButtons(
               isMobile: true,
               selectWidget: setPageType,
-              clickSwapButton: MainMenuValue.dex.isEnabledInCurrentMode()
+              onClickSwapButton: MainMenuValue.dex.isEnabledInCurrentMode()
                   ? null
                   : () => _goToSwap(context, coin),
               coin: coin,
@@ -379,7 +379,7 @@ class _CoinDetailsMarketMetricsTabBar extends StatelessWidget {
         profitLossState is! PortfolioProfitLossChartUnsupported;
     final areChartsSupported =
         isPortfolioGrowthSupported || isProfitLossSupported;
-    final numChartsSupported = 0 + 
+    final numChartsSupported = 0 +
         (isPortfolioGrowthSupported ? 1 : 0) +
         (isProfitLossSupported ? 1 : 0);