Skip to content

keep selected wallet when switching tabs #1085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
+37 −23
Open

keep selected wallet when switching tabs #1085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions app/lib/screens/market/market_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import 'package:threebotlogin/widgets/layout_drawer.dart';
import 'package:threebotlogin/screens/market/order_book.dart';
import 'package:threebotlogin/screens/market/overview.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:threebotlogin/models/wallet.dart';

class MarketPage extends ConsumerStatefulWidget {
const MarketPage({super.key});
Expand All @@ -14,6 +15,8 @@ class MarketPage extends ConsumerStatefulWidget {
class _MarketPageState extends ConsumerState<MarketPage>
with SingleTickerProviderStateMixin {
late final TabController _tabController;
Wallet? _selectedWallet;

@override
void initState() {
super.initState();
Expand All @@ -26,6 +29,12 @@ class _MarketPageState extends ConsumerState<MarketPage>
_tabController.dispose();
}

void _onWalletSelected(Wallet wallet) {
setState(() {
_selectedWallet = wallet;
});
}

@override
Widget build(BuildContext context) {
return LayoutDrawer(
Expand Down Expand Up @@ -55,9 +64,12 @@ class _MarketPageState extends ConsumerState<MarketPage>
Expanded(
child: TabBarView(
controller: _tabController,
children: const [
OverviewWidget(),
OrderbookWidget(),
children: [
OverviewWidget(
selectedWallet: _selectedWallet,
onWalletSelected: _onWalletSelected,
),
const OrderbookWidget(),
],
),
)
Expand Down
42 changes: 22 additions & 20 deletions app/lib/screens/market/overview.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,14 @@ import 'package:threebotlogin/widgets/market/wallet_selection.dart';
import 'package:threebotlogin/services/stellar_service.dart' as Stellar;

class OverviewWidget extends ConsumerStatefulWidget {
const OverviewWidget({super.key});
final Wallet? selectedWallet;
final Function(Wallet) onWalletSelected;

const OverviewWidget({
super.key,
this.selectedWallet,
required this.onWalletSelected,
});

@override
ConsumerState<OverviewWidget> createState() => _OverviewWidgetState();
Expand All @@ -21,7 +28,6 @@ class OverviewWidget extends ConsumerStatefulWidget {
class _OverviewWidgetState extends ConsumerState<OverviewWidget> {
late Timer _timer;
String lastUpdated = '--';
Wallet? _selectedWallet;
bool loading = true;
bool failed = false;
bool isLoadingWallets = false;
Expand All @@ -42,7 +48,6 @@ class _OverviewWidgetState extends ConsumerState<OverviewWidget> {
setState(() {
isLoadingWallets = true;
loadingWalletsFailed = false;
_selectedWallet = null;
});
try {
await walletsNotifierRef.list();
Expand All @@ -66,7 +71,6 @@ class _OverviewWidgetState extends ConsumerState<OverviewWidget> {
setState(() {
isLoadingWallets = true;
loadingWalletsFailed = false;
_selectedWallet = null;
});

final walletsNotifierRef = ref.read(walletsNotifier.notifier);
Expand Down Expand Up @@ -342,7 +346,7 @@ class _OverviewWidgetState extends ConsumerState<OverviewWidget> {
MainAxisAlignment.spaceBetween,
children: [
Text(
_selectedWallet?.name ??
widget.selectedWallet?.name ??
'Select Wallet',
style: Theme.of(context)
.textTheme
Expand All @@ -366,20 +370,20 @@ class _OverviewWidgetState extends ConsumerState<OverviewWidget> {
child: SizedBox(
height: 50,
child: ElevatedButton(
onPressed: _selectedWallet == null
onPressed: widget.selectedWallet == null
? null
: () async {
Navigator.of(context).push(
MaterialPageRoute(
builder: (context) =>
OrderWidget(
selectedWallet:
_selectedWallet!,
selectedWallet: widget
.selectedWallet!,
)));
},
child: Text(
'My Orders',
style: _selectedWallet == null
style: widget.selectedWallet == null
? Theme.of(context)
.textTheme
.bodyLarge!
Expand Down Expand Up @@ -463,7 +467,7 @@ class _OverviewWidgetState extends ConsumerState<OverviewWidget> {
),
),
const SizedBox(height: 16),
if (_selectedWallet != null)
if (widget.selectedWallet != null)
SizedBox(
width: double.infinity,
child: Card(
Expand Down Expand Up @@ -497,15 +501,15 @@ class _OverviewWidgetState extends ConsumerState<OverviewWidget> {
children: [
_buildMarketColumn(
'TFT Balance',
_selectedWallet
widget.selectedWallet
?.stellarBalances['TFT']!),
_buildMarketColumn(
'USDC Balance',
_selectedWallet
widget.selectedWallet
?.stellarBalances['USDC']!),
_buildMarketColumn(
'XLM Balance',
_selectedWallet
widget.selectedWallet
?.stellarBalances['XLM']!),
],
),
Expand All @@ -522,18 +526,18 @@ class _OverviewWidgetState extends ConsumerState<OverviewWidget> {
child: SizedBox(
width: MediaQuery.of(context).size.width - 40,
child: ElevatedButton(
onPressed: _selectedWallet == null
onPressed: widget.selectedWallet == null
? null
: () async {
Navigator.of(context).push(MaterialPageRoute(
builder: (context) => BuyTFTWidget(
wallet: _selectedWallet!,
wallet: widget.selectedWallet!,
edit: false,
)));
},
child: Text(
'Buy TFT',
style: _selectedWallet == null
style: widget.selectedWallet == null
? Theme.of(context)
.textTheme
.bodyLarge!
Expand Down Expand Up @@ -655,11 +659,9 @@ class _OverviewWidgetState extends ConsumerState<OverviewWidget> {
}
return WalletSelectionSheet(
wallets: filteredWallets,
selectedWallet: _selectedWallet,
selectedWallet: widget.selectedWallet,
onWalletSelected: (Wallet wallet) {
setState(() {
_selectedWallet = wallet;
});
widget.onWalletSelected(wallet);
Navigator.pop(context);
},
);
Expand Down