Fix/format input value

integration_test/e2e_stake_unstake.dart

@@ -48,8 +48,9 @@ Future<void> e2eStakeUnstakeTest(WidgetTester tester) async {
   await tester.pumpAndSettle();
   await tapButton(tester, localization.stakeUnstake, semantics: true);
   await tapButton(tester, localization.stake);
-  expect(widgetByText(localization.sendStakeTransaction), findsOneWidget);
-  await tapButton(tester, localization.stakeUnstake, semantics: true);
+  expect(widgetByText(localization.disableStakeTitle), findsOneWidget);
+  await tapButton(tester, localization.close);
+  await tester.pumpAndSettle();
   await tapButton(tester, localization.unstake);
   expect(widgetByText(localization.emptyStakeTitle), findsOneWidget);
 

lib/constants.dart

@@ -193,3 +193,7 @@ const List<String> CUSTOM_ICON_NAMES = [
   'myWitWallet-title',
   'myWitWallet-title-dark'
 ];
+double ONE_WIT_TO_NANO = 1000000000;
+double MAX_STAKING_AMOUNT_NANOWIT = 10000000 * ONE_WIT_TO_NANO;
+double MIN_STAKING_AMOUNT_NANOWIT = 10000 * ONE_WIT_TO_NANO;
+String DEFAULT_WALLET_ID = '00000000';

lib/l10n/app_en.arb

@@ -355,5 +355,7 @@
 	"feesAndRewards": "Fees and rewards",
 	"totalDataSynced": "Scan summary",
 	"welcomeBack": "Welcome back",
-	"deleteWalletSettings": "Settings: Delete wallet"
+	"deleteWalletSettings": "Settings: Delete wallet",
+	"disableStakeTitle": "You don't have enough balance to stake",
+	"disableStakeMessage": "The minimun amount to stake is 10,000 WIT"
 }

lib/l10n/app_es.arb

@@ -355,5 +355,7 @@
 	"feesAndRewards": "Tasas y Recompensas",
 	"totalDataSynced": "Resumen de la sincronización",
 	"deleteWalletSettings": "Configuración: Eliminar wallet",
-	"welcomeBack": "Bienvenido de nuevo"
+	"welcomeBack": "Bienvenido de nuevo",
+	"disableStakeTitle": "No tienes suficiente balance para hacer Stake",
+	"disableStakeMessage": "La cantidad minima para hacer Stake es de 10.000 WIT"
 }

lib/screens/create_wallet/enc_xprv_card.dart

@@ -100,10 +100,10 @@ class EnterXprvCardState extends State<EnterEncryptedXprvCard>
   }
 
   void setXprv(String value) {
-      xprv = XprvInput.dirty(
-          xprvType: _xprvType,
-          allowValidation: validationUtils.isFormUnFocus(_formFocusElements),
-          value: value);
+    xprv = XprvInput.dirty(
+        xprvType: _xprvType,
+        allowValidation: validationUtils.isFormUnFocus(_formFocusElements),
+        value: value);
   }
 
   void clearForm() {

lib/util/storage/database/wallet.dart

@@ -48,7 +48,7 @@ class Wallet {
     required this.internalAccounts,
     this.lastSynced = -1,
   }) {
-    this.id = '00000000';
+    this.id = DEFAULT_WALLET_ID;
     this.externalAccounts.forEach((key, Account account) {
       account.balance;
     });

lib/widgets/inputs/input_amount.dart

@@ -3,12 +3,9 @@ import 'package:my_wit_wallet/util/get_localization.dart';
 import 'package:my_wit_wallet/constants.dart';
 import 'package:my_wit_wallet/widgets/buttons/text_btn.dart';
 import 'package:my_wit_wallet/widgets/inputs/input_text.dart';
-import 'package:my_wit_wallet/widgets/validations/vtt_amount_input.dart';
-
 
 class InputAmount extends InputText {
   InputAmount({
-    required this.amount,
     required super.focusNode,
     required super.styledTextController,
     super.prefixIcon,
@@ -17,7 +14,6 @@ class InputAmount extends InputText {
     super.hint,
     super.keyboardType,
     super.obscureText,
-    this.route,
     super.onChanged,
     super.onEditingComplete,
     super.onFieldSubmitted,
@@ -27,16 +23,11 @@ class InputAmount extends InputText {
     super.inputFormatters,
   });
 
-  final VttAmountInput amount;
-  final String? route;
-
   @override
   _InputAmountState createState() => _InputAmountState();
 }
 
 class _InputAmountState extends State<InputAmount> {
-  TextSelection? lastSelection;
-
   @override
   void initState() {
     super.initState();

lib/widgets/inputs/input_slider.dart

@@ -1,12 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:my_wit_wallet/util/get_localization.dart';
 import 'package:my_wit_wallet/constants.dart';
+import 'package:my_wit_wallet/util/extensions/num_extensions.dart';
+import 'package:my_wit_wallet/widgets/inputs/input_amount.dart';
 
 import 'input_text.dart';
 
 class InputSlider extends InputText {
   InputSlider({
-    String? route,
     required this.maxAmount,
     required this.minAmount,
     required super.focusNode,
@@ -24,6 +25,7 @@ class InputSlider extends InputText {
     super.onTap,
     super.onSuffixTap,
     super.inputFormatters,
+    super.enabled,
   });
 
   final double maxAmount;
@@ -48,6 +50,16 @@ class _InputSliderState extends State<InputSlider> {
     widget.focusNode.removeListener(widget.onFocusChange);
   }
 
+  double getSliderValue({maxAmount, value, minAmount}) {
+    if (value >= maxAmount) {
+      return maxAmount;
+    } else if (value <= minAmount) {
+      return minAmount;
+    } else {
+      return value;
+    }
+  }
+
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
 
@@ -58,42 +70,49 @@ class _InputSliderState extends State<InputSlider> {
 
     String? inputValue = widget.styledTextController.text;
     double sliderValue = 0;
+    bool isSliderDisabled = widget.maxAmount < widget.minAmount;
+    double maxAmount = isSliderDisabled ? 0 : widget.maxAmount;
+    double minAmount = isSliderDisabled ? 0 : widget.minAmount;
     try {
       sliderValue = inputValue != '' ? double.parse(inputValue) : 0;
     } catch (err) {
       print('Error parsing sliderValue $inputValue');
     }
     return Column(children: [
       Container(
-        child: widget.buildInput(
-          context: context,
-          decoration: InputDecoration(
-            hintText: widget.hint ?? localization.inputAmountHint,
-            errorText: widget.errorText,
-            prefixIcon:
-                widget.prefixIcon != null ? Icon(widget.prefixIcon) : null,
-            suffixText: WIT_UNIT[WitUnit.Wit],
-            suffixIconConstraints: BoxConstraints(minHeight: 44),
-          ),
+        child: InputAmount(
+          hint: localization.amount,
+          validator: (String? amount) => widget.errorText ?? null,
+          errorText: widget.errorText,
+          styledTextController: widget.styledTextController,
+          focusNode: widget.focusNode,
+          keyboardType: TextInputType.number,
+          onChanged: widget.onChanged,
+          onTap: widget.onTap,
+          inputFormatters: widget.inputFormatters,
+          onFieldSubmitted: widget.onFieldSubmitted,
+          onEditingComplete: widget.onEditingComplete,
         ),
       ),
       SizedBox(height: 8),
       Column(children: [
         Slider(
-          value:
-              sliderValue >= widget.maxAmount ? widget.maxAmount : sliderValue,
-          max: widget.maxAmount,
-          min: widget.minAmount,
+          value: getSliderValue(
+              maxAmount: maxAmount, minAmount: minAmount, value: sliderValue),
+          max: maxAmount,
+          min: minAmount,
           label: sliderValue.toString(),
           onChanged: (double value) =>
               {widget.onChanged!(value.toStringAsFixed(9))},
         ),
         Row(
           children: [
-            Text('Min ${widget.minAmount} ${WIT_UNIT[WitUnit.Wit]}',
+            Text(
+                'Min ${widget.minAmount.standardizeWitUnits(inputUnit: WitUnit.Wit, outputUnit: WitUnit.Wit)} ${WIT_UNIT[WitUnit.Wit]}',
                 style: theme.textTheme.bodySmall),
             Spacer(),
-            Text('Max ${widget.maxAmount} ${WIT_UNIT[WitUnit.Wit]}',
+            Text(
+                'Max ${widget.maxAmount.standardizeWitUnits(inputUnit: WitUnit.Wit, outputUnit: WitUnit.Wit)} ${WIT_UNIT[WitUnit.Wit]}',
                 style: theme.textTheme.bodySmall),
           ],
         )

lib/widgets/inputs/input_text.dart

@@ -30,6 +30,7 @@ abstract class InputText extends StatefulWidget {
     this.textInputAction,
     this.maxLines,
     this.minLines,
+    this.enabled = true,
   });
   final IconData? prefixIcon;
   final FocusNode focusNode;
@@ -52,11 +53,13 @@ abstract class InputText extends StatefulWidget {
   final int? maxLines;
   final int? minLines;
   final TextInputAction? textInputAction;
+  final bool enabled;
 
   Widget buildInput(
       {required BuildContext context, InputDecoration? decoration = null}) {
     return TextFormField(
       decoration: decoration ?? decoration,
+      enabled: enabled,
       minLines: minLines,
       maxLines: maxLines ?? 1,
       keyboardType: keyboardType,

lib/widgets/layouts/dashboard_layout.dart

@@ -1,6 +1,8 @@
 import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:my_wit_wallet/constants.dart';
+import 'package:my_wit_wallet/screens/dashboard/bloc/dashboard_bloc.dart';
+import 'package:my_wit_wallet/util/clear_and_redirect.dart';
 import 'package:my_wit_wallet/util/current_route.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:my_wit_wallet/screens/login/bloc/login_bloc.dart';
@@ -91,6 +93,22 @@ class DashboardLayoutState extends State<DashboardLayout>
             });
   }
 
+  Widget _buildDashboardListener(Widget content) {
+    return BlocListener<DashboardBloc, DashboardState>(
+        listenWhen: (previousState, currentState) {
+          if ((previousState.currentWalletId != DEFAULT_WALLET_ID) &&
+              (previousState.currentWalletId != currentState.currentWalletId)) {
+            clearAndRedirectToDashboard(context);
+          }
+          return true;
+        },
+        listener: (BuildContext context, DashboardState state) {},
+        child: BlocBuilder<DashboardBloc, DashboardState>(
+            builder: (BuildContext context, DashboardState state) {
+          return content;
+        }));
+  }
+
   Widget _authBuilder() {
     final theme = Theme.of(context);
     return BlocListener<LoginBloc, LoginState>(
@@ -155,7 +173,7 @@ class DashboardLayoutState extends State<DashboardLayout>
               .getNavigationActions(context),
           isDashboard: true,
           bottomNavigation: _buildBottomNavigation(),
-          widgetList: [_body, SizedBox(height: 16)],
+          widgetList: [_buildDashboardListener(_body), SizedBox(height: 16)],
           actions: [],
           slidingPanel: panelContent,
         );

lib/widgets/layouts/send_transaction_layout.dart

@@ -6,7 +6,6 @@ import 'package:my_wit_wallet/bloc/transactions/value_transfer/vtt_create/vtt_cr
 import 'package:my_wit_wallet/shared/api_database.dart';
 import 'package:my_wit_wallet/shared/locator.dart';
 import 'package:my_wit_wallet/util/storage/database/wallet_storage.dart';
-import 'package:my_wit_wallet/screens/dashboard/bloc/dashboard_bloc.dart';
 import 'package:my_wit_wallet/widgets/buttons/custom_btn.dart';
 import 'package:my_wit_wallet/widgets/layouts/dashboard_layout.dart';
 import 'package:my_wit_wallet/widgets/step_bar.dart';
@@ -261,37 +260,6 @@ class SendTransactionLayoutState extends State<SendTransactionLayout>
     );
   }
 
-  BlocListener _dashboardBlocListener() {
-    return BlocListener<DashboardBloc, DashboardState>(
-      listener: (BuildContext context, DashboardState state) {
-        BlocProvider.of<TransactionBloc>(context).add(ResetTransactionEvent());
-        Navigator.pushReplacement(
-            context,
-            CustomPageRoute(
-                builder: (BuildContext context) {
-                  return SendTransactionLayout(
-                    routeName: widget.routeName,
-                    transactionType: widget.transactionType,
-                  );
-                },
-                maintainState: false,
-                settings: RouteSettings(name: widget.routeName)));
-      },
-      child: _dashboardBlocBuilder(),
-    );
-  }
-
-  BlocBuilder _dashboardBlocBuilder() {
-    return BlocBuilder<DashboardBloc, DashboardState>(
-        builder: (BuildContext context, DashboardState state) {
-      return DashboardLayout(
-        scrollController: scrollController,
-        dashboardChild: _transactionBlocListener(),
-        actions: [],
-      );
-    });
-  }
-
   BlocListener _transactionBlocListener() {
     final theme = Theme.of(context);
     return BlocListener<TransactionBloc, TransactionState>(
@@ -328,7 +296,11 @@ class SendTransactionLayoutState extends State<SendTransactionLayout>
   Widget build(BuildContext context) {
     return BlocBuilder<TransactionBloc, TransactionState>(
         builder: (context, state) {
-      return _dashboardBlocListener();
+      return DashboardLayout(
+        scrollController: scrollController,
+        dashboardChild: _transactionBlocListener(),
+        actions: [],
+      );
     });
   }
 }

lib/widgets/stake_unstake.dart

@@ -1,5 +1,6 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:my_wit_wallet/bloc/transactions/value_transfer/vtt_create/vtt_create_bloc.dart';
+import 'package:my_wit_wallet/constants.dart';
 import 'package:my_wit_wallet/screens/dashboard/view/dashboard_screen.dart';
 import 'package:my_wit_wallet/screens/stake/stake_screen.dart';
 import 'package:my_wit_wallet/screens/unstake/unstake_screen.dart';
@@ -15,6 +16,7 @@ import 'package:my_wit_wallet/widgets/buttons/custom_btn.dart';
 import 'package:my_wit_wallet/widgets/buttons/icon_btn.dart';
 import 'package:my_wit_wallet/widgets/layouts/dashboard_layout.dart';
 import 'package:flutter/material.dart';
+import 'package:my_wit_wallet/widgets/witnet/transactions/value_transfer/modals/disable_stake_modal.dart';
 import 'package:my_wit_wallet/widgets/witnet/transactions/value_transfer/modals/empty_stake_modal.dart';
 
 typedef void VoidCallback();
@@ -28,17 +30,28 @@ class StakeUnstakeButtons extends StatelessWidget {
     ApiDatabase db = Locator.instance.get<ApiDatabase>();
     Wallet currentWallet = db.walletStorage.currentWallet;
     late StakedBalanceInfo stakeInfo = currentWallet.stakedNanoWit();
+    bool allowStake = MIN_STAKING_AMOUNT_NANOWIT <
+        currentWallet.balanceNanoWit().availableNanoWit;
 
     Future<void> _goToStakeScreen() async {
-      BlocProvider.of<TransactionBloc>(context).add(ResetTransactionEvent());
-      Navigator.push(
-          context,
-          CustomPageRoute(
-              builder: (BuildContext context) {
-                return StakeScreen();
-              },
-              maintainState: false,
-              settings: RouteSettings(name: StakeScreen.route)));
+      if (allowStake) {
+        BlocProvider.of<TransactionBloc>(context).add(ResetTransactionEvent());
+        Navigator.push(
+            context,
+            CustomPageRoute(
+                builder: (BuildContext context) {
+                  return StakeScreen();
+                },
+                maintainState: false,
+                settings: RouteSettings(name: StakeScreen.route)));
+      } else {
+        ScaffoldMessenger.of(context).clearSnackBars();
+        buildDisableStakeModal(
+            theme: theme,
+            context: context,
+            originRouteName: DashboardScreen.route,
+            originRoute: DashboardScreen());
+      }
     }
 
     Future<void> _goToUnstakeScreen() async {
@@ -56,6 +69,7 @@ class StakeUnstakeButtons extends StatelessWidget {
         ScaffoldMessenger.of(context).clearSnackBars();
         buildEmptyStakeModal(
             theme: theme,
+            allowStake: allowStake,
             context: context,
             originRouteName: DashboardScreen.route,
             originRoute: DashboardScreen());