diff --git a/packages/espressocash_app/lib/features/send_token/screens/confirmation_screen.dart b/packages/espressocash_app/lib/features/send_token/screens/confirmation_screen.dart index d7f6a2c77..ec41f411b 100644 --- a/packages/espressocash_app/lib/features/send_token/screens/confirmation_screen.dart +++ b/packages/espressocash_app/lib/features/send_token/screens/confirmation_screen.dart @@ -186,7 +186,6 @@ class _Info extends StatelessWidget { @override Widget build(BuildContext context) => _SendInfoContainer( - title: '', content: Column( children: [ _InfoItem( @@ -239,11 +238,9 @@ class _InfoItem extends StatelessWidget { class _SendInfoContainer extends StatelessWidget { const _SendInfoContainer({ - required this.title, required this.content, }); - final String title; final Widget content; @override diff --git a/packages/espressocash_app/lib/features/send_token/screens/send_token_screen.dart b/packages/espressocash_app/lib/features/send_token/screens/send_token_screen.dart index bd42c89c5..522ef6680 100644 --- a/packages/espressocash_app/lib/features/send_token/screens/send_token_screen.dart +++ b/packages/espressocash_app/lib/features/send_token/screens/send_token_screen.dart @@ -9,7 +9,7 @@ import '../../../gen/assets.gen.dart'; import '../../../l10n/device_locale.dart'; import '../../../l10n/l10n.dart'; import '../../../ui/app_bar.dart'; -import '../../../ui/button.dart'; +import '../../../ui/bottom_button.dart'; import '../../../ui/colors.dart'; import '../../../ui/icon_button.dart'; import '../../../ui/number_formatter.dart'; @@ -134,25 +134,24 @@ class _SendTokenScreenState extends State { return Scaffold( appBar: CpAppBar( title: Text( - 'Send'.toUpperCase(), + context.l10n.send.toUpperCase(), ), ), backgroundColor: CpColors.deepGreyColor, body: SafeArea( - bottom: false, + top: false, + minimum: const EdgeInsets.only(bottom: 40), child: Padding( - padding: const EdgeInsets.all(23.0), + padding: const EdgeInsets.symmetric(horizontal: 23), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - const SizedBox( - height: 8, - ), - const Padding( - padding: EdgeInsets.only(left: 25.0), + const SizedBox(height: 30), + Padding( + padding: const EdgeInsets.only(left: 25.0), child: Text( - 'Quantity', - style: TextStyle( + context.l10n.quantity, + style: const TextStyle( fontSize: 17, fontWeight: FontWeight.w500, ), @@ -166,11 +165,11 @@ class _SendTokenScreenState extends State { rate: _rate, ), const SizedBox(height: 32), - const Padding( - padding: EdgeInsets.only(left: 25.0), + Padding( + padding: const EdgeInsets.only(left: 25.0), child: Text( - 'Recipient', - style: TextStyle( + context.l10n.recipient, + style: const TextStyle( fontSize: 17, fontWeight: FontWeight.w500, ), @@ -182,23 +181,14 @@ class _SendTokenScreenState extends State { onQrScan: _handleOnQrScan, ), const Spacer(), - Padding( - padding: const EdgeInsets.only( - bottom: 47.0, - left: 25, - right: 25, + ListenableBuilder( + listenable: Listenable.merge( + [_quantityController, _recipientController], ), - child: ListenableBuilder( - listenable: Listenable.merge( - [_quantityController, _recipientController], - ), - builder: (context, child) => CpButton( - width: MediaQuery.sizeOf(context).width, - alignment: CpButtonAlignment.center, - size: CpButtonSize.big, - onPressed: _isValid ? _handlePressed : null, - text: context.l10n.next, - ), + builder: (context, child) => CpBottomButton( + horizontalPadding: 16, + text: context.l10n.next, + onPressed: _isValid ? _handlePressed : null, ), ), ], @@ -231,7 +221,7 @@ class _WalletTextField extends StatelessWidget { textInputAction: TextInputAction.next, textCapitalization: TextCapitalization.none, backgroundColor: CpColors.blackGreyColor, - placeholder: 'Enter a wallet address', + placeholder: context.l10n.enterWalletAddress, placeholderColor: CpColors.secondaryTextColor, textColor: Colors.white, fontSize: 16, diff --git a/packages/espressocash_app/lib/l10n/intl_en.arb b/packages/espressocash_app/lib/l10n/intl_en.arb index 22b2b0147..92a87b77f 100644 --- a/packages/espressocash_app/lib/l10n/intl_en.arb +++ b/packages/espressocash_app/lib/l10n/intl_en.arb @@ -1223,5 +1223,11 @@ "balance": "Balance", "@balance": {}, "noRecentActivity": "No recent activity", - "@noRecentActivity": {} -} + "@noRecentActivity": {}, + "quantity": "Quantity", + "@quantity": {}, + "recipient": "Recipient", + "@recipient": {}, + "enterWalletAddress": "Enter a wallet address", + "@enterWalletAddress": {} +} \ No newline at end of file