diff --git a/lib/router/router.authenticated.dart b/lib/router/router.authenticated.dart index 2dee91173..9e89180b4 100644 --- a/lib/router/router.authenticated.dart +++ b/lib/router/router.authenticated.dart @@ -45,17 +45,6 @@ final _authenticatedRoutes = [ FadeTransition(opacity: animation, child: child), ), ), - GoRoute( - path: AppLockScreen.routerPage, - pageBuilder: (context, state) => CustomTransitionPage( - transitionDuration: Duration.zero, - reverseTransitionDuration: Duration.zero, - key: state.pageKey, - child: const AppLockScreen(), - transitionsBuilder: (context, animation, secondaryAnimation, child) => - FadeTransition(opacity: animation, child: child), - ), - ), GoRoute( path: NFTTab.routerPage, pageBuilder: (context, state) => CustomTransitionPage( diff --git a/lib/ui/menu/settings/settings_sheet.dart b/lib/ui/menu/settings/settings_sheet.dart index 579c8e00d..91a3d9e8f 100644 --- a/lib/ui/menu/settings/settings_sheet.dart +++ b/lib/ui/menu/settings/settings_sheet.dart @@ -1,15 +1,12 @@ import 'package:aewallet/application/account/providers.dart'; import 'package:aewallet/application/authentication/authentication.dart'; import 'package:aewallet/application/connectivity_status.dart'; -import 'package:aewallet/application/dapps.dart'; import 'package:aewallet/application/device_abilities.dart'; import 'package:aewallet/application/session/session.dart'; import 'package:aewallet/application/settings/language.dart'; import 'package:aewallet/application/settings/primary_currency.dart'; import 'package:aewallet/application/settings/settings.dart'; import 'package:aewallet/application/settings/version.dart'; -import 'package:aewallet/domain/models/dapp.dart'; -import 'package:aewallet/domain/repositories/features_flags.dart'; import 'package:aewallet/infrastructure/datasources/tokens_list.hive.dart'; import 'package:aewallet/infrastructure/rpc/websocket_server.dart'; import 'package:aewallet/model/authentication_method.dart'; @@ -29,7 +26,6 @@ import 'package:aewallet/ui/views/authenticate/logging_out.dart'; import 'package:aewallet/ui/views/main/components/sheet_appbar.dart'; import 'package:aewallet/ui/views/main/home_page.dart'; import 'package:aewallet/ui/views/settings/backupseed_sheet.dart'; -import 'package:aewallet/ui/views/sheets/dex_sheet.dart'; import 'package:aewallet/ui/widgets/components/dialog.dart'; import 'package:aewallet/ui/widgets/components/icon_widget.dart'; import 'package:aewallet/ui/widgets/components/sheet_skeleton.dart'; diff --git a/pubspec.lock b/pubspec.lock index 414ca3c0d..934724128 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,17 +13,10 @@ packages: dependency: transitive description: name: _flutterfire_internals -<<<<<<< HEAD sha256: "37a42d06068e2fe3deddb2da079a8c4d105f241225ba27b7122b37e9865fd8f7" url: "https://pub.dev" source: hosted version: "1.3.35" -======= - sha256: "2350805d7afefb0efe7acd325cb19d3ae8ba4039b906eade3807ffb69938a01f" - url: "https://pub.dev" - source: hosted - version: "1.3.33" ->>>>>>> 66a944e7 (💄 Add DApps tab) adaptive_number: dependency: transitive description: @@ -77,53 +70,18 @@ packages: dependency: "direct main" description: name: archethic_dapp_framework_flutter -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - sha256: "3b43ef8a3d65199edd5090f29ed642edcb0aee9d88f1166ee48b22e7862a7e53" - url: "https://pub.dev" - source: hosted - version: "1.1.23" -======= - sha256: "5de868e946e8404c8d8f4b1592c565301855d548a700313e95a905916e194207" - url: "https://pub.dev" - source: hosted - version: "1.1.8" ->>>>>>> 598e0208 (⬆️ Update Archethic Dart SDK version 3.3.14) -======= - sha256: fb95a351f28850cd8b9ca34ebbdbadfce211a4e4a420d7871c284198fb88b99f + sha256: "2eae3c029bb7cb2916122142804c72dc6f30e91849fef70f9c0b4402458e4eec" url: "https://pub.dev" source: hosted - version: "1.1.11" ->>>>>>> 4bd5faf4 (⬆️ Update Archethic Dart SDK version 3.3.15) -======= - sha256: "638753209488c4efd992257fb708668be3e5e696d1f320c3b30d02945d7e7332" - url: "https://pub.dev" - source: hosted - version: "1.1.17" ->>>>>>> 66a944e7 (💄 Add DApps tab) + version: "1.1.24" archethic_lib_dart: dependency: "direct main" description: name: archethic_lib_dart -<<<<<<< HEAD -<<<<<<< HEAD sha256: "9644035fd44b68d6558d906b62bbd74800068e71367e929a1a73d60d2a54e054" url: "https://pub.dev" source: hosted version: "3.3.16" -======= - sha256: e67fc0f4201afec9b0d4ac373251613be55c4ce41f6d88ab4f9054681f7dc3b2 - url: "https://pub.dev" - source: hosted - version: "3.3.14" ->>>>>>> 598e0208 (⬆️ Update Archethic Dart SDK version 3.3.14) -======= - sha256: bcfaef5b204c396270c2241c89149a86b02a6bdbc0f64260288bace4536dd502 - url: "https://pub.dev" - source: hosted - version: "3.3.15" ->>>>>>> 4bd5faf4 (⬆️ Update Archethic Dart SDK version 3.3.15) archethic_messaging_lib_dart: dependency: "direct main" description: @@ -136,39 +94,18 @@ packages: dependency: transitive description: name: archethic_wallet_client -<<<<<<< HEAD -<<<<<<< HEAD sha256: b26e2e7a2805c6f3b18c50007f165b79521ea5303745f8ac798acd6c25e9cb33 url: "https://pub.dev" source: hosted version: "1.2.7" -======= - sha256: cc659035492078fa49a1cc1f5c8a82aacec7e7004042a18617bf2c2763edf036 - url: "https://pub.dev" - source: hosted - version: "1.2.4" ->>>>>>> 598e0208 (⬆️ Update Archethic Dart SDK version 3.3.14) -======= - sha256: "7f8b8a0843f565a622c821edfd8f6cca0d7359e054316cc07c01d97f0819f939" - url: "https://pub.dev" - source: hosted - version: "1.2.5" ->>>>>>> 4bd5faf4 (⬆️ Update Archethic Dart SDK version 3.3.15) archive: dependency: transitive description: name: archive -<<<<<<< HEAD - sha256: "6bd38d335f0954f5fad9c79e614604fbf03a0e5b975923dd001b6ea965ef5b4b" + sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d url: "https://pub.dev" source: hosted - version: "3.6.0" -======= - sha256: ecf4273855368121b1caed0d10d4513c7241dfc813f7d3c8933b36622ae9b265 - url: "https://pub.dev" - source: hosted - version: "3.5.1" ->>>>>>> 66a944e7 (💄 Add DApps tab) + version: "3.6.1" args: dependency: transitive description: @@ -637,17 +574,10 @@ packages: dependency: "direct main" description: name: firebase_core -<<<<<<< HEAD sha256: "26de145bb9688a90962faec6f838247377b0b0d32cc0abecd9a4e43525fc856c" url: "https://pub.dev" source: hosted version: "2.32.0" -======= - sha256: "372d94ced114b9c40cb85e18c50ac94a7e998c8eec630c50d7aec047847d27bf" - url: "https://pub.dev" - source: hosted - version: "2.31.0" ->>>>>>> 66a944e7 (💄 Add DApps tab) firebase_core_platform_interface: dependency: transitive description: @@ -660,55 +590,34 @@ packages: dependency: transitive description: name: firebase_core_web - sha256: "43d9e951ac52b87ae9cc38ecdcca1e8fa7b52a1dd26a96085ba41ce5108db8e9" + sha256: "22fcb352744908224fc7be3caae254836099786acfe5df6e9fe901e9c2575a41" url: "https://pub.dev" source: hosted - version: "2.17.0" + version: "2.17.1" firebase_messaging: dependency: "direct main" description: name: firebase_messaging -<<<<<<< HEAD sha256: a1662cc95d9750a324ad9df349b873360af6f11414902021f130c68ec02267c4 url: "https://pub.dev" source: hosted version: "14.9.4" -======= - sha256: e0882a7426821f7caccaabfc15a535155cd15b4daa73a5a7b3af701a552d73ab - url: "https://pub.dev" - source: hosted - version: "14.9.2" ->>>>>>> 66a944e7 (💄 Add DApps tab) firebase_messaging_platform_interface: dependency: transitive description: name: firebase_messaging_platform_interface -<<<<<<< HEAD sha256: "87c4a922cb6f811cfb7a889bdbb3622702443c52a0271636cbc90d813ceac147" url: "https://pub.dev" source: hosted version: "4.5.37" -======= - sha256: "52e12cc50e1395ad7ea3552dcbe9958fb1994b5afcf58ee4c0db053932a6fce5" - url: "https://pub.dev" - source: hosted - version: "4.5.35" ->>>>>>> 66a944e7 (💄 Add DApps tab) firebase_messaging_web: dependency: transitive description: name: firebase_messaging_web -<<<<<<< HEAD sha256: "0d34dca01a7b103ed7f20138bffbb28eb0e61a677bf9e78a028a932e2c7322d5" url: "https://pub.dev" source: hosted version: "3.8.7" -======= - sha256: "8812cc5929380b783f92290d934bf32e2fea06701583f47cdccd5f13f4f24522" - url: "https://pub.dev" - source: hosted - version: "3.8.5" ->>>>>>> 66a944e7 (💄 Add DApps tab) fixnum: dependency: transitive description: @@ -891,17 +800,10 @@ packages: dependency: "direct main" description: name: flutter_secure_storage -<<<<<<< HEAD sha256: "165164745e6afb5c0e3e3fcc72a012fb9e58496fb26ffb92cf22e16a821e85d0" url: "https://pub.dev" source: hosted version: "9.2.2" -======= - sha256: "8496a89eea74e23f92581885f876455d9d460e71201405dffe5f55dfe1155864" - url: "https://pub.dev" - source: hosted - version: "9.2.1" ->>>>>>> 66a944e7 (💄 Add DApps tab) flutter_secure_storage_linux: dependency: transitive description: @@ -914,17 +816,10 @@ packages: dependency: transitive description: name: flutter_secure_storage_macos -<<<<<<< HEAD sha256: "1693ab11121a5f925bbea0be725abfcfbbcf36c1e29e571f84a0c0f436147a81" url: "https://pub.dev" source: hosted version: "3.1.2" -======= - sha256: b768a7dab26d6186b68e2831b3104f8968154f0f4fdbf66e7c2dd7bdf299daaf - url: "https://pub.dev" - source: hosted - version: "3.1.1" ->>>>>>> 66a944e7 (💄 Add DApps tab) flutter_secure_storage_platform_interface: dependency: transitive description: @@ -1195,10 +1090,10 @@ packages: dependency: "direct main" description: name: image_picker - sha256: "33974eca2e87e8b4e3727f1b94fa3abcb25afe80b6bc2c4d449a0e150aedf720" + sha256: "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" image_picker_android: dependency: transitive description: @@ -1219,10 +1114,10 @@ packages: dependency: transitive description: name: image_picker_ios - sha256: "4824d8c7f6f89121ef0122ff79bb00b009607faecc8545b86bca9ab5ce1e95bf" + sha256: "6703696ad49f5c3c8356d576d7ace84d1faf459afb07accbb0fae780753ff447" url: "https://pub.dev" source: hosted - version: "0.8.11+2" + version: "0.8.12" image_picker_linux: dependency: transitive description: @@ -1403,17 +1298,10 @@ packages: dependency: transitive description: name: local_auth_darwin -<<<<<<< HEAD sha256: e424ebf90d5233452be146d4a7da4bcd7a70278b67791592f3fde1bda8eef9e2 url: "https://pub.dev" source: hosted version: "1.3.1" -======= - sha256: "959145a4cf6f0de745b9ec9ac60101270eb4c5b8b7c2a0470907014adc1c618d" - url: "https://pub.dev" - source: hosted - version: "1.3.0" ->>>>>>> 66a944e7 (💄 Add DApps tab) local_auth_platform_interface: dependency: transitive description: @@ -1458,10 +1346,10 @@ packages: dependency: "direct main" description: name: material_symbols_icons - sha256: "520b3340d877d78f94ff1fc63e4d5667020811d0dac089ecd19373cf4538e293" + sha256: b2d3cbc3c42b8a217715b0d97ff03aebb14b2b4592875736e5599c603fb2db7e url: "https://pub.dev" source: hosted - version: "4.2744.0" + version: "4.2758.0" meta: dependency: transitive description: @@ -1666,17 +1554,10 @@ packages: dependency: transitive description: name: patrol_finders -<<<<<<< HEAD sha256: "2b51b43019d5db2a47b2fca53c1c54928a87459535d1ae966cd25d165641c7ce" url: "https://pub.dev" source: hosted version: "2.1.1" -======= - sha256: e14214e88c84d34a1d7c89778ddf5c5a913bfc0a6a308da47d3ebca374a1f5f4 - url: "https://pub.dev" - source: hosted - version: "2.1.0" ->>>>>>> 66a944e7 (💄 Add DApps tab) pdfx: dependency: "direct main" description: @@ -1817,10 +1698,10 @@ packages: dependency: transitive description: name: rational - sha256: ba58e9e18df9abde280e8b10051e4bce85091e41e8e7e411b6cde2e738d357cf + sha256: cb808fb6f1a839e6fc5f7d8cb3b0a10e1db48b3be102de73938c627f0b636336 url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.2.3" recase: dependency: transitive description: @@ -2134,10 +2015,10 @@ packages: dependency: "direct main" description: name: url_launcher - sha256: "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e" + sha256: "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3" url: "https://pub.dev" source: hosted - version: "6.2.6" + version: "6.3.0" url_launcher_android: dependency: transitive description: @@ -2302,17 +2183,10 @@ packages: dependency: transitive description: name: webview_flutter_android -<<<<<<< HEAD sha256: "0d21cfc3bfdd2e30ab2ebeced66512b91134b39e72e97b43db2d47dda1c4e53a" url: "https://pub.dev" source: hosted version: "3.16.3" -======= - sha256: dad3313c9ead95517bb1cae5e1c9d20ba83729d5a59e5e83c0a2d66203f27f91 - url: "https://pub.dev" - source: hosted - version: "3.16.1" ->>>>>>> 66a944e7 (💄 Add DApps tab) webview_flutter_platform_interface: dependency: transitive description: