mirror of
https://github.com/cypherstack/stack_wallet.git
synced 2025-01-25 19:55:52 +00:00
more bug fixes (#281)
* xmr send fix * small screen recovery phrase warning view fix * mnemonic field crashes fix * desktop restore date fix * mac desktop keyboard type crash fix * firo (and possibly other) send fix * key fix for duplicate wallets edge case
This commit is contained in:
parent
32299975c3
commit
5f71a1c2dd
8 changed files with 94 additions and 63 deletions
|
@ -322,6 +322,11 @@ class _RestoreOptionsViewState extends ConsumerState<RestoreOptionsView> {
|
||||||
onTap: chooseDate,
|
onTap: chooseDate,
|
||||||
controller: _dateController,
|
controller: _dateController,
|
||||||
),
|
),
|
||||||
|
if (coin == Coin.monero ||
|
||||||
|
coin == Coin.epicCash ||
|
||||||
|
(coin == Coin.wownero &&
|
||||||
|
ref.watch(mnemonicWordCountStateProvider.state).state ==
|
||||||
|
25))
|
||||||
if (isDesktop)
|
if (isDesktop)
|
||||||
// TODO desktop date picker
|
// TODO desktop date picker
|
||||||
RestoreFromDatePicker(
|
RestoreFromDatePicker(
|
||||||
|
|
|
@ -409,8 +409,9 @@ class _GenerateUriQrCodeViewState extends State<GenerateUriQrCodeView> {
|
||||||
height: 1.8,
|
height: 1.8,
|
||||||
)
|
)
|
||||||
: STextStyles.field(context),
|
: STextStyles.field(context),
|
||||||
keyboardType:
|
keyboardType: Util.isDesktop
|
||||||
const TextInputType.numberWithOptions(decimal: true),
|
? null
|
||||||
|
: const TextInputType.numberWithOptions(decimal: true),
|
||||||
onChanged: (_) => setState(() {}),
|
onChanged: (_) => setState(() {}),
|
||||||
decoration: standardInputDecoration(
|
decoration: standardInputDecoration(
|
||||||
"Amount",
|
"Amount",
|
||||||
|
|
|
@ -1111,7 +1111,9 @@ class _SendViewState extends ConsumerState<SendView> {
|
||||||
const Key("amountInputFieldCryptoTextFieldKey"),
|
const Key("amountInputFieldCryptoTextFieldKey"),
|
||||||
controller: cryptoAmountController,
|
controller: cryptoAmountController,
|
||||||
focusNode: _cryptoFocus,
|
focusNode: _cryptoFocus,
|
||||||
keyboardType: const TextInputType.numberWithOptions(
|
keyboardType: Util.isDesktop
|
||||||
|
? null
|
||||||
|
: const TextInputType.numberWithOptions(
|
||||||
signed: false,
|
signed: false,
|
||||||
decimal: true,
|
decimal: true,
|
||||||
),
|
),
|
||||||
|
@ -1168,8 +1170,9 @@ class _SendViewState extends ConsumerState<SendView> {
|
||||||
const Key("amountInputFieldFiatTextFieldKey"),
|
const Key("amountInputFieldFiatTextFieldKey"),
|
||||||
controller: baseAmountController,
|
controller: baseAmountController,
|
||||||
focusNode: _baseFocus,
|
focusNode: _baseFocus,
|
||||||
keyboardType:
|
keyboardType: Util.isDesktop
|
||||||
const TextInputType.numberWithOptions(
|
? null
|
||||||
|
: const TextInputType.numberWithOptions(
|
||||||
signed: false,
|
signed: false,
|
||||||
decimal: true,
|
decimal: true,
|
||||||
),
|
),
|
||||||
|
|
|
@ -391,7 +391,8 @@ class _EpiBoxInfoFormState extends ConsumerState<EpicBoxInfoForm> {
|
||||||
enableSuggestions: Util.isDesktop ? false : true,
|
enableSuggestions: Util.isDesktop ? false : true,
|
||||||
controller: portController,
|
controller: portController,
|
||||||
decoration: const InputDecoration(hintText: "Port"),
|
decoration: const InputDecoration(hintText: "Port"),
|
||||||
keyboardType: const TextInputType.numberWithOptions(),
|
keyboardType:
|
||||||
|
Util.isDesktop ? null : const TextInputType.numberWithOptions(),
|
||||||
),
|
),
|
||||||
const SizedBox(
|
const SizedBox(
|
||||||
height: 8,
|
height: 8,
|
||||||
|
|
|
@ -739,7 +739,9 @@ class _TransactionSearchViewState
|
||||||
controller: _amountTextEditingController,
|
controller: _amountTextEditingController,
|
||||||
focusNode: amountTextFieldFocusNode,
|
focusNode: amountTextFieldFocusNode,
|
||||||
onChanged: (_) => setState(() {}),
|
onChanged: (_) => setState(() {}),
|
||||||
keyboardType: const TextInputType.numberWithOptions(
|
keyboardType: Util.isDesktop
|
||||||
|
? null
|
||||||
|
: const TextInputType.numberWithOptions(
|
||||||
signed: false,
|
signed: false,
|
||||||
decimal: true,
|
decimal: true,
|
||||||
),
|
),
|
||||||
|
|
|
@ -42,6 +42,9 @@ class _ContactListItemState extends ConsumerState<ContactListItem> {
|
||||||
final contact = ref.watch(addressBookServiceProvider
|
final contact = ref.watch(addressBookServiceProvider
|
||||||
.select((value) => value.getContactById(contactId)));
|
.select((value) => value.getContactById(contactId)));
|
||||||
|
|
||||||
|
// hack fix until we use a proper database (not Hive)
|
||||||
|
int i = 0;
|
||||||
|
|
||||||
return RoundedWhiteContainer(
|
return RoundedWhiteContainer(
|
||||||
padding: const EdgeInsets.all(0),
|
padding: const EdgeInsets.all(0),
|
||||||
borderColor: Theme.of(context).extension<StackColors>()!.background,
|
borderColor: Theme.of(context).extension<StackColors>()!.background,
|
||||||
|
@ -70,7 +73,8 @@ class _ContactListItemState extends ConsumerState<ContactListItem> {
|
||||||
filterByCoin != null ? e.coin == filterByCoin! : true)
|
filterByCoin != null ? e.coin == filterByCoin! : true)
|
||||||
.map(
|
.map(
|
||||||
(e) => Column(
|
(e) => Column(
|
||||||
key: Key("contactAddress_${e.address}_${e.label}_key"),
|
key: Key(
|
||||||
|
"contactAddress_${e.address}_${e.label}_${++i}_key"),
|
||||||
mainAxisSize: MainAxisSize.min,
|
mainAxisSize: MainAxisSize.min,
|
||||||
children: [
|
children: [
|
||||||
Container(
|
Container(
|
||||||
|
|
|
@ -140,10 +140,9 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
|
||||||
const SizedBox(
|
const SizedBox(
|
||||||
height: 40,
|
height: 40,
|
||||||
),
|
),
|
||||||
Padding(
|
Row(
|
||||||
padding: const EdgeInsets.only(
|
children: [
|
||||||
right: 32,
|
Expanded(
|
||||||
),
|
|
||||||
child: SecondaryButton(
|
child: SecondaryButton(
|
||||||
buttonHeight: ButtonHeight.l,
|
buttonHeight: ButtonHeight.l,
|
||||||
label: "Ok",
|
label: "Ok",
|
||||||
|
@ -152,6 +151,11 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
const SizedBox(
|
||||||
|
width: 32,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
@ -319,13 +323,13 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!wasCancelled && mounted) {
|
if (!wasCancelled && mounted) {
|
||||||
|
txData["note"] = _note ?? "";
|
||||||
|
txData["address"] = _address;
|
||||||
// pop building dialog
|
// pop building dialog
|
||||||
Navigator.of(
|
Navigator.of(
|
||||||
context,
|
context,
|
||||||
rootNavigator: true,
|
rootNavigator: true,
|
||||||
).pop();
|
).pop();
|
||||||
txData["note"] = _note;
|
|
||||||
txData["address"] = _address;
|
|
||||||
|
|
||||||
unawaited(
|
unawaited(
|
||||||
showDialog(
|
showDialog(
|
||||||
|
@ -394,14 +398,12 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
|
||||||
const SizedBox(
|
const SizedBox(
|
||||||
height: 40,
|
height: 40,
|
||||||
),
|
),
|
||||||
Padding(
|
Row(
|
||||||
padding: const EdgeInsets.only(
|
children: [
|
||||||
right: 32,
|
Expanded(
|
||||||
),
|
|
||||||
child: Expanded(
|
|
||||||
child: SecondaryButton(
|
child: SecondaryButton(
|
||||||
buttonHeight: ButtonHeight.l,
|
buttonHeight: ButtonHeight.l,
|
||||||
label: "Yes",
|
label: "Ok",
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
Navigator.of(
|
Navigator.of(
|
||||||
context,
|
context,
|
||||||
|
@ -410,6 +412,10 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
const SizedBox(
|
||||||
|
width: 32,
|
||||||
|
),
|
||||||
|
],
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
@ -1002,7 +1008,9 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
|
||||||
key: const Key("amountInputFieldCryptoTextFieldKey"),
|
key: const Key("amountInputFieldCryptoTextFieldKey"),
|
||||||
controller: cryptoAmountController,
|
controller: cryptoAmountController,
|
||||||
focusNode: _cryptoFocus,
|
focusNode: _cryptoFocus,
|
||||||
keyboardType: const TextInputType.numberWithOptions(
|
keyboardType: Util.isDesktop
|
||||||
|
? null
|
||||||
|
: const TextInputType.numberWithOptions(
|
||||||
signed: false,
|
signed: false,
|
||||||
decimal: true,
|
decimal: true,
|
||||||
),
|
),
|
||||||
|
@ -1056,7 +1064,9 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
|
||||||
key: const Key("amountInputFieldFiatTextFieldKey"),
|
key: const Key("amountInputFieldFiatTextFieldKey"),
|
||||||
controller: baseAmountController,
|
controller: baseAmountController,
|
||||||
focusNode: _baseFocus,
|
focusNode: _baseFocus,
|
||||||
keyboardType: const TextInputType.numberWithOptions(
|
keyboardType: Util.isDesktop
|
||||||
|
? null
|
||||||
|
: const TextInputType.numberWithOptions(
|
||||||
signed: false,
|
signed: false,
|
||||||
decimal: true,
|
decimal: true,
|
||||||
),
|
),
|
||||||
|
|
|
@ -4,6 +4,7 @@ import 'package:flutter_svg/svg.dart';
|
||||||
import 'package:stackwallet/utilities/assets.dart';
|
import 'package:stackwallet/utilities/assets.dart';
|
||||||
import 'package:stackwallet/utilities/text_styles.dart';
|
import 'package:stackwallet/utilities/text_styles.dart';
|
||||||
import 'package:stackwallet/utilities/theme/stack_colors.dart';
|
import 'package:stackwallet/utilities/theme/stack_colors.dart';
|
||||||
|
import 'package:stackwallet/utilities/util.dart';
|
||||||
import 'package:stackwallet/widgets/loading_indicator.dart';
|
import 'package:stackwallet/widgets/loading_indicator.dart';
|
||||||
|
|
||||||
class ExchangeTextField extends StatefulWidget {
|
class ExchangeTextField extends StatefulWidget {
|
||||||
|
@ -62,6 +63,8 @@ class _ExchangeTextFieldState extends State<ExchangeTextField> {
|
||||||
late final void Function(String)? onChanged;
|
late final void Function(String)? onChanged;
|
||||||
late final void Function(String)? onSubmitted;
|
late final void Function(String)? onSubmitted;
|
||||||
|
|
||||||
|
final isDesktop = Util.isDesktop;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
borderRadius = widget.borderRadius;
|
borderRadius = widget.borderRadius;
|
||||||
|
@ -100,7 +103,9 @@ class _ExchangeTextFieldState extends State<ExchangeTextField> {
|
||||||
enableSuggestions: false,
|
enableSuggestions: false,
|
||||||
autocorrect: false,
|
autocorrect: false,
|
||||||
readOnly: widget.readOnly,
|
readOnly: widget.readOnly,
|
||||||
keyboardType: const TextInputType.numberWithOptions(
|
keyboardType: isDesktop
|
||||||
|
? null
|
||||||
|
: const TextInputType.numberWithOptions(
|
||||||
signed: false,
|
signed: false,
|
||||||
decimal: true,
|
decimal: true,
|
||||||
),
|
),
|
||||||
|
|
Loading…
Reference in a new issue