Skip to content

Commit 853517b

Browse files
takenagainCharlVS
authored andcommitted
fix merge conflicts with moved/modified code
1 parent eb912ae commit 853517b

File tree

3 files changed

+14
-28
lines changed

3 files changed

+14
-28
lines changed

lib/views/main_layout/main_layout.dart

-14
Original file line numberDiff line numberDiff line change
@@ -67,20 +67,6 @@ class _MainLayoutState extends State<MainLayout> {
6767
);
6868
}
6969

70-
Widget _buildAppBody() {
71-
return StreamBuilder<bool>(
72-
initialData: startUpBloc.running,
73-
stream: startUpBloc.outRunning,
74-
builder: (context, snapshot) {
75-
log('_LayoutWrapperState.build([context]) StreamBuilder: $snapshot');
76-
if (!snapshot.hasData) {
77-
return const Center(child: UiSpinner());
78-
}
79-
80-
return MainLayoutRouter();
81-
});
82-
}
83-
8470
// Method to show an alert dialog with an option to agree if the app is in
8571
// debug mode stating that trading features may not be used for actual trading
8672
// and that only test assets/networks may be used.

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

+11-11
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ class CoinDetailsCommonButtons extends StatelessWidget {
1717
const CoinDetailsCommonButtons({
1818
required this.isMobile,
1919
required this.selectWidget,
20-
required this.clickSwapButton,
20+
required this.onClickSwapButton,
2121
required this.coin,
2222
super.key,
2323
});
2424

2525
final bool isMobile;
2626
final Coin coin;
2727
final void Function(CoinPageType) selectWidget;
28-
final VoidCallback? clickSwapButton;
28+
final VoidCallback? onClickSwapButton;
2929

3030
@override
3131
Widget build(BuildContext context) {
@@ -34,14 +34,14 @@ class CoinDetailsCommonButtons extends StatelessWidget {
3434
coin: coin,
3535
isMobile: isMobile,
3636
selectWidget: selectWidget,
37-
clickSwapButton: clickSwapButton,
37+
clickSwapButton: onClickSwapButton,
3838
context: context,
3939
)
4040
: CoinDetailsCommonButtonsDesktopLayout(
4141
isMobile: isMobile,
4242
coin: coin,
4343
selectWidget: selectWidget,
44-
clickSwapButton: clickSwapButton,
44+
clickSwapButton: onClickSwapButton,
4545
context: context,
4646
);
4747
}
@@ -60,7 +60,7 @@ class CoinDetailsCommonButtonsMobileLayout extends StatelessWidget {
6060
final Coin coin;
6161
final bool isMobile;
6262
final void Function(CoinPageType p1) selectWidget;
63-
final VoidCallback clickSwapButton;
63+
final VoidCallback? clickSwapButton;
6464
final BuildContext context;
6565

6666
@override
@@ -114,7 +114,7 @@ class CoinDetailsCommonButtonsMobileLayout extends StatelessWidget {
114114
child: CoinDetailsSwapButton(
115115
isMobile: isMobile,
116116
coin: coin,
117-
clickSwapButton: clickSwapButton,
117+
onClickSwapButton: clickSwapButton,
118118
context: context,
119119
),
120120
),
@@ -138,7 +138,7 @@ class CoinDetailsCommonButtonsDesktopLayout extends StatelessWidget {
138138
final bool isMobile;
139139
final Coin coin;
140140
final void Function(CoinPageType p1) selectWidget;
141-
final VoidCallback clickSwapButton;
141+
final VoidCallback? clickSwapButton;
142142
final BuildContext context;
143143

144144
@override
@@ -171,7 +171,7 @@ class CoinDetailsCommonButtonsDesktopLayout extends StatelessWidget {
171171
child: CoinDetailsSwapButton(
172172
isMobile: isMobile,
173173
coin: coin,
174-
clickSwapButton: clickSwapButton,
174+
onClickSwapButton: clickSwapButton,
175175
context: context,
176176
),
177177
),
@@ -291,14 +291,14 @@ class CoinDetailsSwapButton extends StatelessWidget {
291291
const CoinDetailsSwapButton({
292292
required this.isMobile,
293293
required this.coin,
294-
required this.clickSwapButton,
294+
required this.onClickSwapButton,
295295
required this.context,
296296
super.key,
297297
});
298298

299299
final bool isMobile;
300300
final Coin coin;
301-
final VoidCallback clickSwapButton;
301+
final VoidCallback? onClickSwapButton;
302302
final BuildContext context;
303303

304304
@override
@@ -322,7 +322,7 @@ class CoinDetailsSwapButton extends StatelessWidget {
322322
'$assetsPath/others/swap.svg',
323323
),
324324
),
325-
onPressed: coin.isSuspended ? null : clickSwapButton,
325+
onPressed: coin.isSuspended ? null : onClickSwapButton,
326326
);
327327
}
328328
}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ class _DesktopCoinDetails extends StatelessWidget {
250250
child: CoinDetailsCommonButtons(
251251
isMobile: false,
252252
selectWidget: setPageType,
253-
clickSwapButton: MainMenuValue.dex.isEnabledInCurrentMode()
253+
onClickSwapButton: MainMenuValue.dex.isEnabledInCurrentMode()
254254
? null
255255
: () => _goToSwap(context, coin),
256256
coin: coin,
@@ -347,7 +347,7 @@ class _CoinDetailsInfoHeader extends StatelessWidget {
347347
child: CoinDetailsCommonButtons(
348348
isMobile: true,
349349
selectWidget: setPageType,
350-
clickSwapButton: MainMenuValue.dex.isEnabledInCurrentMode()
350+
onClickSwapButton: MainMenuValue.dex.isEnabledInCurrentMode()
351351
? null
352352
: () => _goToSwap(context, coin),
353353
coin: coin,
@@ -379,7 +379,7 @@ class _CoinDetailsMarketMetricsTabBar extends StatelessWidget {
379379
profitLossState is! PortfolioProfitLossChartUnsupported;
380380
final areChartsSupported =
381381
isPortfolioGrowthSupported || isProfitLossSupported;
382-
final numChartsSupported = 0 +
382+
final numChartsSupported = 0 +
383383
(isPortfolioGrowthSupported ? 1 : 0) +
384384
(isProfitLossSupported ? 1 : 0);
385385

0 commit comments

Comments
 (0)