@samitouri / QOSAMI-cakewallet / commits / 930397cbe

a11y: receive flow semantics (copy control, pickers, selection state) (#3467)

* Add strings for receive-flow accessibility labels New English keys: info, long_press_to_copy, standard, token. They replace hard-coded English in the receive amount modal, the payjoin copy modal and the addresses long-press menu, and name the copy hint. * Collapse copy-to-clipboard controls to one accessible button CopyWrapper gains an optional controlBuilder that hands the copy callback to the control it builds instead of stacking its own gesture layer on top, and it now announces the copy through SemanticsService so screen-reader users get the same feedback the copied state gives sighted users. When there is nothing to copy it no longer leaves a gesture detector behind that reads as actionable but does nothing. Its own tap/long-press wrapper is exposed as one merged button node with a copy hint and a Copy custom action, so tap-to-copy stays reachable on rows that also navigate. The receive copy button used an outer gesture detector for the real work while the visible ModernButton had a no-op onPressed behind two IgnorePointers. It is now a single ModernButton whose onPressed copies, or opens the payjoin copy modal when there is no direct URI to copy; the AnimatedSwitcher copied state is unchanged. The payjoin modal announces the copy and no longer hard-codes "Standard". * Add screen-reader semantics to receive flow and address pickers Every control touched here becomes exactly one merged semantics node with a localized name, the right role and, where it exists, its selection state: - receive page: the label chip is a button hinted with set_label and is kept out of the semantics tree while it is collapsed to zero height. - amount modal: token picker and currency picker are buttons named by select_token / select_fiat_currency_title, the amount field carries the amount label instead of relying on its placeholder, and the visible captions are excluded so they are not announced twice. - amount display: amount, symbol and fiat equivalent are announced together. - info box: Dismiss is a real button, the info icon and the illustrative currency stack are decorative (the message text carries their meaning). - address type: the row and its chevron triggered the same picker; only the row is exposed now, named by address_type. - address type selector: More Options exposes its expanded state, each option row reports selected + inMutuallyExclusiveGroup (its checkbox is excluded so the state is announced once), and the collapsed options are unreachable. - label modal quick-label chips are buttons. - addresses page: rows are buttons reporting selection, with the long-press actions (set label, hide/unhide, info) also exposed as custom semantics actions; the checkmark is decorative; the search field keeps a name once it has text; show-hidden-addresses is a button. - currency picker: search field, clear button, currency rows, chain chips and network rows get names, roles and selection state; icons and chevrons are decorative. No visual or pointer behaviour changes. * Drop single-use locals to keep the diff minimal * Address review: replace deprecated copy announcements with semantic state

Seth For Privacy committed Aug 5, 2026 at 03:16 UTC 930397cbe66c48f083431ec6afbeeb27cb0737ed
18 files changed +938 -691
lib/new-ui/pages/addresses_page.dart
+177 -138
@@ -20,6 +20,7 @@ import 'package:cake_wallet/wownero/wownero.dart';
20 import 'package:cw_core/card_design.dart';
21 import 'package:cw_core/wallet_type.dart';
22 import 'package:flutter/material.dart';
23 +import 'package:flutter/semantics.dart';
24 import 'package:flutter_mobx/flutter_mobx.dart';
25
26 import 'package:cake_wallet/utils/list_item.dart';
@@ -213,24 +214,31 @@ class AddressSearchBox extends StatelessWidget {
214 border: Border.all(
215 color: Theme.of(context).colorScheme.surfaceContainerHighest, width: 1),
216 borderRadius: BorderRadius.circular(99999)),
216 - child: TextField(
217 - controller: controller,
218 - decoration: InputDecoration(
219 - hintText: S.of(context).search,
220 - hintStyle: TextStyle(
221 - fontWeight: FontWeight.w600,
222 - ),
223 - prefixIcon: Icon(Icons.search),
224 - filled: false,
225 - enabledBorder: OutlineInputBorder(
226 - borderRadius: BorderRadius.circular(99999),
227 - borderSide: BorderSide.none,
228 - ),
229 - focusedBorder: OutlineInputBorder(
230 - borderRadius: BorderRadius.circular(99999),
231 - borderSide: BorderSide.none,
217 + // The hint names the field only while it is empty, so the label is
218 + // supplied once there is text to keep exactly one announcement.
219 + child: MergeSemantics(
220 + child: Semantics(
221 + label: controller.text.isEmpty ? null : S.of(context).search,
222 + child: TextField(
223 + controller: controller,
224 + decoration: InputDecoration(
225 + hintText: S.of(context).search,
226 + hintStyle: TextStyle(
227 + fontWeight: FontWeight.w600,
228 + ),
229 + prefixIcon: ExcludeSemantics(child: Icon(Icons.search)),
230 + filled: false,
231 + enabledBorder: OutlineInputBorder(
232 + borderRadius: BorderRadius.circular(99999),
233 + borderSide: BorderSide.none,
234 + ),
235 + focusedBorder: OutlineInputBorder(
236 + borderRadius: BorderRadius.circular(99999),
237 + borderSide: BorderSide.none,
238 + ),
239 + contentPadding: EdgeInsets.symmetric(vertical: 8),
240 + ),
241 ),
233 - contentPadding: EdgeInsets.symmetric(vertical: 8),
242 ),
243 ),
244 ),
@@ -334,116 +342,139 @@ class AddressRow extends StatelessWidget {
342 @override
343 Widget build(BuildContext context) {
344 final hasLabel = item.name != null && item.name!.isNotEmpty;
345 + final hideLabel = item.isHidden ? S.of(context).unhide_address : S.of(context).hide_address;
346
338 - return GestureDetector(
339 - onTap: onSelect,
340 - child: Padding(
341 - padding: const EdgeInsets.symmetric(horizontal: 16.0),
342 - child: LongPressPopupBuilder(
343 - popup: LongPressMenu(
344 - items: [
345 - LongPressMenuItem(
346 - label: S.of(context).set_label,
347 - iconPath: "assets/new-ui/address_set_label.svg",
348 - onSelected: () async {
349 - Navigator.of(context, rootNavigator: true).pop();
350 - final res = await showPopUp(
351 - context: context,
352 - builder: (context) => getIt.get<AddressLabelInputPopup>(param1: item));
347 + Future<void> editLabel() async {
348 + final res = await showPopUp(
349 + context: context, builder: (context) => getIt.get<AddressLabelInputPopup>(param1: item));
350
354 - if (res != null) {
355 - onLabelChanged();
356 - }
357 - }),
358 - LongPressMenuItem(
359 - label: item.isHidden ? S.of(context).unhide_address : S.of(context).hide_address,
360 - iconPath: "assets/new-ui/address_hide.svg",
361 - onSelected: () {
362 - Navigator.of(context, rootNavigator: true).pop();
363 - onAddressHidden();
364 - },
365 - color: Theme.of(context).colorScheme.error),
366 - LongPressMenuItem(
367 - label: 'Info',
368 - iconPath: "assets/images/info_icon.svg",
369 - onSelected: () async {
370 - Navigator.of(context, rootNavigator: true).pop();
371 - await showPopUp(
372 - context: context,
373 - builder: (context) => getIt.get<AddressInfoPopup>(param1: item));
374 - }),
375 - ],
376 - ),
377 - child: AnimatedContainer(
378 - duration: Duration(milliseconds: 150),
379 - decoration: BoxDecoration(
380 - color: selected
381 - ? Theme.of(context).colorScheme.surfaceContainerHigh
382 - : Theme.of(context).colorScheme.surfaceContainer,
383 - borderRadius: BorderRadius.vertical(
384 - top: Radius.circular(first ? 16 : 0),
385 - bottom: Radius.circular(last ? 16 : 0),
351 + if (res != null) {
352 + onLabelChanged();
353 + }
354 + }
355 +
356 + Future<void> showInfo() async {
357 + await showPopUp(
358 + context: context, builder: (context) => getIt.get<AddressInfoPopup>(param1: item));
359 + }
360 +
361 + // The row is a single control: selection on tap, and the actions that are
362 + // otherwise reachable only by long press exposed as custom actions.
363 + return MergeSemantics(
364 + child: Semantics(
365 + button: true,
366 + selected: selected,
367 + customSemanticsActions: <CustomSemanticsAction, VoidCallback>{
368 + CustomSemanticsAction(label: S.of(context).set_label): editLabel,
369 + CustomSemanticsAction(label: hideLabel): onAddressHidden,
370 + CustomSemanticsAction(label: S.of(context).info): showInfo,
371 + },
372 + child: GestureDetector(
373 + onTap: onSelect,
374 + child: Padding(
375 + padding: const EdgeInsets.symmetric(horizontal: 16.0),
376 + child: LongPressPopupBuilder(
377 + popup: LongPressMenu(
378 + items: [
379 + LongPressMenuItem(
380 + label: S.of(context).set_label,
381 + iconPath: "assets/new-ui/address_set_label.svg",
382 + onSelected: () {
383 + Navigator.of(context, rootNavigator: true).pop();
384 + editLabel();
385 + }),
386 + LongPressMenuItem(
387 + label: hideLabel,
388 + iconPath: "assets/new-ui/address_hide.svg",
389 + onSelected: () {
390 + Navigator.of(context, rootNavigator: true).pop();
391 + onAddressHidden();
392 + },
393 + color: Theme.of(context).colorScheme.error),
394 + LongPressMenuItem(
395 + label: S.of(context).info,
396 + iconPath: "assets/images/info_icon.svg",
397 + onSelected: () {
398 + Navigator.of(context, rootNavigator: true).pop();
399 + showInfo();
400 + }),
401 + ],
402 ),
387 - ),
388 - child: Padding(
389 - padding: const EdgeInsets.all(12.0),
390 - child: Row(
391 - spacing: 8,
392 - mainAxisSize: MainAxisSize.max,
393 - mainAxisAlignment: MainAxisAlignment.spaceBetween,
394 - children: [
395 - Expanded(
396 - child: Column(
397 - children: [
398 - Row(
399 - spacing: 4,
403 + child: AnimatedContainer(
404 + duration: Duration(milliseconds: 150),
405 + decoration: BoxDecoration(
406 + color: selected
407 + ? Theme.of(context).colorScheme.surfaceContainerHigh
408 + : Theme.of(context).colorScheme.surfaceContainer,
409 + borderRadius: BorderRadius.vertical(
410 + top: Radius.circular(first ? 16 : 0),
411 + bottom: Radius.circular(last ? 16 : 0),
412 + ),
413 + ),
414 + child: Padding(
415 + padding: const EdgeInsets.all(12.0),
416 + child: Row(
417 + spacing: 8,
418 + mainAxisSize: MainAxisSize.max,
419 + mainAxisAlignment: MainAxisAlignment.spaceBetween,
420 + children: [
421 + Expanded(
422 + child: Column(
423 children: [
401 - if (hasLabel)
402 - Text(
403 - item.name!,
404 - style: TextStyle(
405 - fontSize: 12,
406 - color: Theme.of(context).colorScheme.onSurface,
407 - fontWeight: FontWeight.w500),
408 - ),
409 - Expanded(
410 - child: AddressFormatter.buildSegmentedAddress(
411 - address: item.address,
412 - walletType: walletType,
413 - textAlign: TextAlign.left,
414 - evenTextStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
424 + Row(
425 + spacing: 4,
426 + children: [
427 + if (hasLabel)
428 + Text(
429 + item.name!,
430 + style: TextStyle(
431 fontSize: 12,
416 - fontWeight: FontWeight.w400,
417 - color: hasLabel
418 - ? Theme.of(context).colorScheme.onSurfaceVariant
419 - : Theme.of(context).colorScheme.onSurface,
420 - ),
421 - shouldTruncate: (hasLabel)),
432 + color: Theme.of(context).colorScheme.onSurface,
433 + fontWeight: FontWeight.w500),
434 + ),
435 + Expanded(
436 + child: AddressFormatter.buildSegmentedAddress(
437 + address: item.address,
438 + walletType: walletType,
439 + textAlign: TextAlign.left,
440 + evenTextStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
441 + fontSize: 12,
442 + fontWeight: FontWeight.w400,
443 + color: hasLabel
444 + ? Theme.of(context).colorScheme.onSurfaceVariant
445 + : Theme.of(context).colorScheme.onSurface,
446 + ),
447 + shouldTruncate: (hasLabel)),
448 + ),
449 + ],
450 ),
451 + Row(
452 + mainAxisSize: MainAxisSize.max,
453 + mainAxisAlignment: MainAxisAlignment.spaceBetween,
454 + children: [
455 + Text(
456 + "${S.of(context).transactions}: ${item.txCount}",
457 + style: TextStyle(
458 + fontSize: 12,
459 + color: Theme.of(context).colorScheme.onSurfaceVariant),
460 + ),
461 + Text(
462 + "${hasReceived ? S.of(context).received : S.of(context).balance}: ${item.balance}",
463 + style: TextStyle(
464 + fontSize: 12,
465 + color: Theme.of(context).colorScheme.onSurfaceVariant)),
466 + ],
467 + )
468 ],
469 ),
425 - Row(
426 - mainAxisSize: MainAxisSize.max,
427 - mainAxisAlignment: MainAxisAlignment.spaceBetween,
428 - children: [
429 - Text(
430 - "${S.of(context).transactions}: ${item.txCount}",
431 - style: TextStyle(
432 - fontSize: 12,
433 - color: Theme.of(context).colorScheme.onSurfaceVariant),
434 - ),
435 - Text(
436 - "${hasReceived ? S.of(context).received : S.of(context).balance}: ${item.balance}",
437 - style: TextStyle(
438 - fontSize: 12,
439 - color: Theme.of(context).colorScheme.onSurfaceVariant)),
440 - ],
441 - )
442 - ],
443 - ),
470 + ),
471 + // The row's selected state carries this information.
472 + if (selected)
473 + ExcludeSemantics(
474 + child: CakeImageWidget(imageUrl: "assets/new-ui/checkmark.svg"))
475 + ],
476 ),
445 - if (selected) CakeImageWidget(imageUrl: "assets/new-ui/checkmark.svg")
446 - ],
477 + ),
478 ),
479 ),
480 ),
@@ -463,26 +494,34 @@ class ShowHiddenButton extends StatelessWidget {
494 child: Column(
495 children: [
496 Material(
466 - child: InkWell(
467 - onTap: () {
468 - Navigator.of(context).pushNamed(Routes.receiveAddresses, arguments: true);
469 - },
470 - child: Container(
471 - height: 48,
472 - decoration: BoxDecoration(
473 - color: Theme.of(context).colorScheme.surfaceContainer,
474 - borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
475 - ),
476 - child: Padding(
477 - padding: const EdgeInsets.symmetric(horizontal: 16.0),
478 - child: Row(
479 - mainAxisAlignment: MainAxisAlignment.spaceBetween,
480 - children: [
481 - Text(S.of(context).show_hidden_addresses),
482 - RotatedBox(
483 - quarterTurns: 1,
484 - child: CakeImageWidget(imageUrl: "assets/new-ui/dropdown_arrow.svg"))
485 - ],
497 + child: MergeSemantics(
498 + child: Semantics(
499 + button: true,
500 + child: InkWell(
501 + onTap: () {
502 + Navigator.of(context).pushNamed(Routes.receiveAddresses, arguments: true);
503 + },
504 + child: Container(
505 + height: 48,
506 + decoration: BoxDecoration(
507 + color: Theme.of(context).colorScheme.surfaceContainer,
508 + borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
509 + ),
510 + child: Padding(
511 + padding: const EdgeInsets.symmetric(horizontal: 16.0),
512 + child: Row(
513 + mainAxisAlignment: MainAxisAlignment.spaceBetween,
514 + children: [
515 + Text(S.of(context).show_hidden_addresses),
516 + ExcludeSemantics(
517 + child: RotatedBox(
518 + quarterTurns: 1,
519 + child:
520 + CakeImageWidget(imageUrl: "assets/new-ui/dropdown_arrow.svg")),
521 + )
522 + ],
523 + ),
524 + ),
525 ),
526 ),
527 ),
lib/new-ui/pages/receive_page.dart
+17 -5
@@ -275,11 +275,23 @@ class _NewReceivePageState extends State<NewReceivePage> {
275 ReceiveAddressWidget(
276 addressListViewModel: widget.addressListViewModel,
277 ),
278 - GestureDetector(
279 - onTap: _showLabelModal,
280 - child: ReceiveLabelWidget(
281 - name: _addressItemWithLabel?.name ?? "",
282 - largeQrMode: _largeQrMode,
278 + // The label chip animates to zero height when there is no
279 + // label (or in large QR mode); keep it out of the semantics
280 + // tree entirely while it is collapsed.
281 + ExcludeSemantics(
282 + excluding: _largeQrMode || !hasLabel,
283 + child: MergeSemantics(
284 + child: Semantics(
285 + button: true,
286 + hint: S.of(context).set_label,
287 + child: GestureDetector(
288 + onTap: _showLabelModal,
289 + child: ReceiveLabelWidget(
290 + name: _addressItemWithLabel?.name ?? "",
291 + largeQrMode: _largeQrMode,
292 + ),
293 + ),
294 + ),
295 ),
296 ),
297 Observer(
lib/new-ui/widgets/copy_wrapper.dart
+57 -8
@@ -1,8 +1,10 @@
1 import 'dart:io';
2
3 +import 'package:cake_wallet/generated/i18n.dart';
4 import 'package:cake_wallet/utils/clipboard_util.dart';
5 import 'package:device_info_plus/device_info_plus.dart';
6 import 'package:flutter/material.dart';
7 +import 'package:flutter/semantics.dart';
8 import 'package:flutter/services.dart';
9
10 class CopyWrapper extends StatefulWidget {
@@ -11,13 +13,25 @@ class CopyWrapper extends StatefulWidget {
13 this.data,
14 this.requireLongPress = false,
15 this.isSensitive = false,
14 - required this.builder,
15 - this.duration = const Duration(milliseconds: 1200)});
16 + this.builder,
17 + this.controlBuilder,
18 + this.duration = const Duration(milliseconds: 1200)})
19 + : assert((builder == null) != (controlBuilder == null),
20 + "Provide exactly one of builder or controlBuilder");
21
22 final ClipboardData? data;
23 final bool isSensitive;
24 final bool requireLongPress;
20 - final Widget Function(BuildContext, bool) builder;
25 +
26 + /// Builds content that this widget makes copyable with its own gesture
27 + /// detector. Receives the transient "copied" state.
28 + final Widget Function(BuildContext, bool)? builder;
29 +
30 + /// Builds a control that performs the copy itself, so no extra gesture
31 + /// detector or actionable semantics node is stacked on top of it. [onCopy] is
32 + /// null when there is nothing to copy.
33 + final Widget Function(BuildContext context, bool copied, VoidCallback? onCopy)? controlBuilder;
34 +
35 final Duration duration;
36
37 @override
@@ -31,6 +45,11 @@ class _CopyWrapperState extends State<CopyWrapper> {
45 if (widget.data == null) return;
46 ClipboardUtil.setSensitiveDataToClipboard(widget.data!, isSensitive: widget.isSensitive);
47 HapticFeedback.mediumImpact();
48 + // Screen readers learn about the copy from the transient "copied" state
49 + // below, which build() marks as a live region, instead of from a push
50 + // announcement: those are deprecated on Android and make TalkBack drop
51 + // whatever it was saying. Where we don't render that state, android 13+
52 + // already shows its own clipboard confirmation.
53 if (await shouldShowCopied()) {
54 setState(() => copied = true);
55 Future.delayed(widget.duration, () {
@@ -41,11 +60,41 @@ class _CopyWrapperState extends State<CopyWrapper> {
60
61 @override
62 Widget build(BuildContext context) {
44 - return GestureDetector(
45 - behavior: HitTestBehavior.translucent,
46 - onTap: widget.requireLongPress ? null : handleCopy,
47 - onLongPress: !widget.requireLongPress ? null : handleCopy,
48 - child: widget.builder(context, copied),
63 + final VoidCallback? onCopy = widget.data == null ? null : handleCopy;
64 +
65 + // The control's own label carries the copied state (Copy -> Copied), so
66 + // merging it into one node and marking that node a live region while copied
67 + // is enough for a screen reader to pick the change up.
68 + if (widget.controlBuilder != null) {
69 + return MergeSemantics(
70 + child: Semantics(
71 + liveRegion: copied,
72 + child: widget.controlBuilder!(context, copied, onCopy),
73 + ),
74 + );
75 + }
76 +
77 + final content = widget.builder!(context, copied);
78 +
79 + // Nothing to copy: don't leave behind a gesture detector that a screen
80 + // reader would present as an actionable target that does nothing.
81 + if (onCopy == null) return content;
82 +
83 + return MergeSemantics(
84 + child: Semantics(
85 + button: !widget.requireLongPress,
86 + liveRegion: copied,
87 + hint: widget.requireLongPress ? S.of(context).long_press_to_copy : S.of(context).copy,
88 + customSemanticsActions: <CustomSemanticsAction, VoidCallback>{
89 + CustomSemanticsAction(label: S.of(context).copy): onCopy,
90 + },
91 + child: GestureDetector(
92 + behavior: HitTestBehavior.translucent,
93 + onTap: widget.requireLongPress ? null : onCopy,
94 + onLongPress: !widget.requireLongPress ? null : onCopy,
95 + child: content,
96 + ),
97 + ),
98 );
99 }
100
lib/new-ui/widgets/currency_picker/chain_chip_strip.dart
+25 -18
@@ -56,24 +56,31 @@ class _ChainChip extends StatelessWidget {
56 final colors = Theme.of(context).colorScheme;
57 return Padding(
58 padding: const EdgeInsetsDirectional.only(end: 8),
59 - child: InkWell(
60 - onTap: onTap,
61 - borderRadius: BorderRadius.circular(80),
62 - child: Container(
63 - padding: const EdgeInsets.symmetric(horizontal: 10),
64 - decoration: BoxDecoration(
65 - color: isSelected ? colors.primary : colors.surfaceContainer,
66 - borderRadius: BorderRadius.circular(20),
67 - ),
68 - child: Center(
69 - child: Text(
70 - label,
71 - style: Theme.of(context).textTheme.bodyMedium?.copyWith(
72 - fontWeight: FontWeight.w500,
73 - fontSize: isSelected ? 14 : 12,
74 - letterSpacing: -0.07,
75 - color: isSelected ? colors.onPrimary : colors.primary,
76 - ),
59 + child: MergeSemantics(
60 + child: Semantics(
61 + button: true,
62 + selected: isSelected,
63 + inMutuallyExclusiveGroup: true,
64 + child: InkWell(
65 + onTap: onTap,
66 + borderRadius: BorderRadius.circular(80),
67 + child: Container(
68 + padding: const EdgeInsets.symmetric(horizontal: 10),
69 + decoration: BoxDecoration(
70 + color: isSelected ? colors.primary : colors.surfaceContainer,
71 + borderRadius: BorderRadius.circular(20),
72 + ),
73 + child: Center(
74 + child: Text(
75 + label,
76 + style: Theme.of(context).textTheme.bodyMedium?.copyWith(
77 + fontWeight: FontWeight.w500,
78 + fontSize: isSelected ? 14 : 12,
79 + letterSpacing: -0.07,
80 + color: isSelected ? colors.onPrimary : colors.primary,
81 + ),
82 + ),
83 + ),
84 ),
85 ),
86 ),
lib/new-ui/widgets/currency_picker/currency_picker_row.dart
+56 -46
@@ -24,55 +24,65 @@ class CurrencyPickerRow extends StatelessWidget {
24 @override
25 Widget build(BuildContext context) {
26 final colors = Theme.of(context).colorScheme;
27 - return InkWell(
28 - onTap: onTap,
29 - child: Padding(
30 - padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 12),
31 - child: Row(
32 - children: [
33 - _IconWithBadge(currency: currency, badgePath: chainBadgePath),
34 - const SizedBox(width: 12),
35 - Expanded(
36 - child: Row(
37 - children: [
38 - Flexible(
39 - child: Text(
40 - currency.fullName ?? currency.title,
41 - overflow: TextOverflow.ellipsis,
42 - style: Theme.of(context).textTheme.bodyMedium?.copyWith(
43 - fontWeight: FontWeight.w500,
27 + return MergeSemantics(
28 + child: Semantics(
29 + button: true,
30 + selected: isSelected,
31 + child: InkWell(
32 + onTap: onTap,
33 + child: Padding(
34 + padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 12),
35 + child: Row(
36 + children: [
37 + ExcludeSemantics(
38 + child: _IconWithBadge(currency: currency, badgePath: chainBadgePath),
39 + ),
40 + const SizedBox(width: 12),
41 + Expanded(
42 + child: Row(
43 + children: [
44 + Flexible(
45 + child: Text(
46 + currency.fullName ?? currency.title,
47 + overflow: TextOverflow.ellipsis,
48 + style: Theme.of(context).textTheme.bodyMedium?.copyWith(
49 + fontWeight: FontWeight.w500,
50 + ),
51 + ),
52 + ),
53 + if (chainPillLabel != null) ...[
54 + const SizedBox(width: 8),
55 + Container(
56 + padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
57 + decoration: BoxDecoration(
58 + color: colors.surfaceContainerHigh,
59 + borderRadius: BorderRadius.circular(10),
60 + ),
61 + child: Text(
62 + chainPillLabel!,
63 + style: Theme.of(context).textTheme.bodySmall?.copyWith(
64 + fontWeight: FontWeight.w500,
65 + color: colors.onSecondaryContainer,
66 + ),
67 ),
45 - ),
68 + ),
69 + ],
70 + ],
71 ),
47 - if (chainPillLabel != null) ...[
48 - const SizedBox(width: 8),
49 - Container(
50 - padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
51 - decoration: BoxDecoration(
52 - color: colors.surfaceContainerHigh,
53 - borderRadius: BorderRadius.circular(10),
54 - ),
55 - child: Text(
56 - chainPillLabel!,
57 - style: Theme.of(context).textTheme.bodySmall?.copyWith(
58 - fontWeight: FontWeight.w500,
59 - color: colors.onSecondaryContainer,
60 - ),
61 - ),
62 - ),
63 - ],
64 - ],
65 - ),
66 - ),
67 - const SizedBox(width: 8),
68 - trailing,
69 - const SizedBox(width: 8),
70 - Icon(
71 - Icons.chevron_right,
72 - size: 20,
73 - color: isSelected ? colors.primary : colors.onSurfaceVariant,
72 + ),
73 + const SizedBox(width: 8),
74 + trailing,
75 + const SizedBox(width: 8),
76 + ExcludeSemantics(
77 + child: Icon(
78 + Icons.chevron_right,
79 + size: 20,
80 + color: isSelected ? colors.primary : colors.onSurfaceVariant,
81 + ),
82 + ),
83 + ],
84 ),
75 - ],
85 + ),
86 ),
87 ),
88 );
lib/new-ui/widgets/currency_picker/currency_picker_search_field.dart
+30 -18
@@ -1,3 +1,4 @@
1 +import 'package:cake_wallet/generated/i18n.dart';
2 import 'package:cake_wallet/new-ui/widgets/currency_picker/currency_picker_args.dart';
3 import 'package:cw_core/crypto_currency.dart';
4 import 'package:flutter/material.dart';
@@ -27,30 +28,41 @@ class CurrencyPickerSearchField extends StatelessWidget {
28 ),
29 child: Row(
30 children: [
30 - Icon(Icons.search, size: 20, color: colors.primary),
31 + ExcludeSemantics(child: Icon(Icons.search, size: 20, color: colors.primary)),
32 const SizedBox(width: 10),
33 Expanded(
33 - child: TextFormField(
34 - controller: controller,
35 - style: Theme.of(context).textTheme.bodyMedium,
36 - decoration: InputDecoration(
37 - isCollapsed: true,
38 - border: InputBorder.none,
39 - focusedBorder: InputBorder.none,
40 - hintText: hintText,
41 - hintStyle: Theme.of(context).textTheme.bodyMedium?.copyWith(
42 - color: colors.onSurfaceVariant,
43 - ),
34 + // The hint names the field only while it is empty, so the label is
35 + // supplied once there is text to keep exactly one announcement.
36 + child: MergeSemantics(
37 + child: Semantics(
38 + label: controller.text.isEmpty ? null : hintText,
39 + child: TextFormField(
40 + controller: controller,
41 + style: Theme.of(context).textTheme.bodyMedium,
42 + decoration: InputDecoration(
43 + isCollapsed: true,
44 + border: InputBorder.none,
45 + focusedBorder: InputBorder.none,
46 + hintText: hintText,
47 + hintStyle: Theme.of(context).textTheme.bodyMedium?.copyWith(
48 + color: colors.onSurfaceVariant,
49 + ),
50 + ),
51 + ),
52 ),
53 ),
54 ),
55 if (controller.text.isNotEmpty)
48 - InkWell(
49 - onTap: controller.clear,
50 - customBorder: const CircleBorder(),
51 - child: Padding(
52 - padding: const EdgeInsets.all(4),
53 - child: Icon(Icons.close, size: 16, color: colors.onSurfaceVariant),
56 + Semantics(
57 + button: true,
58 + label: S.of(context).clear,
59 + child: InkWell(
60 + onTap: controller.clear,
61 + customBorder: const CircleBorder(),
62 + child: Padding(
63 + padding: const EdgeInsets.all(4),
64 + child: Icon(Icons.close, size: 16, color: colors.onSurfaceVariant),
65 + ),
66 ),
67 ),
68 ],
lib/new-ui/widgets/currency_picker/select_network_page.dart
+43 -31
@@ -39,11 +39,14 @@ class SelectNetworkPage extends StatelessWidget {
39 onLeadingPressed: () => Navigator.of(context).maybePop(),
40 ),
41 const SizedBox(height: 24),
42 - CakeImageWidget(
43 - imageUrl: assetIconPath,
44 - width: 75,
45 - height: 75,
46 - fit: BoxFit.cover,
42 + // Illustration of the asset named by the title below it.
43 + ExcludeSemantics(
44 + child: CakeImageWidget(
45 + imageUrl: assetIconPath,
46 + width: 75,
47 + height: 75,
48 + fit: BoxFit.cover,
49 + ),
50 ),
51 const SizedBox(height: 12),
52 Text(
@@ -107,33 +110,42 @@ class _NetworkRow extends StatelessWidget {
110 final networkIconPath =
111 wt != null ? getCryptoCurrencyIconForWalletListItem(wt) : variant.iconPath;
112 final networkName = chainNameForCurrency(variant);
110 - return InkWell(
111 - onTap: onTap,
112 - child: Padding(
113 - padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 14),
114 - child: Row(
115 - children: [
116 - CakeImageWidget(
117 - imageUrl: networkIconPath,
118 - width: 28,
119 - height: 28,
120 - fit: BoxFit.cover,
121 - ),
122 - const SizedBox(width: 12),
123 - Expanded(
124 - child: Text(
125 - networkName,
126 - style: Theme.of(context).textTheme.bodyMedium?.copyWith(
127 - fontWeight: FontWeight.w500,
128 - ),
129 - ),
130 - ),
131 - Icon(
132 - Icons.chevron_right,
133 - size: 20,
134 - color: colors.onSurfaceVariant,
113 + return MergeSemantics(
114 + child: Semantics(
115 + button: true,
116 + child: InkWell(
117 + onTap: onTap,
118 + child: Padding(
119 + padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 14),
120 + child: Row(
121 + children: [
122 + ExcludeSemantics(
123 + child: CakeImageWidget(
124 + imageUrl: networkIconPath,
125 + width: 28,
126 + height: 28,
127 + fit: BoxFit.cover,
128 + ),
129 + ),
130 + const SizedBox(width: 12),
131 + Expanded(
132 + child: Text(
133 + networkName,
134 + style: Theme.of(context).textTheme.bodyMedium?.copyWith(
135 + fontWeight: FontWeight.w500,
136 + ),
137 + ),
138 + ),
139 + ExcludeSemantics(
140 + child: Icon(
141 + Icons.chevron_right,
142 + size: 20,
143 + color: colors.onSurfaceVariant,
144 + ),
145 + ),
146 + ],
147 ),
136 - ],
148 + ),
149 ),
150 ),
151 );
lib/new-ui/widgets/receive_page/payjoin_copy_modal.dart
+15 -1
@@ -4,6 +4,7 @@ import 'package:cake_wallet/new-ui/widgets/receive_page/receive_top_bar.dart';
4 import 'package:cake_wallet/src/widgets/new_list_row/new_list_section.dart';
5 import 'package:cw_core/payment_uris.dart';
6 import 'package:flutter/material.dart';
7 +import 'package:flutter/semantics.dart';
8 import 'package:flutter/services.dart';
9
10 class PayjoinCopyModal extends StatelessWidget {
@@ -33,7 +34,7 @@ class PayjoinCopyModal extends StatelessWidget {
34 "": [
35 ListItemRegularRow(
36 keyValue: "btc",
36 - label: "Standard",
37 + label: S.of(context).standard,
38 iconPath: "assets/new-ui/pjmodal_btc.svg",
39 onTap: () {
40 Clipboard.setData(
@@ -42,6 +43,7 @@ class PayjoinCopyModal extends StatelessWidget {
43 ? BitcoinURI(amount: uri.amount, address: uri.address).toString()
44 : uri.address),
45 );
46 + _announceCopied(context);
47 Navigator.of(context).pop();
48 }),
49 ListItemRegularRow(
@@ -52,6 +54,7 @@ class PayjoinCopyModal extends StatelessWidget {
54 Clipboard.setData(
55 ClipboardData(text: uri.toString()),
56 );
57 + _announceCopied(context);
58 Navigator.of(context).pop();
59 })
60 ]
@@ -63,4 +66,15 @@ class PayjoinCopyModal extends StatelessWidget {
66 ),
67 );
68 }
69 +
70 + // Copying pops this sheet right away, so no widget survives to carry a
71 + // semantics state change: this path still needs a direct announcement. It is
72 + // skipped on platforms that deprecate announcements (android, where they
73 + // clear TalkBack's speech queue and the system shows its own clipboard
74 + // confirmation anyway).
75 + void _announceCopied(BuildContext context) {
76 + if (!MediaQuery.supportsAnnounceOf(context)) return;
77 + SemanticsService.sendAnnouncement(
78 + View.of(context), S.of(context).copied, Directionality.of(context));
79 + }
80 }
lib/new-ui/widgets/receive_page/receive_address_type.dart
+56 -44
@@ -42,52 +42,64 @@ class ReceiveAddressTypeDisplay extends StatelessWidget {
42 iconPath = "assets/new-ui/address-type-picker-icons/litecoin.svg";
43 }
44
45 - return GestureDetector(
46 - behavior: HitTestBehavior.opaque,
47 - onTap: () => _showPicker(context),
48 - child: Row(
49 - key: ValueKey("$text$largeQrMode"),
50 - mainAxisSize: MainAxisSize.max,
51 - mainAxisAlignment: MainAxisAlignment.center,
52 - spacing: 12.0,
53 - children: [
54 - if (iconPath != null)
55 - CakeImageWidget(
56 - imageUrl: iconPath,
57 - width: 24,
58 - height: 24,
59 - colorFilter: ColorFilter.mode(
60 - Theme.of(context).colorScheme.primary,
61 - BlendMode.srcIn,
62 - ),
63 - ),
64 - Text(
65 - text,
66 - style: TextStyle(
67 - fontSize: 16,
68 - color: Theme.of(context).colorScheme.primary,
69 - ),
70 - ),
71 - if (!largeQrMode)
72 - Container(
73 - width: 24,
74 - height: 24,
75 - decoration: BoxDecoration(
76 - color: Theme.of(context).colorScheme.surfaceContainer,
77 - borderRadius: BorderRadius.circular(999999),
78 - ),
79 - child: IconButton(
80 - padding: EdgeInsets.zero,
81 - constraints: BoxConstraints(),
82 - onPressed: () => _showPicker(context),
83 - icon: (Icon(
45 + // The row and the chevron button trigger the same picker, so only the
46 + // row is exposed and the chevron is treated as decoration.
47 + return MergeSemantics(
48 + child: Semantics(
49 + button: true,
50 + label: S.of(context).address_type,
51 + child: GestureDetector(
52 + behavior: HitTestBehavior.opaque,
53 + onTap: () => _showPicker(context),
54 + child: Row(
55 + key: ValueKey("$text$largeQrMode"),
56 + mainAxisSize: MainAxisSize.max,
57 + mainAxisAlignment: MainAxisAlignment.center,
58 + spacing: 12.0,
59 + children: [
60 + if (iconPath != null)
61 + ExcludeSemantics(
62 + child: CakeImageWidget(
63 + imageUrl: iconPath,
64 + width: 24,
65 + height: 24,
66 + colorFilter: ColorFilter.mode(
67 + Theme.of(context).colorScheme.primary,
68 + BlendMode.srcIn,
69 + ),
70 + ),
71 + ),
72 + Text(
73 + text,
74 + style: TextStyle(
75 + fontSize: 16,
76 color: Theme.of(context).colorScheme.primary,
85 - size: 20,
86 - Icons.keyboard_arrow_down,
87 - )),
77 + ),
78 ),
89 - ),
90 - ],
79 + if (!largeQrMode)
80 + ExcludeSemantics(
81 + child: Container(
82 + width: 24,
83 + height: 24,
84 + decoration: BoxDecoration(
85 + color: Theme.of(context).colorScheme.surfaceContainer,
86 + borderRadius: BorderRadius.circular(999999),
87 + ),
88 + child: IconButton(
89 + padding: EdgeInsets.zero,
90 + constraints: BoxConstraints(),
91 + onPressed: () => _showPicker(context),
92 + icon: (Icon(
93 + color: Theme.of(context).colorScheme.primary,
94 + size: 20,
95 + Icons.keyboard_arrow_down,
96 + )),
97 + ),
98 + ),
99 + ),
100 + ],
101 + ),
102 + ),
103 ),
104 );
105 },
lib/new-ui/widgets/receive_page/receive_address_type_selector.dart
+144 -118
@@ -134,38 +134,49 @@ class _ReceiveAddressTypeSelectorState extends State<ReceiveAddressTypeSelector>
134 borderRadius: BorderRadius.vertical(
135 top: Radius.circular(20),
136 bottom: _otherOptionsExpanded ? Radius.zero : Radius.circular(20)),
137 - child: InkWell(
138 - highlightColor: Theme.of(context).colorScheme.surfaceContainerHighest,
139 - borderRadius: BorderRadius.vertical(
140 - top: Radius.circular(20),
141 - bottom: !_otherOptionsExpanded ? Radius.zero : Radius.circular(20)),
142 - onTap: () {
143 - setState(() {
144 - _otherOptionsExpanded = !_otherOptionsExpanded;
145 - });
146 - },
147 - child: Container(
148 - height: 64.0,
149 - child: Padding(
150 - padding: const EdgeInsets.symmetric(horizontal: 18.0),
151 - child: Row(
152 - mainAxisAlignment: MainAxisAlignment.spaceBetween,
153 - children: [
154 - Text(
155 - S.of(context).more_options,
156 - style: TextStyle(
157 - fontSize: 14,
158 - fontWeight: FontWeight.w400,
159 - color: Theme.of(context).colorScheme.primary),
137 + child: MergeSemantics(
138 + child: Semantics(
139 + button: true,
140 + expanded: _otherOptionsExpanded,
141 + child: InkWell(
142 + highlightColor:
143 + Theme.of(context).colorScheme.surfaceContainerHighest,
144 + borderRadius: BorderRadius.vertical(
145 + top: Radius.circular(20),
146 + bottom: !_otherOptionsExpanded
147 + ? Radius.zero
148 + : Radius.circular(20)),
149 + onTap: () {
150 + setState(() {
151 + _otherOptionsExpanded = !_otherOptionsExpanded;
152 + });
153 + },
154 + child: Container(
155 + height: 64.0,
156 + child: Padding(
157 + padding: const EdgeInsets.symmetric(horizontal: 18.0),
158 + child: Row(
159 + mainAxisAlignment: MainAxisAlignment.spaceBetween,
160 + children: [
161 + Text(
162 + S.of(context).more_options,
163 + style: TextStyle(
164 + fontSize: 14,
165 + fontWeight: FontWeight.w400,
166 + color: Theme.of(context).colorScheme.primary),
167 + ),
168 + ExcludeSemantics(
169 + child: AnimatedRotation(
170 + duration: ReceiveAddressTypeSelector
171 + .otherOptionsExpandDuration,
172 + turns: _otherOptionsExpanded ? 0.0 : 0.5,
173 + curve: Curves.easeOut,
174 + child: CakeImageWidget(
175 + imageUrl: "assets/new-ui/dropdown_arrow.svg")),
176 + )
177 + ],
178 ),
161 - AnimatedRotation(
162 - duration:
163 - ReceiveAddressTypeSelector.otherOptionsExpandDuration,
164 - turns: _otherOptionsExpanded ? 0.0 : 0.5,
165 - curve: Curves.easeOut,
166 - child: CakeImageWidget(
167 - imageUrl: "assets/new-ui/dropdown_arrow.svg"))
168 - ],
179 + ),
180 ),
181 ),
182 ),
@@ -180,40 +191,45 @@ class _ReceiveAddressTypeSelectorState extends State<ReceiveAddressTypeSelector>
191 duration: ReceiveAddressTypeSelector.otherOptionsExpandDuration,
192 curve: Curves.easeOut,
193 alignment: Alignment.topCenter,
183 - child: Container(
184 - height: _otherOptionsExpanded ? null : 0,
185 - child: ListView.separated(
186 - shrinkWrap: true,
187 - padding: EdgeInsets.zero,
188 - physics: NeverScrollableScrollPhysics(),
189 - itemCount: otherOptions.length,
190 - itemBuilder: (context, index) {
191 - final opt = otherOptions[index];
194 + // Collapsed to zero height: keep the options out of
195 + // the semantics tree so they cannot be focused.
196 + child: ExcludeSemantics(
197 + excluding: !_otherOptionsExpanded,
198 + child: Container(
199 + height: _otherOptionsExpanded ? null : 0,
200 + child: ListView.separated(
201 + shrinkWrap: true,
202 + padding: EdgeInsets.zero,
203 + physics: NeverScrollableScrollPhysics(),
204 + itemCount: otherOptions.length,
205 + itemBuilder: (context, index) {
206 + final opt = otherOptions[index];
207
193 - return ReceiveAddressTypeRow(
194 - option: opt,
195 - roundedTop: false,
196 - roundedBottom: index == otherOptions.length - 1,
197 - selected:
198 - widget.receiveOptionViewModel.selectedReceiveOption == opt,
199 - onItemTap: () {
200 - Navigator.of(context).pop(opt);
201 - },
202 - receiveOptionViewModel: widget.receiveOptionViewModel,
203 - );
204 - },
205 - separatorBuilder: (context, index) {
206 - if ((widget.receiveOptionViewModel.selectedReceiveOption ==
207 - otherOptions[index]) ||
208 - (index != otherOptions.length - 1 &&
209 - widget.receiveOptionViewModel.selectedReceiveOption ==
210 - otherOptions[index + 1])) return Container();
208 + return ReceiveAddressTypeRow(
209 + option: opt,
210 + roundedTop: false,
211 + roundedBottom: index == otherOptions.length - 1,
212 + selected:
213 + widget.receiveOptionViewModel.selectedReceiveOption == opt,
214 + onItemTap: () {
215 + Navigator.of(context).pop(opt);
216 + },
217 + receiveOptionViewModel: widget.receiveOptionViewModel,
218 + );
219 + },
220 + separatorBuilder: (context, index) {
221 + if ((widget.receiveOptionViewModel.selectedReceiveOption ==
222 + otherOptions[index]) ||
223 + (index != otherOptions.length - 1 &&
224 + widget.receiveOptionViewModel.selectedReceiveOption ==
225 + otherOptions[index + 1])) return Container();
226
212 - return Padding(
213 - padding: const EdgeInsets.only(left: 44.0, right: 36.0),
214 - child: HorizontalSectionDivider(),
215 - );
216 - },
227 + return Padding(
228 + padding: const EdgeInsets.only(left: 44.0, right: 36.0),
229 + child: HorizontalSectionDivider(),
230 + );
231 + },
232 + ),
233 ),
234 ),
235 ),
@@ -264,65 +280,75 @@ class ReceiveAddressTypeRow extends StatelessWidget {
280 top: roundedTop ? Radius.circular(20) : Radius.zero,
281 bottom: roundedBottom ? Radius.circular(20) : Radius.zero,
282 ),
267 - child: InkWell(
268 - onTap: onItemTap,
269 - child: Container(
270 - height: rowHeight,
271 - decoration: BoxDecoration(
272 - color: selected
273 - ? Theme.of(context).colorScheme.surfaceContainerHigh
274 - : Colors.transparent,
275 - borderRadius: BorderRadius.vertical(
276 - top: roundedTop ? Radius.circular(20) : Radius.zero,
277 - bottom: roundedBottom ? Radius.circular(20) : Radius.zero,
278 - )),
279 - child: Padding(
280 - padding: const EdgeInsets.symmetric(horizontal: 10.0),
281 - child: Row(
282 - mainAxisAlignment: MainAxisAlignment.spaceBetween,
283 - mainAxisSize: MainAxisSize.max,
284 - children: [
285 - Row(
283 + // The row itself carries the selection state; the checkbox next to it is
284 + // only a visual echo of it and must not be announced separately.
285 + child: MergeSemantics(
286 + child: Semantics(
287 + selected: selected,
288 + inMutuallyExclusiveGroup: true,
289 + child: InkWell(
290 + onTap: onItemTap,
291 + child: Container(
292 + height: rowHeight,
293 + decoration: BoxDecoration(
294 + color: selected
295 + ? Theme.of(context).colorScheme.surfaceContainerHigh
296 + : Colors.transparent,
297 + borderRadius: BorderRadius.vertical(
298 + top: roundedTop ? Radius.circular(20) : Radius.zero,
299 + bottom: roundedBottom ? Radius.circular(20) : Radius.zero,
300 + )),
301 + child: Padding(
302 + padding: const EdgeInsets.symmetric(horizontal: 10.0),
303 + child: Row(
304 + mainAxisAlignment: MainAxisAlignment.spaceBetween,
305 + mainAxisSize: MainAxisSize.max,
306 children: [
287 - if (iconPath != null)
288 - CakeImageWidget(
289 - imageUrl: iconPath!,
290 - width: iconSize,
291 - height: iconSize,
292 - colorFilter: ColorFilter.mode(
293 - Theme.of(context).colorScheme.onSurfaceVariant, BlendMode.srcIn),
294 - )
295 - else
296 - Container(width: iconSize, height: iconSize),
297 - Padding(
298 - padding: const EdgeInsets.all(10.0),
299 - child: Column(
300 - mainAxisSize: MainAxisSize.max,
301 - mainAxisAlignment: MainAxisAlignment.center,
302 - crossAxisAlignment: CrossAxisAlignment.start,
303 - children: [
304 - Text(
305 - option.value,
306 - style: TextStyle(
307 - fontSize: 16,
308 - fontWeight: FontWeight.w500,
309 - color: Theme.of(context).colorScheme.onSurface),
307 + Row(
308 + children: [
309 + if (iconPath != null)
310 + ExcludeSemantics(
311 + child: CakeImageWidget(
312 + imageUrl: iconPath!,
313 + width: iconSize,
314 + height: iconSize,
315 + colorFilter: ColorFilter.mode(
316 + Theme.of(context).colorScheme.onSurfaceVariant, BlendMode.srcIn),
317 + ),
318 + )
319 + else
320 + Container(width: iconSize, height: iconSize),
321 + Padding(
322 + padding: const EdgeInsets.all(10.0),
323 + child: Column(
324 + mainAxisSize: MainAxisSize.max,
325 + mainAxisAlignment: MainAxisAlignment.center,
326 + crossAxisAlignment: CrossAxisAlignment.start,
327 + children: [
328 + Text(
329 + option.value,
330 + style: TextStyle(
331 + fontSize: 16,
332 + fontWeight: FontWeight.w500,
333 + color: Theme.of(context).colorScheme.onSurface),
334 + ),
335 + if (option.description != null)
336 + Text(
337 + option.description!,
338 + style: TextStyle(
339 + fontSize: 14,
340 + fontWeight: FontWeight.w400,
341 + color: Theme.of(context).colorScheme.onSurfaceVariant),
342 + )
343 + ],
344 ),
311 - if (option.description != null)
312 - Text(
313 - option.description!,
314 - style: TextStyle(
315 - fontSize: 14,
316 - fontWeight: FontWeight.w400,
317 - color: Theme.of(context).colorScheme.onSurfaceVariant),
318 - )
319 - ],
320 - ),
321 - )
345 + )
346 + ],
347 + ),
348 + ExcludeSemantics(child: RoundedCheckbox(value: selected))
349 ],
350 ),
324 - RoundedCheckbox(value: selected)
325 - ],
351 + ),
352 ),
353 ),
354 ),
lib/new-ui/widgets/receive_page/receive_amount_display.dart
+43 -39
@@ -22,50 +22,54 @@ class ReceiveAmountDisplay extends StatelessWidget {
22 curve: Curves.easeOutCubic,
23 heightFactor: largeQrMode || walletAddressListViewModel.displayAmount.isEmpty ? 0 : 1,
24 alignment: Alignment.topCenter,
25 - child: Container(
26 - width: double.infinity,
27 - child: Row(
28 - spacing: 4,
29 - mainAxisSize: MainAxisSize.min,
30 - mainAxisAlignment: MainAxisAlignment.center,
31 - children: [
32 - Container(
33 - decoration: BoxDecoration(
34 - borderRadius: BorderRadius.circular(12),
35 - color: Theme.of(context).colorScheme.surfaceContainer),
36 - child: Padding(
37 - padding: const EdgeInsets.all(8.0),
38 - child: Row(
39 - spacing: 8.0,
40 - children: [
41 - Text(
42 - walletAddressListViewModel.displayAmount,
43 - style: TextStyle(
44 - color: Theme.of(context).colorScheme.primary,
45 - fontSize: 16,
46 - fontWeight: FontWeight.w500),
47 - ),
48 - Text(walletAddressListViewModel.cryptoCurrencySymbol,
25 + // Amount, currency symbol and fiat equivalent describe one value, so
26 + // they are announced as a single node.
27 + child: MergeSemantics(
28 + child: Container(
29 + width: double.infinity,
30 + child: Row(
31 + spacing: 4,
32 + mainAxisSize: MainAxisSize.min,
33 + mainAxisAlignment: MainAxisAlignment.center,
34 + children: [
35 + Container(
36 + decoration: BoxDecoration(
37 + borderRadius: BorderRadius.circular(12),
38 + color: Theme.of(context).colorScheme.surfaceContainer),
39 + child: Padding(
40 + padding: const EdgeInsets.all(8.0),
41 + child: Row(
42 + spacing: 8.0,
43 + children: [
44 + Text(
45 + walletAddressListViewModel.displayAmount,
46 style: TextStyle(
47 color: Theme.of(context).colorScheme.primary,
48 fontSize: 16,
52 - fontWeight: FontWeight.w500))
53 - ],
49 + fontWeight: FontWeight.w500),
50 + ),
51 + Text(walletAddressListViewModel.cryptoCurrencySymbol,
52 + style: TextStyle(
53 + color: Theme.of(context).colorScheme.primary,
54 + fontSize: 16,
55 + fontWeight: FontWeight.w500))
56 + ],
57 + ),
58 ),
59 ),
56 - ),
57 - if (!walletAddressListViewModel.isFiatDisabled)
58 - Padding(
59 - padding: const EdgeInsets.all(8.0),
60 - child: Text(
61 - _getFiatAmount(),
62 - style: TextStyle(
63 - color: Theme.of(context).colorScheme.onSurfaceVariant,
64 - fontSize: 16,
65 - fontWeight: FontWeight.w500),
66 - ),
67 - )
68 - ],
60 + if (!walletAddressListViewModel.isFiatDisabled)
61 + Padding(
62 + padding: const EdgeInsets.all(8.0),
63 + child: Text(
64 + _getFiatAmount(),
65 + style: TextStyle(
66 + color: Theme.of(context).colorScheme.onSurfaceVariant,
67 + fontSize: 16,
68 + fontWeight: FontWeight.w500),
69 + ),
70 + )
71 + ],
72 + ),
73 ),
74 ),
75 ),
lib/new-ui/widgets/receive_page/receive_amount_modal.dart
+130 -99
@@ -66,54 +66,68 @@ class _ReceiveAmountModalState extends State<ReceiveAmountModal> {
66 spacing: 12,
67 children: [
68 if (widget.walletAddressListViewModel.hasTokensList) ...[
69 - Text("Token"),
70 - GestureDetector(
71 - onTap: () {
72 - _presentTokenCurrencyPicker(context);
73 - },
74 - child: Observer(
75 - builder: (_) => Container(
76 - height: 60,
77 - decoration: BoxDecoration(
78 - color: Theme.of(context).colorScheme.surfaceContainerHigh,
79 - borderRadius: BorderRadius.circular(16),
80 - ),
81 - child: Padding(
82 - padding: const EdgeInsets.symmetric(horizontal: 16.0),
83 - child: Row(
84 - mainAxisSize: MainAxisSize.max,
85 - mainAxisAlignment: MainAxisAlignment.spaceBetween,
86 - children: [
87 - Row(
88 - spacing: 8,
89 - children: [
90 - TokenImageWidget(
91 - imageUrl: widget.walletAddressListViewModel.tokenCurrency
92 - ?.iconPath ??
93 - widget.walletAddressListViewModel.currencies.first
94 - .iconPath ??
95 - "",
96 - size: 32,
97 - ),
98 - Text((widget.walletAddressListViewModel.tokenCurrency ??
99 - widget.walletAddressListViewModel.currencies.first
100 - as CryptoCurrency)
101 - .title
102 - .toUpperCase())
103 - ],
104 - ),
105 - RotatedBox(
106 - quarterTurns: 2,
107 - child: CakeImageWidget(
108 - imageUrl: "assets/new-ui/dropdown_arrow.svg"))
109 - ],
69 + // The caption is reused as the picker's semantics label,
70 + // so it must not be announced as a separate node.
71 + ExcludeSemantics(child: Text(S.of(context).token)),
72 + MergeSemantics(
73 + child: Semantics(
74 + button: true,
75 + label: S.of(context).select_token,
76 + child: GestureDetector(
77 + onTap: () {
78 + _presentTokenCurrencyPicker(context);
79 + },
80 + child: Observer(
81 + builder: (_) => Container(
82 + height: 60,
83 + decoration: BoxDecoration(
84 + color: Theme.of(context).colorScheme.surfaceContainerHigh,
85 + borderRadius: BorderRadius.circular(16),
86 + ),
87 + child: Padding(
88 + padding: const EdgeInsets.symmetric(horizontal: 16.0),
89 + child: Row(
90 + mainAxisSize: MainAxisSize.max,
91 + mainAxisAlignment: MainAxisAlignment.spaceBetween,
92 + children: [
93 + Row(
94 + spacing: 8,
95 + children: [
96 + ExcludeSemantics(
97 + child: TokenImageWidget(
98 + imageUrl: widget.walletAddressListViewModel
99 + .tokenCurrency?.iconPath ??
100 + widget.walletAddressListViewModel.currencies.first
101 + .iconPath ??
102 + "",
103 + size: 32,
104 + ),
105 + ),
106 + Text((widget.walletAddressListViewModel.tokenCurrency ??
107 + widget.walletAddressListViewModel.currencies.first
108 + as CryptoCurrency)
109 + .title
110 + .toUpperCase())
111 + ],
112 + ),
113 + ExcludeSemantics(
114 + child: RotatedBox(
115 + quarterTurns: 2,
116 + child: CakeImageWidget(
117 + imageUrl: "assets/new-ui/dropdown_arrow.svg")),
118 + )
119 + ],
120 + ),
121 ),
122 ),
123 ),
113 - )),
124 + ),
125 + ),
126 + ),
127 ],
128 SizedBox(),
116 - Text(S.of(context).amount),
129 + // The caption is reused as the field's semantics label.
130 + ExcludeSemantics(child: Text(S.of(context).amount)),
131 Row(
132 mainAxisAlignment: MainAxisAlignment.center,
133 children: [
@@ -133,74 +147,91 @@ class _ReceiveAmountModalState extends State<ReceiveAmountModal> {
147 width: 2,
148 ),
149 ),
136 - child: TextField(
137 - textAlign: TextAlign.left,
138 - textAlignVertical: TextAlignVertical.center,
139 - controller: _amountController,
140 - keyboardType: TextInputType.numberWithOptions(
141 - signed: false,
142 - decimal:
143 - widget.walletAddressListViewModel.selectedCurrencyDecimals > 0,
144 - ),
145 - inputFormatters: [
146 - DecimalInputFormatter(
147 - maxDecimals:
148 - widget.walletAddressListViewModel.selectedCurrencyDecimals,
149 - ),
150 - ],
151 - decoration: InputDecoration(
152 - hint: Text(
153 - widget.walletAddressListViewModel.useSatoshi ? "0" : "0.00000000",
150 + child: MergeSemantics(
151 + child: Semantics(
152 + label: S.of(context).amount,
153 + child: TextField(
154 textAlign: TextAlign.left,
155 - style: TextStyle(
156 - fontSize: 16,
157 - color: Theme.of(
158 - context,
159 - ).colorScheme.onSurface.withValues(alpha: 0.5),
155 + textAlignVertical: TextAlignVertical.center,
156 + controller: _amountController,
157 + keyboardType: TextInputType.numberWithOptions(
158 + signed: false,
159 + decimal:
160 + widget.walletAddressListViewModel.selectedCurrencyDecimals >
161 + 0,
162 + ),
163 + inputFormatters: [
164 + DecimalInputFormatter(
165 + maxDecimals:
166 + widget.walletAddressListViewModel.selectedCurrencyDecimals,
167 + ),
168 + ],
169 + decoration: InputDecoration(
170 + hint: Text(
171 + widget.walletAddressListViewModel.useSatoshi
172 + ? "0"
173 + : "0.00000000",
174 + textAlign: TextAlign.left,
175 + style: TextStyle(
176 + fontSize: 16,
177 + color: Theme.of(
178 + context,
179 + ).colorScheme.onSurface.withValues(alpha: 0.5),
180 + ),
181 + ),
182 + border: InputBorder.none,
183 + filled: true,
184 + fillColor: Colors.transparent,
185 ),
186 + style:
187 + TextStyle(color: Theme.of(context).colorScheme.onSurface),
188 ),
162 - border: InputBorder.none,
163 - filled: true,
164 - fillColor: Colors.transparent,
189 ),
166 - style: TextStyle(color: Theme.of(context).colorScheme.onSurface),
190 ),
191 ),
192 ),
193 Expanded(
194 flex: 25,
172 - child: GestureDetector(
173 - onTap: () {
174 - _presentFiatCurrencyPicker(context);
175 - },
176 - child: Container(
177 - height: 60,
178 - decoration: BoxDecoration(
179 - borderRadius: BorderRadius.only(
180 - topLeft: Radius.circular(0),
181 - bottomLeft: Radius.circular(0),
182 - topRight: Radius.circular(18),
183 - bottomRight: Radius.circular(18),
184 - ),
185 - color: Theme.of(context).colorScheme.surfaceContainerHigh,
186 - ),
187 - child: Row(
188 - mainAxisAlignment: MainAxisAlignment.center,
189 - spacing: 4.0,
190 - children: [
191 - Observer(
192 - builder: (_) => Text(
193 - widget.walletAddressListViewModel.selectedCurrencySymbol,
194 - style: TextStyle(
195 - color: Theme.of(context).colorScheme.onSurface,
196 - ),
195 + child: MergeSemantics(
196 + child: Semantics(
197 + button: true,
198 + label: S.of(context).select_fiat_currency_title,
199 + child: GestureDetector(
200 + onTap: () {
201 + _presentFiatCurrencyPicker(context);
202 + },
203 + child: Container(
204 + height: 60,
205 + decoration: BoxDecoration(
206 + borderRadius: BorderRadius.only(
207 + topLeft: Radius.circular(0),
208 + bottomLeft: Radius.circular(0),
209 + topRight: Radius.circular(18),
210 + bottomRight: Radius.circular(18),
211 ),
212 + color: Theme.of(context).colorScheme.surfaceContainerHigh,
213 ),
199 - Icon(
200 - Icons.keyboard_arrow_down,
201 - color: Theme.of(context).colorScheme.primary,
214 + child: Row(
215 + mainAxisAlignment: MainAxisAlignment.center,
216 + spacing: 4.0,
217 + children: [
218 + Observer(
219 + builder: (_) => Text(
220 + widget.walletAddressListViewModel.selectedCurrencySymbol,
221 + style: TextStyle(
222 + color: Theme.of(context).colorScheme.onSurface,
223 + ),
224 + ),
225 + ),
226 + ExcludeSemantics(
227 + child: Icon(
228 + Icons.keyboard_arrow_down,
229 + color: Theme.of(context).colorScheme.primary,
230 + ),
231 + ),
232 + ],
233 ),
203 - ],
234 + ),
235 ),
236 ),
237 ),
lib/new-ui/widgets/receive_page/receive_bottom_buttons.dart
+19 -26
@@ -52,32 +52,25 @@ class _ReceiveBottomButtonsState extends State<ReceiveBottomButtons> {
52 mainAxisAlignment: MainAxisAlignment.center,
53 spacing: 16,
54 children: [
55 - GestureDetector(
56 - onTap: widget.copyData == null ? widget.onCopyButtonPressed : null,
57 - behavior: HitTestBehavior.opaque,
58 - child: IgnorePointer(
59 - ignoring: widget.copyData == null,
60 - child: CopyWrapper(
61 - data: widget.copyData,
62 - builder: (context, copied) => AnimatedSwitcher(
63 - duration: const Duration(milliseconds: 200),
64 - child: IgnorePointer(
65 - child: ModernButton.svg(
66 - key: ValueKey(copied),
67 - size: 60,
68 - iconSize: 32,
69 - svgPath: "assets/new-ui/copy.svg",
70 - onPressed: () {},
71 - label: copied ? S.of(context).copied : S.of(context).copy,
72 - iconColor: copied
73 - ? Theme.of(context).colorScheme.primary
74 - : Theme.of(context).colorScheme.surfaceContainer,
75 - backgroundColor: copied
76 - ? Theme.of(context).colorScheme.surfaceContainerHighest
77 - : Theme.of(context).colorScheme.primary,
78 - ),
79 - ),
80 - ),
55 + // The button itself is the only control: it copies when there
56 + // is data to copy, otherwise it opens the payjoin copy modal.
57 + CopyWrapper(
58 + data: widget.copyData,
59 + controlBuilder: (context, copied, onCopy) => AnimatedSwitcher(
60 + duration: const Duration(milliseconds: 200),
61 + child: ModernButton.svg(
62 + key: ValueKey(copied),
63 + size: 60,
64 + iconSize: 32,
65 + svgPath: "assets/new-ui/copy.svg",
66 + onPressed: onCopy ?? widget.onCopyButtonPressed,
67 + label: copied ? S.of(context).copied : S.of(context).copy,
68 + iconColor: copied
69 + ? Theme.of(context).colorScheme.primary
70 + : Theme.of(context).colorScheme.surfaceContainer,
71 + backgroundColor: copied
72 + ? Theme.of(context).colorScheme.surfaceContainerHighest
73 + : Theme.of(context).colorScheme.primary,
74 ),
75 ),
76 ),
lib/new-ui/widgets/receive_page/receive_info_box.dart
+82 -71
@@ -71,12 +71,14 @@ class ReceiveInfoBox extends StatelessWidget {
71 spacing: 10,
72 children: [
73 if (iconPath.isNotEmpty)
74 - CakeImageWidget(
75 - imageUrl: iconPath,
76 - width: 16,
77 - height: 16,
78 - colorFilter: ColorFilter.mode(
79 - Theme.of(context).colorScheme.onSurfaceVariant, BlendMode.srcIn),
74 + ExcludeSemantics(
75 + child: CakeImageWidget(
76 + imageUrl: iconPath,
77 + width: 16,
78 + height: 16,
79 + colorFilter: ColorFilter.mode(
80 + Theme.of(context).colorScheme.onSurfaceVariant, BlendMode.srcIn),
81 + ),
82 ),
83 Flexible(
84 child: Column(
@@ -96,15 +98,20 @@ class ReceiveInfoBox extends StatelessWidget {
98 mainAxisAlignment: MainAxisAlignment.spaceBetween,
99 children: [
100 if (bottomWidget != null) bottomWidget!,
99 - GestureDetector(
100 - onTap: onDismissed,
101 - child: Text(
102 - S.of(context).dismiss,
103 - style: TextStyle(
104 - color: Theme.of(context).colorScheme.primary,
105 - fontSize: 12,
106 - fontWeight: FontWeight.w300),
107 - )),
101 + MergeSemantics(
102 + child: Semantics(
103 + button: true,
104 + child: GestureDetector(
105 + onTap: onDismissed,
106 + child: Text(
107 + S.of(context).dismiss,
108 + style: TextStyle(
109 + color: Theme.of(context).colorScheme.primary,
110 + fontSize: 12,
111 + fontWeight: FontWeight.w300),
112 + )),
113 + ),
114 + ),
115 ],
116 )
117 ]),
@@ -136,65 +143,69 @@ class InfoboxCurrencyRow extends StatelessWidget {
143
144 final double stackWidth = iconSize + (overlap * (currenciesLimited.length));
145
139 - return Row(
140 - spacing: 8,
141 - children: [
142 - CakeImageWidget(
143 - imageUrl: chainIconPath,
144 - width: 20,
145 - height: 20,
146 - colorFilter:
147 - ColorFilter.mode(Theme.of(context).colorScheme.onSurfaceVariant, BlendMode.srcIn),
148 - ),
149 - Container(
150 - height: 28,
151 - width: 1,
152 - color: Theme.of(context).colorScheme.surfaceContainerHigh,
153 - ),
154 - SizedBox(
155 - height: iconSize + iconBorder * 2,
156 - width: stackWidth,
157 - child: Stack(
158 - children: [
159 - Positioned(
160 - top: iconBorder,
161 - left: overlap * currenciesLimited.length,
162 - child: Container(
163 - width: 24,
164 - height: 24,
165 - decoration: BoxDecoration(
166 - color: Colors.white.withAlpha(25),
167 - borderRadius: BorderRadius.circular(9999999)),
168 - child: Icon(
169 - Icons.add,
170 - size: 16,
171 - color: Colors.white.withAlpha(128),
146 + // Purely illustrative: the meaning ("receive any token on <chain>") is
147 + // carried by the infobox message text next to it.
148 + return ExcludeSemantics(
149 + child: Row(
150 + spacing: 8,
151 + children: [
152 + CakeImageWidget(
153 + imageUrl: chainIconPath,
154 + width: 20,
155 + height: 20,
156 + colorFilter:
157 + ColorFilter.mode(Theme.of(context).colorScheme.onSurfaceVariant, BlendMode.srcIn),
158 + ),
159 + Container(
160 + height: 28,
161 + width: 1,
162 + color: Theme.of(context).colorScheme.surfaceContainerHigh,
163 + ),
164 + SizedBox(
165 + height: iconSize + iconBorder * 2,
166 + width: stackWidth,
167 + child: Stack(
168 + children: [
169 + Positioned(
170 + top: iconBorder,
171 + left: overlap * currenciesLimited.length,
172 + child: Container(
173 + width: 24,
174 + height: 24,
175 + decoration: BoxDecoration(
176 + color: Colors.white.withAlpha(25),
177 + borderRadius: BorderRadius.circular(9999999)),
178 + child: Icon(
179 + Icons.add,
180 + size: 16,
181 + color: Colors.white.withAlpha(128),
182 + ),
183 ),
184 ),
174 - ),
175 - ...currenciesLimited
176 - .asMap()
177 - .entries
178 - .map((entry) => Positioned(
179 - left: 16.0 * entry.key,
180 - child: Container(
181 - decoration: BoxDecoration(
182 - border: Border.all(
183 - color: Theme.of(context).colorScheme.surfaceContainer,
184 - width: iconBorder),
185 - borderRadius: BorderRadius.circular(9999999)),
186 - child: TokenImageWidget(
187 - imageUrl: entry.value.iconPath ?? '',
188 - size: 24,
185 + ...currenciesLimited
186 + .asMap()
187 + .entries
188 + .map((entry) => Positioned(
189 + left: 16.0 * entry.key,
190 + child: Container(
191 + decoration: BoxDecoration(
192 + border: Border.all(
193 + color: Theme.of(context).colorScheme.surfaceContainer,
194 + width: iconBorder),
195 + borderRadius: BorderRadius.circular(9999999)),
196 + child: TokenImageWidget(
197 + imageUrl: entry.value.iconPath ?? '',
198 + size: 24,
199 + ),
200 ),
190 - ),
191 - ))
192 - .toList()
193 - .reversed,
194 - ],
195 - ),
196 - )
197 - ],
201 + ))
202 + .toList()
203 + .reversed,
204 + ],
205 + ),
206 + )
207 + ],
208 + ),
209 );
210 }
211 }
lib/new-ui/widgets/receive_page/receive_label_modal.dart
+26 -21
@@ -92,27 +92,32 @@ class _ReceiveLabelModalState extends State<ReceiveLabelModal> {
92 return SizedBox(width: 8);
93 },
94 itemBuilder: (context, index) {
95 - return Container(
96 - height: 36,
97 - decoration: BoxDecoration(
98 - color: Theme.of(context).colorScheme.surfaceContainerHigh,
99 - borderRadius: BorderRadius.circular(999)),
100 - child: Material(
101 - color: Colors.transparent,
102 - borderRadius: BorderRadius.circular(999),
103 - child: InkWell(
104 - borderRadius: BorderRadius.circular(999),
105 - onTap: () {
106 - _controller.text = defaultLabels[index];
107 - },
108 - child: Padding(
109 - padding: const EdgeInsets.symmetric(horizontal: 10.0),
110 - child: Center(
111 - child: Text(
112 - defaultLabels[index],
113 - style: TextStyle(
114 - fontWeight: FontWeight.w400,
115 - color: Theme.of(context).colorScheme.primary),
95 + return MergeSemantics(
96 + child: Semantics(
97 + button: true,
98 + child: Container(
99 + height: 36,
100 + decoration: BoxDecoration(
101 + color: Theme.of(context).colorScheme.surfaceContainerHigh,
102 + borderRadius: BorderRadius.circular(999)),
103 + child: Material(
104 + color: Colors.transparent,
105 + borderRadius: BorderRadius.circular(999),
106 + child: InkWell(
107 + borderRadius: BorderRadius.circular(999),
108 + onTap: () {
109 + _controller.text = defaultLabels[index];
110 + },
111 + child: Padding(
112 + padding: const EdgeInsets.symmetric(horizontal: 10.0),
113 + child: Center(
114 + child: Text(
115 + defaultLabels[index],
116 + style: TextStyle(
117 + fontWeight: FontWeight.w400,
118 + color: Theme.of(context).colorScheme.primary),
119 + ),
120 + ),
121 ),
122 ),
123 ),
lib/new-ui/widgets/receive_page/receive_label_widget.dart
+10 -8
@@ -22,14 +22,16 @@ class ReceiveLabelWidget extends StatelessWidget {
22 spacing: 8,
23 mainAxisSize: MainAxisSize.min,
24 children: [
25 - ClipRect(
26 - child: CakeImageWidget(
27 - imageUrl: "assets/new-ui/label.svg",
28 - width: 24,
29 - height: 24,
30 - colorFilter: ColorFilter.mode(
31 - Theme.of(context).colorScheme.onSurfaceVariant, BlendMode.srcIn),
32 - )),
25 + ExcludeSemantics(
26 + child: ClipRect(
27 + child: CakeImageWidget(
28 + imageUrl: "assets/new-ui/label.svg",
29 + width: 24,
30 + height: 24,
31 + colorFilter: ColorFilter.mode(
32 + Theme.of(context).colorScheme.onSurfaceVariant, BlendMode.srcIn),
33 + )),
34 + ),
35 Text(name,
36 style: TextStyle(
37 fontSize: 12, color: Theme.of(context).colorScheme.onSurfaceVariant)),
lib/new-ui/widgets/swap_page/swap_send_external_modal.dart
+4
@@ -212,6 +212,10 @@ class _SwapSendExternalModalState extends State<SwapSendExternalModal> {
212 child: Icon(
213 copied ? Icons.check : Icons.copy,
214 key: ValueKey(copied),
215 + // Only the icon changes here, so label
216 + // the copied state for CopyWrapper's
217 + // live region to announce.
218 + semanticLabel: copied ? S.of(context).copied : null,
219 size: 18,
220 color: Theme.of(context).colorScheme.primary,
221 ),
res/values/strings_en.arb
+4
@@ -557,6 +557,7 @@
557 "incorrect_seed": "The text entered is not valid.",
558 "incorrect_seed_option": "Incorrect. Please try again",
559 "incorrect_seed_option_back": "Incorrect. Please make sure your seed is saved correctly and try again.",
560 + "info": "Info",
561 "infobox_auto_address": "Your receive address will rotate every time you receive a transaction",
562 "infobox_multichain": "Use this address to receive any token or collectible on",
563 "infobox_rotation": "Your receive address will rotate every time you close and reopen this screen",
@@ -623,6 +624,7 @@
624 "long_press_edit_address": "Long press to edit address",
625 "long_press_hide_balance": "Long press card to hide balance",
626 "long_press_show_balance": "Long press card to show balance",
627 + "long_press_to_copy": "Long press to copy",
628 "low_fee": "Low fee",
629 "low_fee_alert": "You currently are using a low network fee priority. This could cause long waits, different rates, or canceled trades. We recommend setting a higher fee for a better experience.",
630 "made_easy": "made easy",
@@ -1134,6 +1136,7 @@
1136 "sort_by": "Sort by",
1137 "spend_key_private": "Spend key (private)",
1138 "spend_key_public": "Spend key (public)",
1139 + "standard": "Standard",
1140 "starting_tor_proxy": "Starting Tor proxy",
1141 "status": "Status: ",
1142 "step": "Step",
@@ -1211,6 +1214,7 @@
1214 "to_lightning": "to Lightning",
1215 "to_on_chain": "to on-chain",
1216 "today": "Today",
1217 + "token": "Token",
1218 "token_already_exists": "Token already exists",
1219 "token_decimal": "Token decimal (eg: 6 for USDT)",
1220 "token_name": "Token name (eg: Tether)",