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

Merge pull request #19 from cypherstack/staging

Browse source 
Build v1.4.36
This commit is contained in:
Rylee Davis 2022-08-30 09:26:47 -06:00 committed by GitHub
commit 9b55f03862
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/pages/settings_views/global_settings_view/currency_view.dart
View file

@ -31,7 +31,7 @@ class _CurrencyViewState extends ConsumerState<BaseCurrencySettingsView> {
final _searchFocusNode = FocusNode(); final _searchFocusNode = FocusNode();
void onTap(int index) { void onTap(int index) {
if (index == 0 || current.isEmpty) { if (currenciesWithoutSelected[index] == current || current.isEmpty) {
// ignore if already selected currency // ignore if already selected currency
return; return;
} }
@ -212,7 +212,7 @@ class _CurrencyViewState extends ConsumerState<BaseCurrencySettingsView> {
"currencySelect_${currenciesWithoutSelected[index]}"), "currencySelect_${currenciesWithoutSelected[index]}"),
child: RoundedContainer( child: RoundedContainer(
padding: const EdgeInsets.all(0), padding: const EdgeInsets.all(0),
color: index == 0 color: currenciesWithoutSelected[index] == current
? CFColors.selected ? CFColors.selected
: CFColors.white, : CFColors.white,
child: RawMaterialButton( child: RawMaterialButton(
@ -238,7 +238,9 @@ class _CurrencyViewState extends ConsumerState<BaseCurrencySettingsView> {
materialTapTargetSize: materialTapTargetSize:
MaterialTapTargetSize.shrinkWrap, MaterialTapTargetSize.shrinkWrap,
value: true, value: true,
groupValue: index == 0, groupValue: currenciesWithoutSelected[
index] ==
current,
onChanged: (_) { onChanged: (_) {
onTap(index); onTap(index);
}, },
@ -253,7 +255,9 @@ class _CurrencyViewState extends ConsumerState<BaseCurrencySettingsView> {
children: [ children: [
Text( Text(
currenciesWithoutSelected[index], currenciesWithoutSelected[index],
key: (index == 0) key: (currenciesWithoutSelected[
index] ==
current)
? const Key( ? const Key(
"selectedCurrencySettingsCurrencyText") "selectedCurrencySettingsCurrencyText")
: null, : null,
@ -269,7 +273,9 @@ class _CurrencyViewState extends ConsumerState<BaseCurrencySettingsView> {
currenciesWithoutSelected[ currenciesWithoutSelected[
index]] ?? index]] ??
"", "",
key: (index == 0) key: (currenciesWithoutSelected[
index] ==
current)
? const Key( ? const Key(
"selectedCurrencySettingsCurrencyTextDescription") "selectedCurrencySettingsCurrencyTextDescription")
: null, : null,

2
pubspec.yaml
View file

@ -11,7 +11,7 @@ description: Stack Wallet
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at # Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 1.4.35+43 version: 1.4.36+44
environment: environment:
sdk: ">=2.17.0 <3.0.0" sdk: ">=2.17.0 <3.0.0"