From 6364766b1f2b708fa2d591eed6911ce740ae6b0d Mon Sep 17 00:00:00 2001 From: Philipp Hoenisch Date: Tue, 19 Mar 2024 14:03:09 +1000 Subject: [PATCH] chore: rename field to avoid confusion --- mobile/lib/common/amount_input_modalised.dart | 2 +- mobile/lib/common/amount_text_input_form_field.dart | 6 +++--- mobile/lib/features/trade/channel_configuration.dart | 2 +- mobile/lib/features/trade/trade_bottom_sheet_tab.dart | 2 +- mobile/lib/features/wallet/send/fee_picker.dart | 2 +- .../frontend/lib/common/amount_text_input_form_field.dart | 6 +++--- webapp/frontend/lib/trade/trade_screen_order_form.dart | 2 +- webapp/frontend/lib/wallet/send_screen.dart | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/mobile/lib/common/amount_input_modalised.dart b/mobile/lib/common/amount_input_modalised.dart index 524b77e62..c0957aa6b 100644 --- a/mobile/lib/common/amount_input_modalised.dart +++ b/mobile/lib/common/amount_input_modalised.dart @@ -110,7 +110,7 @@ class _EnterAmountModalState extends State { crossAxisAlignment: CrossAxisAlignment.stretch, children: [ AmountInputField( - value: widget.amount != null ? Amount(widget.amount!) : Amount.zero(), + initialValue: widget.amount != null ? Amount(widget.amount!) : Amount.zero(), hint: "e.g. $hint", label: "Amount", validator: widget.validator, diff --git a/mobile/lib/common/amount_text_input_form_field.dart b/mobile/lib/common/amount_text_input_form_field.dart index 286cd9ad0..3f4d5b136 100644 --- a/mobile/lib/common/amount_text_input_form_field.dart +++ b/mobile/lib/common/amount_text_input_form_field.dart @@ -12,7 +12,7 @@ class AmountInputField extends StatelessWidget { this.label = '', this.hint = '', this.onChanged, - required this.value, + required this.initialValue, this.isLoading = false, this.suffixIcon, this.controller, @@ -23,7 +23,7 @@ class AmountInputField extends StatelessWidget { final TextEditingController? controller; final TextStyle? style; - final Amount value; + final Amount initialValue; final bool enabled; final String label; final String hint; @@ -41,7 +41,7 @@ class AmountInputField extends StatelessWidget { style: style ?? const TextStyle(color: Colors.black87, fontSize: 16), enabled: enabled, controller: controller, - initialValue: controller != null ? null : value.formatted(), + initialValue: controller != null ? null : initialValue.formatted(), keyboardType: TextInputType.number, decoration: decoration ?? InputDecoration( diff --git a/mobile/lib/features/trade/channel_configuration.dart b/mobile/lib/features/trade/channel_configuration.dart index ed816b282..57f62ddcf 100644 --- a/mobile/lib/features/trade/channel_configuration.dart +++ b/mobile/lib/features/trade/channel_configuration.dart @@ -189,7 +189,7 @@ class _ChannelConfiguration extends State { children: [ Flexible( child: AmountInputField( - value: ownTotalCollateral, + initialValue: ownTotalCollateral, controller: _collateralController, label: 'Your collateral (sats)', onChanged: (value) { diff --git a/mobile/lib/features/trade/trade_bottom_sheet_tab.dart b/mobile/lib/features/trade/trade_bottom_sheet_tab.dart index 68aa7a102..e855955aa 100644 --- a/mobile/lib/features/trade/trade_bottom_sheet_tab.dart +++ b/mobile/lib/features/trade/trade_bottom_sheet_tab.dart @@ -224,7 +224,7 @@ class _TradeBottomSheetTabState extends State { children: [ Flexible( child: AmountInputField( - value: tradeValues.quantity ?? Amount.zero(), + initialValue: tradeValues.quantity ?? Amount.zero(), hint: "e.g. 100 USD", label: "Quantity (USD)", onChanged: (value) { diff --git a/mobile/lib/features/wallet/send/fee_picker.dart b/mobile/lib/features/wallet/send/fee_picker.dart index 9a0f6bcdc..1fa3c67cf 100644 --- a/mobile/lib/features/wallet/send/fee_picker.dart +++ b/mobile/lib/features/wallet/send/fee_picker.dart @@ -198,7 +198,7 @@ class _FeePickerModalState extends State<_FeePickerModal> { "sats/vbyte", style: TextStyle(fontSize: 16, color: Color(0xff878787)), )), - value: Amount(1)), + initialValue: Amount(1)), ), ), const SizedBox(height: 25), diff --git a/webapp/frontend/lib/common/amount_text_input_form_field.dart b/webapp/frontend/lib/common/amount_text_input_form_field.dart index 5bade5e71..f0eb05121 100644 --- a/webapp/frontend/lib/common/amount_text_input_form_field.dart +++ b/webapp/frontend/lib/common/amount_text_input_form_field.dart @@ -13,7 +13,7 @@ class AmountInputField extends StatelessWidget { this.label = '', this.hint = '', this.onChanged, - this.value, + this.initialValue, this.isLoading = false, this.infoText, this.controller, @@ -27,7 +27,7 @@ class AmountInputField extends StatelessWidget { final TextEditingController? controller; final TextStyle? style; - final Formattable? value; + final Formattable? initialValue; final bool enabled; final String label; final String hint; @@ -48,7 +48,7 @@ class AmountInputField extends StatelessWidget { enabled: enabled, controller: controller, textAlign: textAlign, - initialValue: controller != null ? null : value?.formatted(), + initialValue: controller != null ? null : initialValue?.formatted(), keyboardType: TextInputType.number, decoration: decoration ?? InputDecoration( diff --git a/webapp/frontend/lib/trade/trade_screen_order_form.dart b/webapp/frontend/lib/trade/trade_screen_order_form.dart index a9bb06d3a..0c404ab42 100644 --- a/webapp/frontend/lib/trade/trade_screen_order_form.dart +++ b/webapp/frontend/lib/trade/trade_screen_order_form.dart @@ -57,7 +57,7 @@ class _NewOrderForm extends State { Align( alignment: AlignmentDirectional.centerEnd, child: AmountInputField( - value: _quantity, + initialValue: _quantity, enabled: true, label: "Quantity", textAlign: TextAlign.right, diff --git a/webapp/frontend/lib/wallet/send_screen.dart b/webapp/frontend/lib/wallet/send_screen.dart index 6960b279b..4db3f56fe 100644 --- a/webapp/frontend/lib/wallet/send_screen.dart +++ b/webapp/frontend/lib/wallet/send_screen.dart @@ -73,7 +73,7 @@ class _SendScreenState extends State { ), const SizedBox(height: 20), AmountInputField( - value: amount != null ? amount! : Amount.zero(), + initialValue: amount != null ? amount! : Amount.zero(), label: "Amount in sats", controller: _amountController, validator: (value) { @@ -88,7 +88,7 @@ class _SendScreenState extends State { ), const SizedBox(height: 20), AmountInputField( - value: fee != null ? fee! : Amount.zero(), + initialValue: fee != null ? fee! : Amount.zero(), label: "Sats/vb", controller: _feeController, validator: (value) {