Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2025-03-25 08:38:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'stack_wallet_origin/ui-fixes' into firo/spend-mints

Browse source
This commit is contained in:
sneurlax 2023-04-10 16:05:52 -05:00
commit 5262bd8933
7 changed files with 157 additions and 205 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

316
lib/pages/exchange_view/exchange_coin_selection/exchange_currency_selection_view.dart
View file

@ -111,26 +111,28 @@ class _ExchangeCurrencySelectionViewState
return currencies; return currencies;
} }
await showDialog<void>( if (mounted) {
context: context, await showDialog<void>(
builder: (context) => StackDialog( context: context,
title: "ChangeNOW Error", builder: (context) => StackDialog(
message: "Failed to load currency data: ${cn.exception}", title: "ChangeNOW Error",
leftButton: SecondaryButton( message: "Failed to load currency data: ${cn.exception}",
label: "Ok", leftButton: SecondaryButton(
onPressed: Navigator.of(context, rootNavigator: isDesktop).pop, label: "Ok",
onPressed: Navigator.of(context, rootNavigator: isDesktop).pop,
),
rightButton: PrimaryButton(
label: "Retry",
onPressed: () async {
Navigator.of(context, rootNavigator: isDesktop).pop();
_currencies = await _showUpdatingCurrencies(
whileFuture: _loadCurrencies());
setState(() {});
},
),
), ),
rightButton: PrimaryButton( );
label: "Retry", }
onPressed: () async {
Navigator.of(context, rootNavigator: isDesktop).pop();
_currencies =
await _showUpdatingCurrencies(whileFuture: _loadCurrencies());
setState(() {});
},
),
),
);
} else { } else {
currencies.addAll(cn.value!); currencies.addAll(cn.value!);
} }
@ -180,13 +182,13 @@ class _ExchangeCurrencySelectionViewState
.where((e) => .where((e) =>
e.name.toLowerCase().contains(text.toLowerCase()) || e.name.toLowerCase().contains(text.toLowerCase()) ||
e.ticker.toLowerCase().contains(text.toLowerCase())) e.ticker.toLowerCase().contains(text.toLowerCase()))
.toList(growable: false); .toList();
} else { } else {
if (text.isEmpty) { if (text.isEmpty) {
return _currencies return _currencies
.where((e) => .where((e) =>
e.ticker.toLowerCase() != widget.pairedTicker!.toLowerCase()) e.ticker.toLowerCase() != widget.pairedTicker!.toLowerCase())
.toList(growable: false); .toList();
} }
return _currencies return _currencies
@ -194,7 +196,7 @@ class _ExchangeCurrencySelectionViewState
e.ticker.toLowerCase() != widget.pairedTicker!.toLowerCase() && e.ticker.toLowerCase() != widget.pairedTicker!.toLowerCase() &&
(e.name.toLowerCase().contains(text.toLowerCase()) || (e.name.toLowerCase().contains(text.toLowerCase()) ||
e.ticker.toLowerCase().contains(text.toLowerCase()))) e.ticker.toLowerCase().contains(text.toLowerCase())))
.toList(growable: false); .toList();
} }
} }
@ -328,181 +330,111 @@ class _ExchangeCurrencySelectionViewState
height: 12, height: 12,
), ),
Flexible( Flexible(
child: Builder(builder: (context) { child: Builder(
final coins = Coin.values.where((e) => builder: (context) {
e.ticker.toLowerCase() != widget.pairedTicker?.toLowerCase()); final coins = Coin.values.where((e) =>
e.ticker.toLowerCase() !=
widget.pairedTicker?.toLowerCase());
final items = filter(_searchString) final items = filter(_searchString);
.where((e) => coins
.where((coin) =>
coin.ticker.toLowerCase() == e.ticker.toLowerCase())
.isNotEmpty)
.toList(growable: false);
items.sort((a, b) => a.name.compareTo(b.name));
return RoundedWhiteContainer( final walletCoins = items
padding: const EdgeInsets.all(0), .where((currency) => coins
child: ListView.builder( .where((coin) =>
shrinkWrap: true, coin.ticker.toLowerCase() ==
primary: isDesktop ? false : null, currency.ticker.toLowerCase())
itemCount: items.length, .isNotEmpty)
itemBuilder: (builderContext, index) { .toList();
final bool hasImageUrl =
items[index].image.startsWith("http"); // sort alphabetically by name
return Padding( items.sort((a, b) => a.name.compareTo(b.name));
padding: const EdgeInsets.symmetric(vertical: 4),
child: GestureDetector( // reverse sort walletCoins to prepare for next step
onTap: () { walletCoins.sort((a, b) => b.name.compareTo(a.name));
Navigator.of(context).pop(items[index]);
}, // insert wallet coins at beginning
child: RoundedWhiteContainer( for (final c in walletCoins) {
child: Row( items.remove(c);
children: [ items.insert(0, c);
SizedBox( }
width: 24,
height: 24, return RoundedWhiteContainer(
child: isStackCoin(items[index].ticker) padding: const EdgeInsets.all(0),
? getIconForTicker( child: ListView.builder(
items[index].ticker, shrinkWrap: true,
size: 24, primary: isDesktop ? false : null,
) itemCount: items.length,
: hasImageUrl itemBuilder: (builderContext, index) {
? SvgPicture.network( final bool hasImageUrl =
items[index].image, items[index].image.startsWith("http");
width: 24, return Padding(
height: 24, padding: const EdgeInsets.symmetric(vertical: 4),
placeholderBuilder: (_) => child: GestureDetector(
const LoadingIndicator(), onTap: () {
) Navigator.of(context).pop(items[index]);
: const SizedBox( },
width: 24, child: RoundedWhiteContainer(
height: 24, child: Row(
), children: [
), SizedBox(
const SizedBox( width: 24,
width: 10, height: 24,
), child: isStackCoin(items[index].ticker)
Expanded( ? getIconForTicker(
child: Column( items[index].ticker,
crossAxisAlignment: CrossAxisAlignment.start, size: 24,
children: [ )
Text( : hasImageUrl
items[index].name, ? SvgPicture.network(
style: STextStyles.largeMedium14(context), items[index].image,
), width: 24,
const SizedBox( height: 24,
height: 2, placeholderBuilder: (_) =>
), const LoadingIndicator(),
Text( )
items[index].ticker.toUpperCase(), : const SizedBox(
style: STextStyles.smallMed12(context) width: 24,
.copyWith( height: 24,
color: Theme.of(context) ),
.extension<StackColors>()!
.textSubtitle1,
),
),
],
), ),
), const SizedBox(
], width: 10,
),
Expanded(
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Text(
items[index].name,
style:
STextStyles.largeMedium14(context),
),
const SizedBox(
height: 2,
),
Text(
items[index].ticker.toUpperCase(),
style: STextStyles.smallMed12(context)
.copyWith(
color: Theme.of(context)
.extension<StackColors>()!
.textSubtitle1,
),
),
],
),
),
],
),
), ),
), ),
), );
); },
}, ),
), );
); },
}), ),
),
const SizedBox(
height: 20,
),
Text(
"All coins",
style: STextStyles.smallMed12(context),
),
const SizedBox(
height: 12,
),
Flexible(
child: Builder(builder: (context) {
final filtered = filter(_searchString);
filtered.sort((a, b) => a.name.compareTo(b.name));
return RoundedWhiteContainer(
padding: const EdgeInsets.all(0),
child: ListView.builder(
shrinkWrap: true,
primary: isDesktop ? false : null,
itemCount: filtered.length,
itemBuilder: (builderContext, index) {
final bool hasImageUrl =
filtered[index].image.startsWith("http");
return Padding(
padding: const EdgeInsets.symmetric(vertical: 4),
child: GestureDetector(
onTap: () {
Navigator.of(context).pop(filtered[index]);
},
child: RoundedWhiteContainer(
child: Row(
children: [
SizedBox(
width: 24,
height: 24,
child: isStackCoin(filtered[index].ticker)
? getIconForTicker(
filtered[index].ticker,
size: 24,
)
: hasImageUrl
? SvgPicture.network(
filtered[index].image,
width: 24,
height: 24,
placeholderBuilder: (_) =>
const LoadingIndicator(),
)
: const SizedBox(
width: 24,
height: 24,
),
),
const SizedBox(
width: 10,
),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
filtered[index].name,
style: STextStyles.largeMedium14(context),
),
const SizedBox(
height: 2,
),
Text(
filtered[index].ticker.toUpperCase(),
style: STextStyles.smallMed12(context)
.copyWith(
color: Theme.of(context)
.extension<StackColors>()!
.textSubtitle1,
),
),
],
),
),
],
),
),
),
);
},
),
);
}),
), ),
], ],
), ),

3
lib/pages/exchange_view/exchange_form.dart
View file

@ -149,6 +149,8 @@ class _ExchangeFormState extends ConsumerState<ExchangeForm> {
currency.ticker, currency.ticker,
caseSensitive: false, caseSensitive: false,
) )
.and()
.tokenContractEqualTo(currency.tokenContract)
.findAll(); .findAll();
final items = [Tuple2(currency.exchangeName, currency)]; final items = [Tuple2(currency.exchangeName, currency)];
@ -631,6 +633,7 @@ class _ExchangeFormState extends ConsumerState<ExchangeForm> {
.getAggregateCurrency( .getAggregateCurrency(
widget.contract == null ? coin!.ticker : widget.contract!.symbol, widget.contract == null ? coin!.ticker : widget.contract!.symbol,
ExchangeRateType.estimated, ExchangeRateType.estimated,
widget.contract == null ? null : widget.contract!.address,
) )
.then((value) { .then((value) {
if (value != null) { if (value != null) {

13
lib/pages/receive_view/receive_view.dart
View file

@ -5,6 +5,7 @@ import 'package:flutter/services.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
import 'package:qr_flutter/qr_flutter.dart'; import 'package:qr_flutter/qr_flutter.dart';
import 'package:stackwallet/models/isar/models/isar_models.dart';
import 'package:stackwallet/notifications/show_flush_bar.dart'; import 'package:stackwallet/notifications/show_flush_bar.dart';
import 'package:stackwallet/pages/receive_view/addresses/wallet_addresses_view.dart'; import 'package:stackwallet/pages/receive_view/addresses/wallet_addresses_view.dart';
import 'package:stackwallet/pages/receive_view/generate_receiving_uri_qr_code_view.dart'; import 'package:stackwallet/pages/receive_view/generate_receiving_uri_qr_code_view.dart';
@ -25,15 +26,15 @@ import 'package:stackwallet/widgets/rounded_white_container.dart';
class ReceiveView extends ConsumerStatefulWidget { class ReceiveView extends ConsumerStatefulWidget {
const ReceiveView({ const ReceiveView({
Key? key, Key? key,
required this.coin,
required this.walletId, required this.walletId,
this.tokenContract,
this.clipboard = const ClipboardWrapper(), this.clipboard = const ClipboardWrapper(),
}) : super(key: key); }) : super(key: key);
static const String routeName = "/receiveView"; static const String routeName = "/receiveView";
final Coin coin;
final String walletId; final String walletId;
final EthContract? tokenContract;
final ClipboardInterface clipboard; final ClipboardInterface clipboard;
@override @override
@ -86,7 +87,7 @@ class _ReceiveViewState extends ConsumerState<ReceiveView> {
@override @override
void initState() { void initState() {
walletId = widget.walletId; walletId = widget.walletId;
coin = widget.coin; coin = ref.read(walletsChangeNotifierProvider).getManager(walletId).coin;
clipboard = widget.clipboard; clipboard = widget.clipboard;
WidgetsBinding.instance.addPostFrameCallback((timeStamp) async { WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
@ -117,6 +118,8 @@ class _ReceiveViewState extends ConsumerState<ReceiveView> {
} }
}); });
final ticker = widget.tokenContract?.symbol ?? coin.ticker;
return Background( return Background(
child: Scaffold( child: Scaffold(
backgroundColor: Theme.of(context).extension<StackColors>()!.background, backgroundColor: Theme.of(context).extension<StackColors>()!.background,
@ -127,7 +130,7 @@ class _ReceiveViewState extends ConsumerState<ReceiveView> {
}, },
), ),
title: Text( title: Text(
"Receive ${coin.ticker}", "Receive $ticker",
style: STextStyles.navBarTitle(context), style: STextStyles.navBarTitle(context),
), ),
actions: [ actions: [
@ -245,7 +248,7 @@ class _ReceiveViewState extends ConsumerState<ReceiveView> {
Row( Row(
children: [ children: [
Text( Text(
"Your ${coin.ticker} address", "Your $ticker address",
style: STextStyles.itemSubtitle(context), style: STextStyles.itemSubtitle(context),
), ),
const Spacer(), const Spacer(),

2
lib/pages/token_view/sub_widgets/token_summary.dart
View file

@ -209,7 +209,7 @@ class TokenWalletOptions extends StatelessWidget {
ReceiveView.routeName, ReceiveView.routeName,
arguments: Tuple2( arguments: Tuple2(
walletId, walletId,
Coin.ethereum, tokenContract,
), ),
); );
}, },

5
lib/pages/wallet_view/wallet_view.dart
View file

@ -800,10 +800,7 @@ class _WalletViewState extends ConsumerState<WalletView> {
unawaited( unawaited(
Navigator.of(context).pushNamed( Navigator.of(context).pushNamed(
ReceiveView.routeName, ReceiveView.routeName,
arguments: Tuple2( arguments: walletId,
walletId,
coin,
),
), ),
); );
} }

14
lib/route_generator.dart
View file

@ -1019,12 +1019,22 @@ class RouteGenerator {
return _routeError("${settings.name} invalid args: ${args.toString()}"); return _routeError("${settings.name} invalid args: ${args.toString()}");
case ReceiveView.routeName: case ReceiveView.routeName:
if (args is Tuple2<String, Coin>) { if (args is String) {
return getRoute(
shouldUseMaterialRoute: useMaterialPageRoute,
builder: (_) => ReceiveView(
walletId: args,
),
settings: RouteSettings(
name: settings.name,
),
);
} else if (args is Tuple2<String, EthContract?>) {
return getRoute( return getRoute(
shouldUseMaterialRoute: useMaterialPageRoute, shouldUseMaterialRoute: useMaterialPageRoute,
builder: (_) => ReceiveView( builder: (_) => ReceiveView(
walletId: args.item1, walletId: args.item1,
coin: args.item2, tokenContract: args.item2,
), ),
settings: RouteSettings( settings: RouteSettings(
name: settings.name, name: settings.name,

9
lib/services/exchange/exchange_data_loading_service.dart
View file

@ -61,10 +61,12 @@ class ExchangeDataLoadingService {
final sendCurrency = await getAggregateCurrency( final sendCurrency = await getAggregateCurrency(
"BTC", "BTC",
state.exchangeRateType, state.exchangeRateType,
null,
); );
final receiveCurrency = await getAggregateCurrency( final receiveCurrency = await getAggregateCurrency(
"XMR", "XMR",
state.exchangeRateType, state.exchangeRateType,
null,
); );
state.setCurrencies(sendCurrency, receiveCurrency); state.setCurrencies(sendCurrency, receiveCurrency);
} }
@ -72,7 +74,10 @@ class ExchangeDataLoadingService {
} }
Future<AggregateCurrency?> getAggregateCurrency( Future<AggregateCurrency?> getAggregateCurrency(
String ticker, ExchangeRateType rateType) async { String ticker,
ExchangeRateType rateType,
String? contract,
) async {
final currencies = await ExchangeDataLoadingService.instance.isar.currencies final currencies = await ExchangeDataLoadingService.instance.isar.currencies
.filter() .filter()
.group((q) => rateType == ExchangeRateType.fixed .group((q) => rateType == ExchangeRateType.fixed
@ -89,6 +94,8 @@ class ExchangeDataLoadingService {
ticker, ticker,
caseSensitive: false, caseSensitive: false,
) )
.and()
.tokenContractEqualTo(contract)
.findAll(); .findAll();
final items = currencies final items = currencies