From 281725fa5b3d340675bb3785664c70b6c3ddface Mon Sep 17 00:00:00 2001 From: Omar Date: Wed, 3 Jun 2026 18:29:09 +0200 Subject: [PATCH] Fix and update monero_c hash --- cw_monero/pubspec.lock | 8 ++--- lib/new-ui/pages/scan_page.dart | 52 +++++++++++++++++---------------- scripts/prepare_moneroc.sh | 2 +- 3 files changed, 32 insertions(+), 30 deletions(-) diff --git a/cw_monero/pubspec.lock b/cw_monero/pubspec.lock index 2cd06b9d4..2fbb5d4e5 100644 --- a/cw_monero/pubspec.lock +++ b/cw_monero/pubspec.lock @@ -982,8 +982,8 @@ packages: dependency: "direct main" description: path: trezor-flutter - ref: becd18ac474d343d94b6191d89fad43270d2a02e - resolved-ref: becd18ac474d343d94b6191d89fad43270d2a02e + ref: d1289dfa4247a93ee57342dfd249957b339915ef + resolved-ref: d1289dfa4247a93ee57342dfd249957b339915ef url: "https://github.com/cake-tech/trezor-flutter.git" source: git version: "0.1.0" @@ -991,8 +991,8 @@ packages: dependency: transitive description: path: trezor_usb_transport - ref: becd18ac474d343d94b6191d89fad43270d2a02e - resolved-ref: becd18ac474d343d94b6191d89fad43270d2a02e + ref: d1289dfa4247a93ee57342dfd249957b339915ef + resolved-ref: d1289dfa4247a93ee57342dfd249957b339915ef url: "https://github.com/cake-tech/trezor-flutter.git" source: git version: "0.0.1" diff --git a/lib/new-ui/pages/scan_page.dart b/lib/new-ui/pages/scan_page.dart index 8b47d33dc..a4b10437b 100644 --- a/lib/new-ui/pages/scan_page.dart +++ b/lib/new-ui/pages/scan_page.dart @@ -42,9 +42,13 @@ class _ScanPageState extends State { @override void initState() { super.initState(); - controller.addListener(() => if (mounted) setState(() { + controller.addListener(() { + if (mounted) { + setState(() { _numCameras = controller.value.availableCameras; - })); + }); + } + }); } @override @@ -312,7 +316,7 @@ class _ScanPageState extends State { if (widget.showHelp) ScanPageButton( onTap: () async { - if(_textInputMode) return; + if (_textInputMode) return; try { controller.stop(); await showModalBottomSheet( @@ -321,11 +325,9 @@ class _ScanPageState extends State { useSafeArea: true, backgroundColor: Theme.of(context).colorScheme.surface, builder: (context) => ScanPageNetworkList()); - } finally { controller.start(); } - }, icon: Icons.question_mark, buttonColor: buttonColor, @@ -358,26 +360,26 @@ class _ScanPageState extends State { duration: Duration(milliseconds: 500), opacity: isScanningURQR ? 1 : 0, child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - "${decoder.processedPartsCount()}", - style: TextStyle( - fontSize: 45, - fontWeight: FontWeight.w500, - color: Theme.of(context).colorScheme.primary), - ), - Text( - "/", - style: TextStyle( - fontSize: 45, color: Theme.of(context).colorScheme.onSurfaceVariant), - ), - Text( - "${decoder.expectedPartCount()}", - style: TextStyle(fontSize: 45, color: Theme.of(context).colorScheme.onSurface), - ), - ], - ), + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + "${decoder.processedPartsCount()}", + style: TextStyle( + fontSize: 45, + fontWeight: FontWeight.w500, + color: Theme.of(context).colorScheme.primary), + ), + Text( + "/", + style: TextStyle( + fontSize: 45, color: Theme.of(context).colorScheme.onSurfaceVariant), + ), + Text( + "${decoder.expectedPartCount()}", + style: TextStyle(fontSize: 45, color: Theme.of(context).colorScheme.onSurface), + ), + ], + ), ), ) ], diff --git a/scripts/prepare_moneroc.sh b/scripts/prepare_moneroc.sh index 0a328f5f3..d8caf006a 100755 --- a/scripts/prepare_moneroc.sh +++ b/scripts/prepare_moneroc.sh @@ -16,7 +16,7 @@ fi # NOTE: Make sure to update monero_c prebuilds link in workflow files # https://github.com/MrCyjaneK/monero_c/releases/download/v0.18.4.6-RC2/release-bundle.zip git fetch -a -git checkout 3bfb3856a838f2bf6b729501837bb0295dedf25d +git checkout 0b324fe33ff5709feb69e2892767c1be9349957d git reset --hard git submodule update --init --force --recursive