fix: staking (#661)

* fix: improve pwd creation ux * fix: hide asset select arrow if only 1 asset; improve `max` button dx; * feat: add staking withdraw hint; fix `AmountInput` tap area; * chore: review --------- Co-authored-by: Egor Komarov <egor.komarov@bf.rocks>
broxus · Dec 3, 2024 · eb6c13b · eb6c13b
1 parent f7de565
commit eb6c13b
Show file tree

Hide file tree

Showing 12 changed files with 158 additions and 66 deletions.
diff --git a/assets/translations/en.json b/assets/translations/en.json
@@ -431,7 +431,8 @@
   "stEverAppearInMinutes": "stEVER will appear in your account within a couple of minutes",
   "stEverReturnInMinutes": "stEVER will be returned in your account within a couple of minutes",
   "withdrawHoursNote": "Your tokens will be withdrawn from staking within {} hours, once the staking round is complete.",
-  "withdrawHousProgress": "EVER will appear in your account within {} hours",
+  "withdrawHoursProgress": "EVER will appear in your account within {} hours",
+  "withdrawHoursHint": "Your tokens will be withdrawn from staking within {} hours, once the staking round is complete.",
   "cancelUnstaking": "Cancel unstaking",
   "cancelUnstakingNote": "You can cancel unstaking, then stEVER will be returned to your account",
   "unstakingCancelled": "Unstaking cancelled",

diff --git a/assets/translations/ko.json b/assets/translations/ko.json
@@ -431,7 +431,8 @@
   "stEverAppearInMinutes": "stEVER will appear in your account within a couple of minutes",
   "stEverReturnInMinutes": "stEVER will be returned in your account within a couple of minutes",
   "withdrawHoursNote": "Your tokens will be withdrawn from staking within {} hours, once the staking round is complete.",
-  "withdrawHousProgress": "EVER will appear in your account within {} hours",
+  "withdrawHoursProgress": "EVER will appear in your account within {} hours",
+  "withdrawHoursHint": "Your tokens will be withdrawn from staking within {} hours, once the staking round is complete.",
   "cancelUnstaking": "Cancel unstaking",
   "cancelUnstakingNote": "You can cancel unstaking, then stEVER will be returned to your account",
   "unstakingCancelled": "Unstaking cancelled",

diff --git a/lib/feature/add_seed/create_password/view/create_seed_password_view.dart b/lib/feature/add_seed/create_password/view/create_seed_password_view.dart
@@ -1,6 +1,7 @@
 import 'package:app/feature/add_seed/create_password/model/password_status.dart';
 import 'package:app/feature/add_seed/create_password/widgets/password_info_section.dart';
 import 'package:app/generated/generated.dart';
+import 'package:app/utils/focus_utils.dart';
 import 'package:flutter/material.dart';
 import 'package:ui_components_lib/ui_components_lib.dart';
 import 'package:ui_components_lib/v2/ui_components_lib_v2.dart';
@@ -30,14 +31,15 @@ class CreateSeedPasswordView extends StatefulWidget {
 
 class _CreateSeedPasswordViewState extends State<CreateSeedPasswordView> {
   final ScrollController _scrollController = ScrollController();
-  final FocusNode _focusNode = FocusNode();
+  final FocusNode _pwd1focusNode = FocusNode();
+  final FocusNode _pwd2focusNode = FocusNode();
 
   @override
   void initState() {
     super.initState();
 
-    _focusNode.addListener(() {
-      if (_focusNode.hasFocus) {
+    _pwd1focusNode.addListener(() {
+      if (_pwd1focusNode.hasFocus) {
         _scrollToBottom();
       }
     });
@@ -71,15 +73,20 @@ class _CreateSeedPasswordViewState extends State<CreateSeedPasswordView> {
                     ),
                     const SizedBox(height: DimensSize.d24),
                     SecureTextField(
-                      focusNode: _focusNode,
+                      focusNode: _pwd1focusNode,
                       hintText: LocaleKeys.confirmSetPasswordHint.tr(),
                       textEditingController: widget.passwordController,
+                      textInputAction: TextInputAction.next,
+                      isAutofocus: true,
+                      onSubmit: _onPwd1Submit,
                     ),
                     const SizedBox(height: DimensSize.d8),
                     SecureTextField(
+                      focusNode: _pwd2focusNode,
                       hintText: LocaleKeys.confirmRepeatPasswordHint.tr(),
                       textEditingController: widget.confirmController,
                       textInputAction: TextInputAction.done,
+                      onSubmit: _onPwd2Submit,
                     ),
                     const SizedBox(height: DimensSize.d24),
                     PasswordInfoSection(
@@ -107,7 +114,8 @@ class _CreateSeedPasswordViewState extends State<CreateSeedPasswordView> {
 
   @override
   void dispose() {
-    _focusNode.dispose();
+    _pwd1focusNode.dispose();
+    _pwd2focusNode.dispose();
     _scrollController.dispose();
     super.dispose();
   }
@@ -127,4 +135,12 @@ class _CreateSeedPasswordViewState extends State<CreateSeedPasswordView> {
       }
     });
   }
+
+  void _onPwd1Submit(String? _) => requestFocus(context, _pwd2focusNode);
+
+  void _onPwd2Submit(String? _) {
+    if (widget.passwordStatus == PasswordStatus.match) {
+      widget.onPressedNext();
+    }
+  }
 }
diff --git a/lib/feature/wallet/staking/bloc/staking_bloc.dart b/lib/feature/wallet/staking/bloc/staking_bloc.dart
@@ -96,7 +96,7 @@ class StakingBloc extends Bloc<StakingBlocEvent, StakingBlocState>
 
   void _registerHandlers() {
     on<_Init>((_, emit) => _init(emit));
-    on<_SelectMax>((_, emit) => _selectMax());
+    on<_SelectMax>((event, emit) => _selectMax(event.fieldState));
     on<_UpdateReceive>((event, emit) => _updateReceive(event.value, emit));
     on<_UpdateRequests>((event, emit) {
       _requests = event.requests;
@@ -352,7 +352,7 @@ class StakingBloc extends Bloc<StakingBlocEvent, StakingBlocState>
     );
   }
 
-  void _selectMax() {
+  void _selectMax(FormFieldState<String>? fieldState) {
     var max = _dataState.asset.balance;
 
     if (_type == StakingPageType.stake) {
@@ -375,7 +375,8 @@ class StakingBloc extends Bloc<StakingBlocEvent, StakingBlocState>
       }
     }
 
-    _inputController.text = max.amount.toString();
+    _inputController.text = max.formatImproved();
+    fieldState?.didChange(_inputController.text);
   }
 
   Currency get _nativeCurrency =>