broxus · knightsforce · Sep 12, 2024 · Sep 12, 2024 · Sep 12, 2024 · Sep 12, 2024
diff --git a/lib/feature/wallet/wallet_deploy/view/wallet_deploy_confirm_view.dart b/lib/feature/wallet/wallet_deploy/view/wallet_deploy_confirm_view.dart
@@ -1,12 +1,14 @@
 import 'package:app/di/di.dart';
 import 'package:app/feature/profile/profile.dart';
 import 'package:app/feature/wallet/wallet.dart';
+import 'package:app/feature/wallet/widgets/account_transactions_tab/detail/details_item.dart';
 import 'package:app/generated/generated.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:nekoton_repository/nekoton_repository.dart';
 import 'package:ui_components_lib/ui_components_lib.dart';
+import 'package:ui_components_lib/v2/ui_components_lib_v2.dart';
 
 /// Widget, that displays base information for deploying wallet and let user
 /// confirm transaction by entering password.
@@ -31,50 +33,53 @@ class WalletDeployConfirmView extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
  final isLoading = fee == null && feeError == null;
- final colors = context.themeStyle.colors;
+ final theme = context.themeStyleV2;
 
  return SeparatedColumn(
  crossAxisAlignment: CrossAxisAlignment.start,
  children: [
  Expanded(
  child: SingleChildScrollView(
  child: ShapedContainerColumn(
+ padding: const EdgeInsets.symmetric(
+ vertical: DimensSizeV2.d16,
+ horizontal: DimensSizeV2.d16,
+ ),
+ color: theme.colors.background1,
  mainAxisSize: MainAxisSize.min,
  separator: const Padding(
- padding: EdgeInsets.symmetric(vertical: DimensSize.d8),
+ padding: EdgeInsets.symmetric(vertical: DimensSizeV2.d8),
  child: CommonDivider(),
  ),
  children: [
  Text(
  LocaleKeys.fundsDebitedToDeploy.tr(),
- style: StyleRes.secondaryBold
- .copyWith(color: colors.textSecondary),
+ style: theme.textStyles.labelMedium,
  ),
- _info(
+ WalletTransactionDetailsItem(
  title: LocaleKeys.accountBalance.tr(),
- valueChild: MoneyWidget(
- money: Money.fromBigIntWithCurrency(
+ valueWidget: AmountWidget.fromMoney(
+ amount: Money.fromBigIntWithCurrency(
  balance ?? BigInt.zero,
  Currencies()[inject<NekotonRepository>()
  .currentTransport
  .nativeTokenTicker]!,
  ),
- style: MoneyWidgetStyle.primary,
  ),
  ),
- _info(
- title: LocaleKeys.blockchainFee.tr(),
- valueChild: MoneyWidget(
- money: Money.fromBigIntWithCurrency(
+ WalletTransactionDetailsItem(
+ title: LocaleKeys.networkFee.tr(),
+ valueWidget: AmountWidget.fromMoney(
+ amount: Money.fromBigIntWithCurrency(
  fee ?? BigInt.zero,
  Currencies()[inject<NekotonRepository>()
  .currentTransport
  .nativeTokenTicker]!,
  ),
- signValue: '~',
- style: MoneyWidgetStyle.primary,
+ sign: '${LocaleKeys.approximatelySign.tr()} ',
  ),
- subtitleError: feeError,
+ subtitle: feeError,
+ isSubtitleError: true,
  ),
  ...?custodians?.mapIndexed(
  (index, e) => _info(
@@ -100,10 +105,9 @@ class WalletDeployConfirmView extends StatelessWidget {
  ),
  Padding(
  padding: const EdgeInsets.all(DimensSize.d16),
- child: CommonButton.primary(
- fillWidth: true,
+ child: PrimaryButton(
  isLoading: isLoading,
- text: LocaleKeys.sendWord.tr(),
+ title: LocaleKeys.sendWord.tr(),
  onPressed: feeError != null || fee == null
  ? null
  : () {
@@ -129,6 +133,7 @@ class WalletDeployConfirmView extends StatelessWidget {
  ),
  );
  },
+ buttonShape: ButtonShape.pill,
  ),
  ),
  ],

diff --git a/lib/feature/wallet/wallet_deploy/view/wallet_deploy_page.dart b/lib/feature/wallet/wallet_deploy/view/wallet_deploy_page.dart
@@ -98,9 +98,11 @@ class WalletDeployPage extends StatelessWidget {
  Widget _scaffold(Widget body, {bool canPrev = false}) {
  return Builder(
  builder: (context) {
+ final colors = context.themeStyleV2.colors;
  return GestureDetector(
  onTap: () => FocusScope.of(context).unfocus(),
  child: Scaffold(
+ backgroundColor: colors.background0,
  appBar: DefaultAppBar(
  titleText: canPrev
  ? LocaleKeys.deployWallet.tr()

diff --git a/lib/feature/wallet/wallet_deploy/widgets/wallet_deploy_multisig_body.dart b/lib/feature/wallet/wallet_deploy/widgets/wallet_deploy_multisig_body.dart
@@ -1,11 +1,15 @@
+// ignore_for_file: lines_longer_than_80_chars
+
 import 'package:app/feature/wallet/wallet.dart';
 import 'package:app/generated/generated.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:lucide_icons_flutter/lucide_icons.dart';
 import 'package:nekoton_repository/nekoton_repository.dart';
 import 'package:ui_components_lib/ui_components_lib.dart';
+import 'package:ui_components_lib/v2/ui_components_lib_v2.dart';
 
 final _alphanumeric = RegExp(r'^[a-zA-Z0-9]+$');
 
@@ -102,7 +106,7 @@ class _WalletDeployMultisigBodyState extends State<WalletDeployMultisigBody> {
 
  @override
  Widget build(BuildContext context) {
- final colors = context.themeStyle.colors;
+ final textStyles = context.themeStyleV2.textStyles;
 
  return Stack(
  children: [
@@ -137,41 +141,61 @@ class _WalletDeployMultisigBodyState extends State<WalletDeployMultisigBody> {
  ),
  ),
  ),
- CommonInput(
- controller: requireConfirmationController,
- titleText: LocaleKeys.evaluationConfirmation.tr(),
- subtitleText: LocaleKeys.outOfNumber.tr(
- args: [custodianControllers.length.toString()],
- ),
- keyboardType: TextInputType.number,
- textInputAction: TextInputAction.next,
- onSubmitted: (_) =>
- custodianFocuses.first.requestFocus(),
- inputFormatters: [
- FilteringTextInputFormatter.deny(RegExp(r'\s')),
- FilteringTextInputFormatter.allow(
- RegExp('[0-9]'),
+ Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ RichText(
+ text: TextSpan(
+ text:
+ '${LocaleKeys.evaluationConfirmation.tr()} ',
+ style: textStyles.labelSmall,
+ children: [
+ TextSpan(
+ text: LocaleKeys.outOfNumber.tr(
+ args: [
+ custodianControllers.length
+ .toString(),
+ ],
+ ),
+ style: textStyles.paragraphXSmall,
+ ),
+ ],
+ ),
+ ),
+ const SizedBox(height: DimensSizeV2.d8),
+ PrimaryTextField(
+ textEditingController:
+ requireConfirmationController,
+ keyboardType: TextInputType.number,
+ textInputAction: TextInputAction.next,
+ onSubmit: (_) =>
+ custodianFocuses.first.requestFocus(),
+ inputFormatters: [
+ FilteringTextInputFormatter.deny(
+ RegExp(r'\s'),
+ ),
+ FilteringTextInputFormatter.allow(
+ RegExp('[0-9]'),
+ ),
+ ],
+ validator: _validateRequireConfirmations,
  ),
  ],
- validator: _validateRequireConfirmations,
  ),
  ],
  );
  },
  ),
  Text(
  LocaleKeys.custodiansWord.tr(),
- style: StyleRes.h2.copyWith(color: colors.textPrimary),
+ style: textStyles.headingLarge,
  ),
  ...custodianControllers.mapIndexed(_custodianItem),
- CommonButton(
- buttonType: EverButtonType.ghost,
- leading: CommonButtonIconWidget.svg(
- svg: Assets.images.plus.path,
- ),
- text: LocaleKeys.addOneMorePublicKey.tr(),
+ GhostButton(
+ icon: LucideIcons.plus,
+ title: LocaleKeys.addOneMorePublicKey.tr(),
  onPressed: _addOneCustodian,
- textAlign: TextAlign.center,
+ buttonShape: ButtonShape.pill,
  ),
  ],
  ),
@@ -182,9 +206,9 @@ class _WalletDeployMultisigBodyState extends State<WalletDeployMultisigBody> {
  bottom: DimensSize.d16,
  left: DimensSize.d16,
  right: DimensSize.d16,
- child: CommonButton.primary(
- fillWidth: true,
- text: LocaleKeys.nextWord.tr(),
+ child: PrimaryButton(
+ buttonShape: ButtonShape.pill,
+ title: LocaleKeys.nextWord.tr(),
  onPressed: () => _next(context),
  ),
  ),
@@ -195,39 +219,47 @@ class _WalletDeployMultisigBodyState extends State<WalletDeployMultisigBody> {
  Widget _custodianItem(int index, TextEditingController controller) {
  return Builder(
  builder: (context) {
- final colors = context.themeStyle.colors;
-
- return CommonInput(
- key: ValueKey(controller.hashCode),
- controller: controller,
- focusNode: custodianFocuses[index],
- titleText: LocaleKeys.publicKeyOfCustodianNumber
- .tr(args: [(index + 1).toString()]),
- textInputAction: index == custodianControllers.length - 1
- ? TextInputAction.done
- : TextInputAction.next,
- onSubmitted: (value) {
- if (index != custodianControllers.length - 1) {
- custodianFocuses[index + 1].requestFocus();
- } else {
- _next(context);
- }
- },
- maxLength: publicKeyLength,
- suffixIcon: _custodianSuffixIcon(controller, index),
- inputFormatters: [
- FilteringTextInputFormatter.deny(RegExp(r'\s')),
- FilteringTextInputFormatter.allow(RegExp('[a-fA-F0-9]')),
- ],
- validator: _validatePublicKey,
- outerActions: [
+ return Row(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Expanded(
+ child: PrimaryTextField(
+ key: ValueKey(controller.hashCode),
+ textEditingController: controller,
+ focusNode: custodianFocuses[index],
+ hintText: LocaleKeys.publicKeyOfCustodianNumber
+ .tr(args: [(index + 1).toString()]),
+ textInputAction: index == custodianControllers.length - 1
+ ? TextInputAction.done
+ : TextInputAction.next,
+ onSubmit: (value) {
+ if (index != custodianControllers.length - 1) {
+ custodianFocuses[index + 1].requestFocus();
+ } else {
+ _next(context);
+ }
+ },
+ maxLength: publicKeyLength,
+ suffixes: [_custodianSuffixIcon(controller, index)],
+ inputFormatters: [
+ FilteringTextInputFormatter.deny(RegExp(r'\s')),
+ FilteringTextInputFormatter.allow(RegExp('[a-fA-F0-9]')),
+ ],
+ validator: _validatePublicKey,
+ ),
+ ),
  if (index >= minConfirmationsCount)
- CommonIconButton.svg(
- svg: Assets.images.trash.path,
- buttonType: EverButtonType.secondary,
- color: colors.alert,
- onPressed: () => _removeCustodian(index),
- size: CommonIconButtonSize.small,
+ Padding(
+ padding: const EdgeInsets.only(
+ left: DimensSizeV2.d8,
+ top: DimensSizeV2.d4,
+ ),
+ child: DestructiveButton(
+ buttonShape: ButtonShape.circle,
+ icon: LucideIcons.trash,
+ buttonSize: ButtonSize.medium,
+ onPressed: () => _removeCustodian(index),
+ ),
  ),
  ],
  );
@@ -239,27 +271,26 @@ class _WalletDeployMultisigBodyState extends State<WalletDeployMultisigBody> {
  TextEditingController controller,
  int index,
  ) {
- return ValueListenableBuilder<TextEditingValue>(
- valueListenable: controller,
- builder: (context, value, _) {
- final colors = context.themeStyle.colors;
-
- return value.text.isNotEmpty
- ? CommonIconButton.icon(
- buttonType: EverButtonType.ghost,
- icon: Icons.clear_rounded,
- size: CommonIconButtonSize.medium,
- onPressed: controller.clear,
- color: colors.textSecondary,
- )
- : CommonIconButton.svg(
- buttonType: EverButtonType.ghost,
- svg: Assets.images.paste.path,
- size: CommonIconButtonSize.medium,
- onPressed: () => _pasteCustodian(index),
- color: colors.blue,
- );
- },
+ return Padding(
+ padding: const EdgeInsets.only(right: DimensSize.d8),
+ child: ValueListenableBuilder<TextEditingValue>(
+ valueListenable: controller,
+ builder: (context, value, _) {
+ return value.text.isNotEmpty
+ ? PrimaryButton(
+ buttonShape: ButtonShape.square,
+ icon: LucideIcons.x,
+ buttonSize: ButtonSize.small,
+ onPressed: controller.clear,
+ )
+ : PrimaryButton(
+ buttonShape: ButtonShape.square,
+ icon: LucideIcons.clipboardPaste,
+ buttonSize: ButtonSize.small,
+ onPressed: () => _pasteCustodian(index),
+ );
+ },
+ ),
  );
  }
 

diff --git a/lib/feature/wallet/wallet_deploy/widgets/wallet_deploy_standard_body.dart b/lib/feature/wallet/wallet_deploy/widgets/wallet_deploy_standard_body.dart
@@ -3,6 +3,7 @@ import 'package:app/generated/generated.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:ui_components_lib/ui_components_lib.dart';
+import 'package:ui_components_lib/v2/ui_components_lib_v2.dart';
 
 /// Widget that allows deploy wallet with standard type
 class WalletDeployStandardBody extends StatelessWidget {
@@ -18,9 +19,9 @@ class WalletDeployStandardBody extends StatelessWidget {
  type: WalletDeployType.standard,
  ),
  const Spacer(),
- CommonButton.primary(
- fillWidth: true,
- text: LocaleKeys.nextWord.tr(),
+ PrimaryButton(
+ buttonShape: ButtonShape.pill,
+ title: LocaleKeys.nextWord.tr(),
  onPressed: () => context
  .read<WalletDeployBloc>()
  .add(const WalletDeployEvent.deployStandard()),