From 4b0b00571ae206affac4074bd6fc205001ad94f0 Mon Sep 17 00:00:00 2001 From: ahmedhanafy725 Date: Wed, 22 Jan 2025 11:20:23 +0200 Subject: [PATCH 01/17] Upgrade the dependencies --- app/lib/apps/chatbot/chatbot_widget.dart | 4 +- app/lib/apps/farmers/farmers_widget.dart | 4 +- app/lib/apps/news/news_widget.dart | 4 +- app/lib/apps/wallet/wallet_widget.dart | 11 +- app/lib/browser.dart | 4 +- app/lib/helpers/flags.dart | 18 +- app/lib/providers/theme_provider.dart | 6 +- app/lib/screens/authentication_screen.dart | 3 +- app/lib/screens/home_screen.dart | 4 +- .../screens/identity_verification_screen.dart | 10 +- app/lib/screens/login_screen.dart | 9 +- app/lib/screens/main_screen.dart | 13 +- app/lib/screens/preference_screen.dart | 14 +- app/lib/screens/scan_screen.dart | 26 +- app/lib/screens/sign_screen.dart | 2 +- app/lib/screens/wallets/send.dart | 6 +- app/lib/services/pkid_service.dart | 2 +- .../services/shared_preference_service.dart | 21 +- app/lib/services/socket_service.dart | 19 +- app/lib/services/uni_link_service.dart | 12 +- app/lib/widgets/preference_dialog.dart | 10 +- app/lib/widgets/wallets/add_wallet.dart | 7 +- app/pubspec.lock | 783 ++++++++++-------- app/pubspec.yaml | 74 +- 24 files changed, 557 insertions(+), 509 deletions(-) diff --git a/app/lib/apps/chatbot/chatbot_widget.dart b/app/lib/apps/chatbot/chatbot_widget.dart index 64f8ea047..0fb6861d6 100644 --- a/app/lib/apps/chatbot/chatbot_widget.dart +++ b/app/lib/apps/chatbot/chatbot_widget.dart @@ -26,8 +26,8 @@ class _ChatbotState extends State _ChatbotState({required this.email}) { iaWebview = InAppWebView( initialUrlRequest: URLRequest( - url: Uri.parse( - '${config.url()}$email&cache_buster=${DateTime.now().millisecondsSinceEpoch}')), + url: WebUri.uri(Uri.parse( + '${config.url()}$email&cache_buster=${DateTime.now().millisecondsSinceEpoch}'))), initialOptions: InAppWebViewGroupOptions( crossPlatform: InAppWebViewOptions(useShouldOverrideUrlLoading: true), android: AndroidInAppWebViewOptions( diff --git a/app/lib/apps/farmers/farmers_widget.dart b/app/lib/apps/farmers/farmers_widget.dart index b0b8efc41..b422741df 100644 --- a/app/lib/apps/farmers/farmers_widget.dart +++ b/app/lib/apps/farmers/farmers_widget.dart @@ -51,8 +51,8 @@ class _FarmersState extends State iaWebView = InAppWebView( initialUrlRequest: URLRequest( - url: Uri.parse( - '$farmersUri?cache_buster=${DateTime.now().millisecondsSinceEpoch}')), + url: WebUri.uri(Uri.parse( + '$farmersUri?cache_buster=${DateTime.now().millisecondsSinceEpoch}'))), initialOptions: InAppWebViewGroupOptions( crossPlatform: InAppWebViewOptions( cacheEnabled: Globals().isCacheClearedFarmer, diff --git a/app/lib/apps/news/news_widget.dart b/app/lib/apps/news/news_widget.dart index bede24873..54a6b19cc 100644 --- a/app/lib/apps/news/news_widget.dart +++ b/app/lib/apps/news/news_widget.dart @@ -41,8 +41,8 @@ class _NewsState extends State with AutomaticKeepAliveClientMixin { initialEndsWith = DateTime.now().millisecondsSinceEpoch.toString(); iaWebView = InAppWebView( initialUrlRequest: URLRequest( - url: Uri.parse( - 'https://news.threefold.me?cache_buster=$initialEndsWith')), + url: WebUri.uri(Uri.parse( + 'https://news.threefold.me?cache_buster=$initialEndsWith'))), initialOptions: InAppWebViewGroupOptions( crossPlatform: InAppWebViewOptions(), android: AndroidInAppWebViewOptions( diff --git a/app/lib/apps/wallet/wallet_widget.dart b/app/lib/apps/wallet/wallet_widget.dart index 1c05b6a9e..7f39e849f 100644 --- a/app/lib/apps/wallet/wallet_widget.dart +++ b/app/lib/apps/wallet/wallet_widget.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_inappwebview/flutter_inappwebview.dart'; -import 'package:qr_code_scanner/qr_code_scanner.dart'; +// import 'package:qr_code_scanner/qr_code_scanner.dart'; import 'package:threebotlogin/apps/wallet/wallet_config.dart'; import 'package:threebotlogin/apps/wallet/wallet_events.dart'; import 'package:threebotlogin/apps/wallet/wallet_user_data.dart'; @@ -52,9 +52,9 @@ class _WalletState extends State : 'https://${config.appId()}/init'; iaWebView = InAppWebView( - initialUrlRequest: URLRequest( - url: Uri.parse( - '$walletUri?cache_buster=${DateTime.now().millisecondsSinceEpoch}')), + // initialUrlRequest: URLRequest( + // url: Uri.parse( + // '$walletUri?cache_buster=${DateTime.now().millisecondsSinceEpoch}')), initialOptions: InAppWebViewGroupOptions( crossPlatform: InAppWebViewOptions( cacheEnabled: Globals().isCacheClearedWallet, @@ -132,7 +132,8 @@ class _WalletState extends State // QRCode scanner is black if we don't sleep here. bool slept = await Future.delayed(const Duration(milliseconds: 400), () => true); - late Barcode result; + // late Barcode result; + late dynamic result; if (slept) { result = await Navigator.push( context, MaterialPageRoute(builder: (context) => const ScanScreen())); diff --git a/app/lib/browser.dart b/app/lib/browser.dart index 1438c0236..9945cb982 100644 --- a/app/lib/browser.dart +++ b/app/lib/browser.dart @@ -4,13 +4,13 @@ import 'package:threebotlogin/helpers/logger.dart'; class MyInAppBrowser extends InAppBrowser { @override void onLoadStart(Uri? url) { - super.onLoadStart(url); + super.onLoadStart(WebUri.uri(url!)); logger.i('\n\nStarted $url\n\n'); } @override void onLoadStop(Uri? url) { - super.onLoadStop(url); + super.onLoadStop(WebUri.uri(url!)); logger.i('\n\nStopped $url\n\n'); } diff --git a/app/lib/helpers/flags.dart b/app/lib/helpers/flags.dart index 63cbd6408..1e11da701 100644 --- a/app/lib/helpers/flags.dart +++ b/app/lib/helpers/flags.dart @@ -94,22 +94,18 @@ class Flags { Future hasFlagValueByFeatureName(String name) async { String? doubleName = await getDoubleName(); - if (doubleName != null) { - Identity user = Identity(identifier: doubleName); - return (await client.hasFeatureFlag(name, user: user) && - await client.isFeatureFlagEnabled(name, user: user)); - } - return (await client.hasFeatureFlag(name) && + Identity user = Identity(identifier: doubleName); + return (await client.hasFeatureFlag(name, user: user) && + await client.isFeatureFlagEnabled(name, user: user)); + return (await client.hasFeatureFlag(name) && await client.isFeatureFlagEnabled(name)); } Future getFlagValueByFeatureName(String name) async { String? doubleName = await getDoubleName(); - if (doubleName != null) { - Identity user = Identity(identifier: doubleName); - return (await client.getFeatureFlagValue(name, user: user)); - } - return (await client.getFeatureFlagValue(name)); + Identity user = Identity(identifier: doubleName); + return (await client.getFeatureFlagValue(name, user: user)); + return (await client.getFeatureFlagValue(name)); } Future setDeviceTrait(Identity user) async { diff --git a/app/lib/providers/theme_provider.dart b/app/lib/providers/theme_provider.dart index 9ab213699..c4a65d4a3 100644 --- a/app/lib/providers/theme_provider.dart +++ b/app/lib/providers/theme_provider.dart @@ -26,12 +26,8 @@ class ThemeModeNotifier extends StateNotifier { Future loadTheme() async { String? savedTheme = await getTheme(); - if (savedTheme != null) { - state = savedTheme == 'dark' ? ThemeMode.dark : ThemeMode.light; - } else { - state = ThemeMode.system; + state = savedTheme == 'dark' ? ThemeMode.dark : ThemeMode.light; } - } } final themeModeNotifier = StateNotifierProvider( diff --git a/app/lib/screens/authentication_screen.dart b/app/lib/screens/authentication_screen.dart index 4f7ce7e49..235f02c41 100644 --- a/app/lib/screens/authentication_screen.dart +++ b/app/lib/screens/authentication_screen.dart @@ -58,8 +58,7 @@ class AuthenticationScreenState extends State { int? created = widget.loginData!.created; int currentTimestamp = DateTime.now().millisecondsSinceEpoch; - if (created != null && - ((currentTimestamp - created) / 1000) > Globals().loginTimeout) { + if (((currentTimestamp - created) / 1000) > Globals().loginTimeout) { timer.cancel(); await showDialog( diff --git a/app/lib/screens/home_screen.dart b/app/lib/screens/home_screen.dart index 78ffbe34f..96d91d042 100644 --- a/app/lib/screens/home_screen.dart +++ b/app/lib/screens/home_screen.dart @@ -54,7 +54,7 @@ class _HomeScreenState extends State context, MaterialPageRoute( builder: (context) => AuthenticationScreen( - correctPin: pin!, + correctPin: pin, userMessage: 'Please enter your PIN code', ), ), @@ -62,7 +62,7 @@ class _HomeScreenState extends State pinCheckOpen = false; - if (authenticated != null && authenticated) { + if (authenticated) { lastCheck = DateTime.now().millisecondsSinceEpoch; timeoutExpiredInBackground = false; globals.tabController.animateTo(indexIfAuthIsSuccess); diff --git a/app/lib/screens/identity_verification_screen.dart b/app/lib/screens/identity_verification_screen.dart index cf214ab65..b1e40515f 100644 --- a/app/lib/screens/identity_verification_screen.dart +++ b/app/lib/screens/identity_verification_screen.dart @@ -587,12 +587,12 @@ class _IdentityVerificationScreenState context, MaterialPageRoute( builder: (context) => AuthenticationScreen( - correctPin: pin!, + correctPin: pin, userMessage: 'Please enter your PIN code', ), )); - if (authenticated != null && authenticated) { + if (authenticated) { final phrase = await getPhrase(); showDialog( @@ -937,7 +937,7 @@ class _IdentityVerificationScreenState } String? phoneNumber = phoneMap['phone']; - if (phoneNumber == null || phoneNumber.isEmpty) { + if (phoneNumber.isEmpty) { return; } @@ -1129,7 +1129,7 @@ class _IdentityVerificationScreenState String? phoneNumber = phoneMap['phone']; if (phone != phoneNumber) { setState(() { - phone = phoneNumber!; + phone = phoneNumber; }); } return; @@ -1865,7 +1865,7 @@ class _IdentityVerificationScreenState return; } String? phoneNumber = phoneMap['phone']; - if (phoneNumber == null || phoneNumber.isEmpty) { + if (phoneNumber.isEmpty) { return; } diff --git a/app/lib/screens/login_screen.dart b/app/lib/screens/login_screen.dart index 9f76b133f..6b8b03eba 100644 --- a/app/lib/screens/login_screen.dart +++ b/app/lib/screens/login_screen.dart @@ -289,7 +289,7 @@ class _LoginScreenState extends State with BlockAndRunMixin { cancelIt() async { String? doubleName = await getDoubleName(); - cancelLogin(doubleName!); + cancelLogin(doubleName); } sendIt(bool includeData) async { @@ -300,11 +300,10 @@ class _LoginScreenState extends State with BlockAndRunMixin { int? created = widget.loginData.created; int currentTimestamp = DateTime.now().millisecondsSinceEpoch; - if (created != null && - ((currentTimestamp - created) / 1000) > Globals().loginTimeout) { + if (((currentTimestamp - created) / 1000) > Globals().loginTimeout) { await showExpiredDialog(context); await sendData( - state!, null, selectedImageId, null, widget.loginData.appId!); + state, null, selectedImageId, null, widget.loginData.appId!); if (Navigator.canPop(context)) { Navigator.pop(context, false); @@ -315,7 +314,7 @@ class _LoginScreenState extends State with BlockAndRunMixin { } // If the state is not passed through the regEx - bool stateCheck = RegExp(r'[^A-Za-z0-9]+').hasMatch(state!); + bool stateCheck = RegExp(r'[^A-Za-z0-9]+').hasMatch(state); if (stateCheck) { logger.i('States can only be alphanumeric [^A-Za-z0-9]'); return; diff --git a/app/lib/screens/main_screen.dart b/app/lib/screens/main_screen.dart index 84eefae23..768124df2 100644 --- a/app/lib/screens/main_screen.dart +++ b/app/lib/screens/main_screen.dart @@ -213,8 +213,7 @@ class _AppState extends State { try { String? seedPhrase = await getPhrase(); - if (seedPhrase != null && - (await isPKidMigrationIssueSolved() == false || + if ((await isPKidMigrationIssueSolved() == false || await isPKidMigrationIssueSolved() == null)) { fixPkidMigration(); } @@ -314,12 +313,10 @@ class _AppState extends State { Future loadTwinId() async { int? twinId = await getTwinId(); - if (twinId == null || twinId == 0) { + if (twinId == 0) { twinId = await TFChain.getMyTwinId(); - if (twinId != null) { - await saveTwinId(twinId); - await updateUserData('twin_id', twinId.toString()); - } - } + await saveTwinId(twinId); + await updateUserData('twin_id', twinId.toString()); + } } } diff --git a/app/lib/screens/preference_screen.dart b/app/lib/screens/preference_screen.dart index d61a7038b..3969ad31b 100644 --- a/app/lib/screens/preference_screen.dart +++ b/app/lib/screens/preference_screen.dart @@ -77,7 +77,7 @@ class _PreferenceScreenState extends ConsumerState { context, MaterialPageRoute( builder: (context) => AuthenticationScreen( - correctPin: pin!, + correctPin: pin, userMessage: 'Please enter your PIN code', ), )); @@ -290,12 +290,12 @@ class _PreferenceScreenState extends ConsumerState { context, MaterialPageRoute( builder: (context) => AuthenticationScreen( - correctPin: pin!, + correctPin: pin, userMessage: 'Please enter your PIN code', ), )); - if (authenticated == null || !authenticated) { + if (!authenticated) { deleteLoading = false; setState(() {}); return false; @@ -386,13 +386,13 @@ class _PreferenceScreenState extends ConsumerState { context, MaterialPageRoute( builder: (context) => AuthenticationScreen( - correctPin: pin!, + correctPin: pin, userMessage: 'Please enter your PIN code', ), ), ); - if (authenticated != null && authenticated) { + if (authenticated) { finger = newFingerprintValue; await saveFingerprint(newFingerprintValue); setState(() {}); @@ -403,7 +403,7 @@ class _PreferenceScreenState extends ConsumerState { String? pin = await getPin(); bool? authenticated = false; - if (pin == null || pin.isEmpty) { + if (pin.isEmpty) { authenticated = true; // In case the pin wasn't set. } else { authenticated = await Navigator.push( @@ -417,7 +417,7 @@ class _PreferenceScreenState extends ConsumerState { ); } - if (authenticated != null && authenticated) { + if (authenticated) { bool pinChanged = await Navigator.push( context, MaterialPageRoute( diff --git a/app/lib/screens/scan_screen.dart b/app/lib/screens/scan_screen.dart index 9d46f99f7..233e1c9c8 100644 --- a/app/lib/screens/scan_screen.dart +++ b/app/lib/screens/scan_screen.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:qr_code_scanner/qr_code_scanner.dart'; +// import 'package:qr_code_scanner/qr_code_scanner.dart'; class ScanScreen extends StatefulWidget { const ScanScreen({super.key}); @@ -24,24 +24,24 @@ class _ScanScreenState extends State { return Scaffold( body: Stack( children: [ - QRView( - key: qrKey, - onQRViewCreated: _onQRViewCreated, - ), + // QRView( + // key: qrKey, + // onQRViewCreated: _onQRViewCreated, + // ), Align(alignment: Alignment.bottomCenter, child: content()), ], ), ); } - void _onQRViewCreated(QRViewController controller) { - controller.scannedDataStream.listen((scanData) { - if (!popped) { - popped = true; - Navigator.pop(context, scanData); - } - }); - } + // void _onQRViewCreated(QRViewController controller) { + // controller.scannedDataStream.listen((scanData) { + // if (!popped) { + // popped = true; + // Navigator.pop(context, scanData); + // } + // }); + // } Widget content() { double height = MediaQuery.of(context).size.height; diff --git a/app/lib/screens/sign_screen.dart b/app/lib/screens/sign_screen.dart index 0497a9c30..dc376f23b 100644 --- a/app/lib/screens/sign_screen.dart +++ b/app/lib/screens/sign_screen.dart @@ -460,6 +460,6 @@ class _SignScreenState extends State with BlockAndRunMixin { cancelSignAttempt() async { String? doubleName = await getDoubleName(); - cancelSign(doubleName!); + cancelSign(doubleName); } } diff --git a/app/lib/screens/wallets/send.dart b/app/lib/screens/wallets/send.dart index b56e46577..f7ed0c806 100644 --- a/app/lib/screens/wallets/send.dart +++ b/app/lib/screens/wallets/send.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:qr_code_scanner/qr_code_scanner.dart'; +// import 'package:qr_code_scanner/qr_code_scanner.dart'; import 'package:threebotlogin/helpers/globals.dart'; import 'package:threebotlogin/helpers/transaction_helpers.dart'; import 'package:threebotlogin/models/wallet.dart'; @@ -374,7 +374,9 @@ class _WalletSendScreenState extends ConsumerState { // QRCode scanner is black if we don't sleep here. bool slept = await Future.delayed(const Duration(milliseconds: 400), () => true); - late Barcode result; + // late Barcode result; + late dynamic result; + if (slept) { if (context.mounted) { result = await Navigator.push(context, diff --git a/app/lib/services/pkid_service.dart b/app/lib/services/pkid_service.dart index e4b9af087..e0f661aec 100644 --- a/app/lib/services/pkid_service.dart +++ b/app/lib/services/pkid_service.dart @@ -11,7 +11,7 @@ Future getPkidClient({String seedPhrase = ''}) async { String pKidUrl = AppConfig().pKidUrl(); String? phrase = seedPhrase != '' ? seedPhrase : await getPhrase(); - KeyPair keyPair = await generateKeyPairFromSeedPhrase(phrase!); + KeyPair keyPair = await generateKeyPairFromSeedPhrase(phrase); return FlutterPkid(pKidUrl, keyPair); } diff --git a/app/lib/services/shared_preference_service.dart b/app/lib/services/shared_preference_service.dart index 702886a50..4feeda001 100644 --- a/app/lib/services/shared_preference_service.dart +++ b/app/lib/services/shared_preference_service.dart @@ -26,7 +26,7 @@ Future getPublicKey() async { if (isPublicKeyFixed == true) { String? encodedPublicKey = prefs.getString('publickey'); - return base64.decode(encodedPublicKey!); + return base64.decode(encodedPublicKey); } var userInfoResponse = await getUserInfo(await getDoubleName()); @@ -42,7 +42,7 @@ Future getPublicKey() async { } String? encodedPublicKey = prefs.getString('publickey'); - return base64.decode(encodedPublicKey!); + return base64.decode(encodedPublicKey); } Future savePublicKey(Uint8List publicKey) async { @@ -72,7 +72,7 @@ Future getPrivateKey() async { final SharedPreferences prefs = await SharedPreferences.getInstance(); String? privateKey = prefs.getString('privatekey'); - Uint8List decodedPrivateKey = base64.decode(privateKey!); + Uint8List decodedPrivateKey = base64.decode(privateKey); return decodedPrivateKey; } @@ -310,11 +310,6 @@ Future getFingerprint() async { final SharedPreferences prefs = await SharedPreferences.getInstance(); bool? result = prefs.getBool('useFingerPrint'); - if (result == null) { - prefs.setBool('useFingerPrint', false); - result = prefs.getBool('useFingerPrint'); - } - return result; } @@ -362,10 +357,6 @@ Future getInitDone() async { final SharedPreferences prefs = await SharedPreferences.getInstance(); bool? initDone = prefs.getBool('initDone'); - if (initDone == null) { - prefs.setBool('initDone', false); - initDone = prefs.getBool('initDone'); - } bool isInitDone = initDone == true; return isInitDone; @@ -450,11 +441,7 @@ Future> getLocationIdList() async { List locationIdList = []; - if (locationIdListAsJson != null) { - locationIdList = jsonDecode(locationIdListAsJson); - } else { - locationIdList = []; - } + locationIdList = jsonDecode(locationIdListAsJson); return locationIdList; } diff --git a/app/lib/services/socket_service.dart b/app/lib/services/socket_service.dart index 902c322bd..1590f8322 100644 --- a/app/lib/services/socket_service.dart +++ b/app/lib/services/socket_service.dart @@ -269,7 +269,7 @@ Future openSign(BuildContext ctx, Sign signData, BackendConnection backendConnection) async { String? messageType = signData.type; - if (messageType == null || messageType != 'sign') { + if (messageType != 'sign') { return; } @@ -280,11 +280,11 @@ Future openSign(BuildContext ctx, Sign signData, ctx, MaterialPageRoute( builder: (context) => AuthenticationScreen( - correctPin: pin!, userMessage: 'Please enter your PIN code'), + correctPin: pin, userMessage: 'Please enter your PIN code'), ), ); - if (authenticated == null || authenticated == false) { + if (authenticated == false) { return; } @@ -297,7 +297,7 @@ Future openSign(BuildContext ctx, Sign signData, ), ); - if (signAccepted == null || signAccepted == false) { + if (signAccepted == false) { backendConnection.joinRoom(signData.doubleName); return; } @@ -310,8 +310,7 @@ Future openLogin(BuildContext ctx, Login loginData, BackendConnection backendConnection) async { String? messageType = loginData.type; - if (messageType == null || - messageType != 'login' || + if (messageType != 'login' || loginData.isMobile == true) { return; } @@ -324,13 +323,13 @@ Future openLogin(BuildContext ctx, Login loginData, ctx, MaterialPageRoute( builder: (context) => AuthenticationScreen( - correctPin: pin!, + correctPin: pin, userMessage: 'Please enter your PIN code.', loginData: loginData), ), ); - if (authenticated == null || authenticated == false) { + if (authenticated == false) { return; } @@ -342,7 +341,7 @@ Future openLogin(BuildContext ctx, Login loginData, ), ); - if (warningScreenCompleted == null || !warningScreenCompleted) { + if (!warningScreenCompleted) { return; } @@ -358,7 +357,7 @@ Future openLogin(BuildContext ctx, Login loginData, ), ); - if (loggedIn == null || loggedIn == false) { + if (loggedIn == false) { backendConnection.joinRoom(loginData.doubleName); return; } diff --git a/app/lib/services/uni_link_service.dart b/app/lib/services/uni_link_service.dart index 0b28e3995..5919610c2 100644 --- a/app/lib/services/uni_link_service.dart +++ b/app/lib/services/uni_link_service.dart @@ -53,11 +53,11 @@ void handleLoginUniLink(Uri link, BuildContext context) async { context, MaterialPageRoute( builder: (context) => AuthenticationScreen( - correctPin: pin!, userMessage: 'Please enter your PIN code'), + correctPin: pin, userMessage: 'Please enter your PIN code'), ), ); - if (authenticated == null || authenticated == false) { + if (authenticated == false) { return; } @@ -68,7 +68,7 @@ void handleLoginUniLink(Uri link, BuildContext context) async { ), ); - if (loggedIn == null || loggedIn == false) { + if (loggedIn == false) { return; } @@ -122,11 +122,11 @@ Future handleSignUniLink(Uri link, BuildContext context) async { context, MaterialPageRoute( builder: (context) => AuthenticationScreen( - correctPin: pin!, userMessage: 'Please enter your PIN code'), + correctPin: pin, userMessage: 'Please enter your PIN code'), ), ); - if (authenticated == null || authenticated == false) { + if (authenticated == false) { return; } @@ -137,7 +137,7 @@ Future handleSignUniLink(Uri link, BuildContext context) async { ), ); - if (loggedIn == null || loggedIn == false) { + if (loggedIn == false) { return; } diff --git a/app/lib/widgets/preference_dialog.dart b/app/lib/widgets/preference_dialog.dart index 0988649d4..2ff8539c4 100644 --- a/app/lib/widgets/preference_dialog.dart +++ b/app/lib/widgets/preference_dialog.dart @@ -57,14 +57,8 @@ class _PreferenceDialogState extends State { widget.appId!); // Scope from our history based on the appId. Map previousScopePermissionsObject; - if (previousScopePermissions != null) { - previousScopePermissionsObject = jsonDecode(previousScopePermissions); - } else { - previousScopePermissionsObject = widget.scope!.toJson(); - await savePreviousScopePermissions( - widget.appId!, jsonEncode(previousScopePermissionsObject)); - } - + previousScopePermissionsObject = jsonDecode(previousScopePermissions); + if (!scopeIsEqual(scopeAsMap, previousScopePermissionsObject)) { previousScopePermissionsObject = widget.scope!.toJson(); await savePreviousScopePermissions( diff --git a/app/lib/widgets/wallets/add_wallet.dart b/app/lib/widgets/wallets/add_wallet.dart index 67f90558c..43f0fd802 100644 --- a/app/lib/widgets/wallets/add_wallet.dart +++ b/app/lib/widgets/wallets/add_wallet.dart @@ -139,7 +139,8 @@ class _NewWalletState extends ConsumerState { return false; } - if (walletSecret.startsWith('S') && widget.wallets.any((wallet) => wallet.stellarSecret == walletSecret)){ + if (walletSecret.startsWith('S') && + widget.wallets.any((wallet) => wallet.stellarSecret == walletSecret)) { secretError = 'Secret already exists'; return false; } @@ -152,9 +153,9 @@ class _NewWalletState extends ConsumerState { secretError = 'Invalid seed'; return false; } - if (widget.wallets.any((wallet) => wallet.tfchainSecret == walletSecret)){ + if (widget.wallets.any((wallet) => wallet.tfchainSecret == walletSecret)) { secretError = 'Secret already exists'; - return false; + return false; } if (!walletSecret.startsWith('0x') && walletSecret.length != 64) { secretError = 'Invalid seed length'; diff --git a/app/pubspec.lock b/app/pubspec.lock index c7563e953..7ed7d5884 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -5,10 +5,15 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7" + sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab" url: "https://pub.dev" source: hosted - version: "67.0.0" + version: "76.0.0" + _macros: + dependency: transitive + description: dart + source: sdk + version: "0.3.3" adaptive_number: dependency: transitive description: @@ -21,34 +26,34 @@ packages: dependency: transitive description: name: analyzer - sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d" + sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e" url: "https://pub.dev" source: hosted - version: "6.4.1" + version: "6.11.0" archive: dependency: transitive description: name: archive - sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d + sha256: "6199c74e3db4fbfbd04f66d739e72fe11c8a8957d5f219f1f4482dbde6420b5a" url: "https://pub.dev" source: hosted - version: "3.6.1" + version: "4.0.2" args: dependency: transitive description: name: args - sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a" + sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 url: "https://pub.dev" source: hosted - version: "2.5.0" + version: "2.6.0" asn1lib: dependency: transitive description: name: asn1lib - sha256: "6b151826fcc95ff246cd219a0bf4c753ea14f4081ad71c61939becf3aba27f70" + sha256: "4bae5ae63e6d6dd17c4aac8086f3dec26c0236f6a0f03416c6c19d830c367cf5" url: "https://pub.dev" source: hosted - version: "1.5.5" + version: "1.5.8" async: dependency: transitive description: @@ -61,10 +66,10 @@ packages: dependency: transitive description: name: audio_session - sha256: "343e83bc7809fbda2591a49e525d6b63213ade10c76f15813be9aed6657b3261" + sha256: b2a26ba8b7efa1790d6460e82971fde3e398cfbe2295df9dea22f3499d2c12a7 url: "https://pub.dev" source: hosted - version: "0.1.21" + version: "0.1.23" base_x: dependency: transitive description: @@ -85,10 +90,10 @@ packages: dependency: transitive description: name: bip39_mnemonic - sha256: "24855a62fb9dd930f697063a274e084b0a574e1cc55ec270ca4756f579ab512c" + sha256: "3ae6ed74b97a0b820e71d01b75ac4bc5b036a8bb427d5ee5827427d2872eefb0" url: "https://pub.dev" source: hosted - version: "3.0.6" + version: "3.0.7" boolean_selector: dependency: transitive description: @@ -101,50 +106,50 @@ packages: dependency: transitive description: name: build - sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0" + sha256: cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0 url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.2" build_config: dependency: transitive description: name: build_config - sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1 + sha256: "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" build_daemon: dependency: transitive description: name: build_daemon - sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9" + sha256: "294a2edaf4814a378725bfe6358210196f5ea37af89ecd81bfa32960113d4948" url: "https://pub.dev" source: hosted - version: "4.0.2" + version: "4.0.3" build_resolvers: dependency: transitive description: name: build_resolvers - sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a" + sha256: "99d3980049739a985cf9b21f30881f46db3ebc62c5b8d5e60e27440876b1ba1e" url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.4.3" build_runner: dependency: "direct main" description: name: build_runner - sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7" + sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d" url: "https://pub.dev" source: hosted - version: "2.4.11" + version: "2.4.13" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe + sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0 url: "https://pub.dev" source: hosted - version: "7.3.1" + version: "7.3.2" built_collection: dependency: transitive description: @@ -157,34 +162,34 @@ packages: dependency: transitive description: name: built_value - sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb + sha256: "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2" url: "https://pub.dev" source: hosted - version: "8.9.2" + version: "8.9.3" cached_network_image: dependency: transitive description: name: cached_network_image - sha256: "28ea9690a8207179c319965c13cd8df184d5ee721ae2ce60f398ced1219cea1f" + sha256: "7c1183e361e5c8b0a0f21a28401eecdbde252441106a9816400dd4c2b2424916" url: "https://pub.dev" source: hosted - version: "3.3.1" + version: "3.4.1" cached_network_image_platform_interface: dependency: transitive description: name: cached_network_image_platform_interface - sha256: "9e90e78ae72caa874a323d78fa6301b3fb8fa7ea76a8f96dc5b5bf79f283bf2f" + sha256: "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829" url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.1.1" cached_network_image_web: dependency: transitive description: name: cached_network_image_web - sha256: "205d6a9f1862de34b93184f22b9d2d94586b2f05c581d546695e3d8f6a805cd7" + sha256: "980842f4e8e2535b8dbd3d5ca0b1f0ba66bf61d14cc3a17a9b4788a3685ba062" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.1" characters: dependency: transitive description: @@ -205,18 +210,18 @@ packages: dependency: transitive description: name: chewie - sha256: "8bc4ac4cf3f316e50a25958c0f5eb9bb12cf7e8308bb1d74a43b230da2cfc144" + sha256: "6386fcc7ad7a8f7b25709ce988cd089cdde894bf335c7a0024a1bfcf8788a452" url: "https://pub.dev" source: hosted - version: "1.7.5" + version: "1.9.2" cli_util: dependency: transitive description: name: cli_util - sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19 + sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c url: "https://pub.dev" source: hosted - version: "0.4.1" + version: "0.4.2" clock: dependency: transitive description: @@ -229,50 +234,50 @@ packages: dependency: transitive description: name: code_builder - sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37 + sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e" url: "https://pub.dev" source: hosted - version: "4.10.0" + version: "4.10.1" collection: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.0" convert: dependency: "direct main" description: name: convert - sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" country_picker: dependency: "direct main" description: name: country_picker - sha256: "327f5e15a76352089a6b5057abb761ee5202e7516c9440d8d6a7524139f9b14e" + sha256: "9b14c04f9a35e99f6de6bcbc453a556bb98345aecb481c7a0e843c94c2bee1f8" url: "https://pub.dev" source: hosted - version: "2.0.26" + version: "2.0.27" crisp_chat: dependency: "direct main" description: name: crisp_chat - sha256: "7ef5ee1ab811d7797e1aa723d20f69a976e10114a58bf21c3f80936c5787827e" + sha256: febd2412b87df213718d6d0308d72edc0a8638e07f6b89e3895e83785ffd092b url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "2.2.3" crypto: dependency: "direct main" description: name: crypto - sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27 + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.6" cryptography: dependency: transitive description: @@ -285,10 +290,10 @@ packages: dependency: transitive description: name: csslib - sha256: "831883fb353c8bdc1d71979e5b342c7d88acfbc643113c14ae51e2442ea0f20f" + sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e" url: "https://pub.dev" source: hosted - version: "0.17.3" + version: "1.0.2" cupertino_icons: dependency: "direct main" description: @@ -301,42 +306,42 @@ packages: dependency: transitive description: name: dart_style - sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9" + sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab" url: "https://pub.dev" source: hosted - version: "2.3.6" + version: "2.3.7" dbus: dependency: transitive description: name: dbus - sha256: "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac" + sha256: "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c" url: "https://pub.dev" source: hosted - version: "0.7.10" + version: "0.7.11" decimal: dependency: "direct main" description: name: decimal - sha256: da8f65df568345f2738cc8b0de74971c86d2d93ce5fc8c4ec094f6b7c5d48eb5 + sha256: "28239b8b929c1bd8618702e6dbc96e2618cf99770bbe9cb040d6cf56a11e4ec3" url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.2.1" device_info_plus: dependency: "direct main" description: name: device_info_plus - sha256: "77f757b789ff68e4eaf9c56d1752309bd9f7ad557cb105b938a7f8eb89e59110" + sha256: b37d37c2f912ad4e8ec694187de87d05de2a3cb82b465ff1f65f65a2d05de544 url: "https://pub.dev" source: hosted - version: "9.1.2" + version: "11.2.1" device_info_plus_platform_interface: dependency: transitive description: name: device_info_plus_platform_interface - sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba" + sha256: "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2" url: "https://pub.dev" source: hosted - version: "7.0.1" + version: "7.0.2" dio: dependency: "direct main" description: @@ -349,10 +354,10 @@ packages: dependency: transitive description: name: dio_web_adapter - sha256: "36c5b2d79eb17cdae41e974b7a8284fec631651d2a6f39a8a2ff22327e90aeac" + sha256: "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.0.0" ed25519_edwards: dependency: transitive description: @@ -381,10 +386,10 @@ packages: dependency: transitive description: name: equatable - sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2 + sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7" url: "https://pub.dev" source: hosted - version: "2.0.5" + version: "2.0.7" fake_async: dependency: transitive description: @@ -413,26 +418,18 @@ packages: dependency: transitive description: name: fixnum - sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" flagsmith: dependency: "direct main" description: name: flagsmith - sha256: "70a166ac4bd8d565bd1005400baa238fe8463763366a5605a87df36cf4c03cae" + sha256: "9c0723c002e8cc2782c382df2f93dcb3a19bde8dd318a5bf568013ee368cb7df" url: "https://pub.dev" source: hosted - version: "3.1.0" - flagsmith_flutter_core: - dependency: transitive - description: - name: flagsmith_flutter_core - sha256: c7fe448040165f9c2448c24d1b2c89745983d71183210131f52d831f3aabf3c9 - url: "https://pub.dev" - source: hosted - version: "2.3.1" + version: "6.0.0" flutter: dependency: "direct main" description: flutter @@ -442,10 +439,18 @@ packages: dependency: transitive description: name: flutter_cache_manager - sha256: "8207f27539deb83732fdda03e259349046a39a4c767269285f449ade355d54ba" + sha256: "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386" url: "https://pub.dev" source: hosted - version: "3.3.1" + version: "3.4.1" + flutter_client_sse: + dependency: transitive + description: + name: flutter_client_sse + sha256: "4ce0297206473dfc064b255fe086713240002e149f52519bd48c21423e4aa5d2" + url: "https://pub.dev" + source: hosted + version: "2.0.3" flutter_curve25519: dependency: transitive description: @@ -458,10 +463,66 @@ packages: dependency: "direct main" description: name: flutter_inappwebview - sha256: d198297060d116b94048301ee6749cd2e7d03c1f2689783f52d210a6b7aba350 + sha256: "80092d13d3e29b6227e25b67973c67c7210bd5e35c4b747ca908e31eb71a46d5" + url: "https://pub.dev" + source: hosted + version: "6.1.5" + flutter_inappwebview_android: + dependency: transitive + description: + name: flutter_inappwebview_android + sha256: "62557c15a5c2db5d195cb3892aab74fcaec266d7b86d59a6f0027abd672cddba" + url: "https://pub.dev" + source: hosted + version: "1.1.3" + flutter_inappwebview_internal_annotations: + dependency: transitive + description: + name: flutter_inappwebview_internal_annotations + sha256: "787171d43f8af67864740b6f04166c13190aa74a1468a1f1f1e9ee5b90c359cd" + url: "https://pub.dev" + source: hosted + version: "1.2.0" + flutter_inappwebview_ios: + dependency: transitive + description: + name: flutter_inappwebview_ios + sha256: "5818cf9b26cf0cbb0f62ff50772217d41ea8d3d9cc00279c45f8aabaa1b4025d" url: "https://pub.dev" source: hosted - version: "5.8.0" + version: "1.1.2" + flutter_inappwebview_macos: + dependency: transitive + description: + name: flutter_inappwebview_macos + sha256: c1fbb86af1a3738e3541364d7d1866315ffb0468a1a77e34198c9be571287da1 + url: "https://pub.dev" + source: hosted + version: "1.1.2" + flutter_inappwebview_platform_interface: + dependency: transitive + description: + name: flutter_inappwebview_platform_interface + sha256: cf5323e194096b6ede7a1ca808c3e0a078e4b33cc3f6338977d75b4024ba2500 + url: "https://pub.dev" + source: hosted + version: "1.3.0+1" + flutter_inappwebview_web: + dependency: transitive + description: + name: flutter_inappwebview_web + sha256: "55f89c83b0a0d3b7893306b3bb545ba4770a4df018204917148ebb42dc14a598" + url: "https://pub.dev" + source: hosted + version: "1.1.2" + flutter_inappwebview_windows: + dependency: transitive + description: + name: flutter_inappwebview_windows + sha256: "8b4d3a46078a2cdc636c4a3d10d10f2a16882f6be607962dbfff8874d1642055" + url: "https://pub.dev" + source: hosted + version: "0.6.0" flutter_json_viewer: dependency: "direct main" description: @@ -522,43 +583,41 @@ packages: dependency: "direct main" description: name: flutter_launcher_icons - sha256: "619817c4b65b322b5104b6bb6dfe6cda62d9729bd7ad4303ecc8b4e690a67a77" + sha256: bfa04787c85d80ecb3f8777bde5fc10c3de809240c48fa061a2c2bf15ea5211c url: "https://pub.dev" source: hosted - version: "0.14.1" + version: "0.14.3" flutter_lints: dependency: "direct dev" description: name: flutter_lints - sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 + sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "5.0.0" flutter_pkid: dependency: "direct main" description: - path: "." - ref: master - resolved-ref: "56cc03e8386a9f0530c3489d8bbbeedecb6f47f9" - url: "https://github.com/threefoldtech/threefold_connect_flutter_pkid_client" - source: git + path: "../../threefold_connect_flutter_pkid_client" + relative: true + source: path version: "0.0.1" flutter_plugin_android_lifecycle: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda" + sha256: "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e" url: "https://pub.dev" source: hosted - version: "2.0.22" + version: "2.0.24" flutter_riverpod: dependency: "direct main" description: name: flutter_riverpod - sha256: "0f1974eff5bbe774bf1d870e406fc6f29e3d6f1c46bd9c58e7172ff68a785d7d" + sha256: "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1" url: "https://pub.dev" source: hosted - version: "2.5.1" + version: "2.6.1" flutter_staggered_grid_view: dependency: transitive description: @@ -571,10 +630,10 @@ packages: dependency: "direct main" description: name: flutter_svg - sha256: "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2" + sha256: c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b url: "https://pub.dev" source: hosted - version: "2.0.10+1" + version: "2.0.17" flutter_test: dependency: "direct dev" description: flutter @@ -589,10 +648,10 @@ packages: dependency: "direct main" description: name: flutter_widget_from_html - sha256: "9e2a6201c4d2eb910b6b3ebb2a9f5c490fc61c9a1aa35eafdde38f0fc659cf4c" + sha256: f3967a5b42896662efdd420b5adaf8a7d3692b0f44462a07c80e3b4c173b1a02 url: "https://pub.dev" source: hosted - version: "0.15.2" + version: "0.15.3" flutter_widget_from_html_core: dependency: transitive description: @@ -661,10 +720,10 @@ packages: dependency: transitive description: name: fwfh_webview - sha256: f67890bc0d6278da98bd197469ae9511c859f7db327e92299fe0ea0cf46c4057 + sha256: c0a8b664b642f40f4c252a0ab4e72c22dcd97c7fb3a7e50a6b4bdb6f63afca19 url: "https://pub.dev" source: hosted - version: "0.15.2" + version: "0.15.3" glob: dependency: transitive description: @@ -677,10 +736,10 @@ packages: dependency: "direct main" description: name: google_fonts - sha256: e20ff62b158b96f392bfc8afe29dee1503c94fbea2cbe8186fd59b756b8ae982 + sha256: b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82 url: "https://pub.dev" source: hosted - version: "5.1.0" + version: "6.2.1" graphs: dependency: transitive description: @@ -692,20 +751,18 @@ packages: gridproxy_client: dependency: "direct main" description: - path: "packages/gridproxy_client" - ref: main - resolved-ref: "68d4fda0ded7fbc3d6e9a594ebbf0ea7ff3b48b6" - url: "https://github.com/threefoldtech/tfgrid-sdk-dart" - source: git + path: "../../../codescalers/tfgrid-sdk-dart/packages/gridproxy_client" + relative: true + source: path version: "1.0.0" hashlib: dependency: "direct main" description: name: hashlib - sha256: f572f2abce09fc7aee53f15927052b9732ea1053e540af8cae211111ee0b99b1 + sha256: e13e8237d93fb275cd1c55fc339bb90638994d1a4f140c7ee270173b51f3d169 url: "https://pub.dev" source: hosted - version: "1.21.0" + version: "1.21.1" hashlib_codecs: dependency: transitive description: @@ -726,50 +783,50 @@ packages: dependency: transitive description: name: html - sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a" + sha256: "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec" url: "https://pub.dev" source: hosted - version: "0.15.4" + version: "0.15.5" http: dependency: "direct main" description: name: http - sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938" + sha256: fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" http_multi_server: dependency: transitive description: name: http_multi_server - sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" + sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8 url: "https://pub.dev" source: hosted - version: "3.2.1" + version: "3.2.2" http_parser: dependency: transitive description: name: http_parser - sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571" url: "https://pub.dev" source: hosted - version: "4.0.2" + version: "4.1.2" idenfy_sdk_flutter: dependency: "direct main" description: name: idenfy_sdk_flutter - sha256: "26d72aa9a0d5dc3c315a9e77abc7c8bea6f2ca53d72bcb2a34303cf169ca2187" + sha256: de34db373c3fdd5e93b5dc1f0cd70740a7a80bfbd2a390dedf7f0afe5738593e url: "https://pub.dev" source: hosted - version: "2.5.3" + version: "2.6.0" image: dependency: transitive description: name: image - sha256: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d + sha256: "8346ad4b5173924b5ddddab782fc7d8a6300178c8b1dc427775405a01701c4a6" url: "https://pub.dev" source: hosted - version: "4.3.0" + version: "4.5.2" infinite_scroll_pagination: dependency: "direct main" description: @@ -798,10 +855,10 @@ packages: dependency: transitive description: name: io - sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" + sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "1.0.5" js: dependency: transitive description: @@ -818,22 +875,22 @@ packages: url: "https://pub.dev" source: hosted version: "4.9.0" - json_schema2: + json_schema: dependency: transitive description: - name: json_schema2 - sha256: "094e60d3605333c0816eeb2e5310b4f71ffaea2c0abc026b27418c1ac41a5db3" + name: json_schema + sha256: b183ba828374365a89b81246c06a9a636935897d509cd846998bbc0d9bd0a2cf url: "https://pub.dev" source: hosted - version: "2.0.4+9" + version: "5.2.0" just_audio: dependency: transitive description: name: just_audio - sha256: b41646a8241688f1d99c2e69c4da2bb26aa4b3a99795f6ff205c2a165e033fda + sha256: "1a1eb86e7d81e69a1d36943f2b3efd62dece3dad2cafd9ec2e62e6db7c04d9b7" url: "https://pub.dev" source: hosted - version: "0.9.41" + version: "0.9.43" just_audio_platform_interface: dependency: transitive description: @@ -846,26 +903,26 @@ packages: dependency: transitive description: name: just_audio_web - sha256: "0edb481ad4aa1ff38f8c40f1a3576013c3420bf6669b686fe661627d49bc606c" + sha256: "9a98035b8b24b40749507687520ec5ab404e291d2b0937823ff45d92cb18d448" url: "https://pub.dev" source: hosted - version: "0.4.11" + version: "0.4.13" leak_tracker: dependency: transitive description: name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" url: "https://pub.dev" source: hosted - version: "10.0.4" + version: "10.0.7" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.8" leak_tracker_testing: dependency: transitive description: @@ -878,10 +935,10 @@ packages: dependency: transitive description: name: lints - sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "5.1.1" local_auth: dependency: "direct main" description: @@ -894,26 +951,34 @@ packages: dependency: "direct main" description: name: logger - sha256: "697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32" + sha256: be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1 url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.5.0" logging: dependency: transitive description: name: logging - sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" lottie: dependency: "direct main" description: name: lottie - sha256: "6a24ade5d3d918c306bb1c21a6b9a04aab0489d51a2582522eea820b4093b62b" + sha256: c5fa04a80a620066c15cf19cc44773e19e9b38e989ff23ea32e5903ef1015950 url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "3.3.1" + macros: + dependency: transitive + description: + name: macros + sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656" + url: "https://pub.dev" + source: hosted + version: "0.1.3-main.0" matcher: dependency: transitive description: @@ -926,10 +991,10 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" merlin: dependency: transitive description: @@ -942,26 +1007,26 @@ packages: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.15.0" mime: dependency: transitive description: name: mime - sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a" + sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" url: "https://pub.dev" source: hosted - version: "1.0.6" + version: "2.0.0" moment_dart: dependency: transitive description: name: moment_dart - sha256: "721f008251341578a818140afe402be827bc29951846575598426f4039a0799b" + sha256: "35b99c62689613e84880dac9d0e81d1a624e4edbdf79897cdb3d444e964bf25b" url: "https://pub.dev" source: hosted - version: "2.2.1+beta.0" + version: "3.2.1" mutex: dependency: "direct main" description: @@ -990,34 +1055,34 @@ packages: dependency: "direct main" description: name: open_filex - sha256: ba425ea49affd0a98a234aa9344b9ea5d4c4f7625a1377961eae9fe194c3d523 + sha256: dcb7bd3d32db8db5260253a62f1564c02c2c8df64bc0187cd213f65f827519bd url: "https://pub.dev" source: hosted - version: "4.5.0" + version: "4.6.0" package_config: dependency: transitive description: name: package_config - sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" package_info_plus: dependency: "direct main" description: name: package_info_plus - sha256: "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017" + sha256: "739e0a5c3c4055152520fa321d0645ee98e932718b4c8efeeb51451968fe0790" url: "https://pub.dev" source: hosted - version: "4.2.0" + version: "8.1.3" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6" + sha256: a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.2" path: dependency: transitive description: @@ -1030,34 +1095,34 @@ packages: dependency: transitive description: name: path_parsing - sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf + sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.1.0" path_provider: dependency: "direct main" description: name: path_provider - sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378 + sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.5" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7" + sha256: "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2" url: "https://pub.dev" source: hosted - version: "2.2.10" + version: "2.2.15" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16 + sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.4.1" path_provider_linux: dependency: transitive description: @@ -1094,42 +1159,50 @@ packages: dependency: "direct main" description: name: permission_handler - sha256: bc56bfe9d3f44c3c612d8d393bd9b174eb796d706759f9b495ac254e4294baa5 + sha256: "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb" url: "https://pub.dev" source: hosted - version: "10.4.5" + version: "11.3.1" permission_handler_android: dependency: transitive description: name: permission_handler_android - sha256: "59c6322171c29df93a22d150ad95f3aa19ed86542eaec409ab2691b8f35f9a47" + sha256: "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1" url: "https://pub.dev" source: hosted - version: "10.3.6" + version: "12.0.13" permission_handler_apple: dependency: transitive description: name: permission_handler_apple - sha256: "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5" + sha256: e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0 + url: "https://pub.dev" + source: hosted + version: "9.4.5" + permission_handler_html: + dependency: transitive + description: + name: permission_handler_html + sha256: "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24" url: "https://pub.dev" source: hosted - version: "9.1.4" + version: "0.1.3+5" permission_handler_platform_interface: dependency: transitive description: name: permission_handler_platform_interface - sha256: "6760eb5ef34589224771010805bea6054ad28453906936f843a8cc4d3a55c4a4" + sha256: e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9 url: "https://pub.dev" source: hosted - version: "3.12.0" + version: "4.2.3" permission_handler_windows: dependency: transitive description: name: permission_handler_windows - sha256: cc074aace208760f1eee6aa4fae766b45d947df85bc831cde77009cdb4720098 + sha256: "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e" url: "https://pub.dev" source: hosted - version: "0.1.3" + version: "0.2.1" petitparser: dependency: transitive description: @@ -1150,18 +1223,18 @@ packages: dependency: "direct main" description: name: pinput - sha256: a92b55ecf9c25d1b9e100af45905385d5bc34fc9b6b04177a9e82cb88fe4d805 + sha256: "8a73be426a91fefec90a7f130763ca39772d547e92f19a827cf4aa02e323d35a" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "5.0.1" platform: dependency: transitive description: name: platform - sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65" + sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" url: "https://pub.dev" source: hosted - version: "3.1.5" + version: "3.1.6" plugin_platform_interface: dependency: transitive description: @@ -1182,34 +1255,34 @@ packages: dependency: transitive description: name: polkadart - sha256: "55b40e205ea4227c97fdfc8dce1783d862ddcce0b097bae6327e3835017ce9bd" + sha256: "46604b1c6fb4f35b564194e51c53a9a77a15291671db6cfbed9fb188831b8560" url: "https://pub.dev" source: hosted - version: "0.4.7" + version: "0.5.0" polkadart_cli: dependency: transitive description: name: polkadart_cli - sha256: a332ccdda670e634e266d4e38b4aba7c52cbc37a32ed037af40b37b3e6dd3c8d + sha256: ea16dc9eef662fed6c330f357b38402bc1fd2b862b4e47bf1f9d84c48fa3135b url: "https://pub.dev" source: hosted - version: "0.4.3" + version: "0.5.0" polkadart_keyring: dependency: transitive description: name: polkadart_keyring - sha256: "482260a119110ef21f8d66e69ae8c2716afab974247391535d1b02dee613f9e9" + sha256: bed5af744e801e88bf7d067ea477fc7eb0a5955801491a8b3e57b578d9de8bea url: "https://pub.dev" source: hosted - version: "0.4.4" + version: "0.5.0" polkadart_scale_codec: dependency: transitive description: name: polkadart_scale_codec - sha256: "0bc6700e93af2dd054db413837433b8383aae095348282d7837583da3e621978" + sha256: a9b295ddbd8ace501066800ab521575095464f324cb4185be386bd78ee9316d0 url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" pool: dependency: transitive description: @@ -1218,6 +1291,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.5.1" + posix: + dependency: transitive + description: + name: posix + sha256: a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a + url: "https://pub.dev" + source: hosted + version: "6.0.1" provider: dependency: transitive description: @@ -1230,18 +1311,18 @@ packages: dependency: transitive description: name: pub_semver - sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" + sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.5" pubspec_parse: dependency: transitive description: name: pubspec_parse - sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8 + sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.5.0" qr: dependency: transitive description: @@ -1250,14 +1331,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.2" - qr_code_scanner: - dependency: "direct main" - description: - name: qr_code_scanner - sha256: f23b68d893505a424f0bd2e324ebea71ed88465d572d26bb8d2e78a4749591fd - url: "https://pub.dev" - source: hosted - version: "1.0.1" qr_flutter: dependency: "direct main" description: @@ -1294,18 +1367,18 @@ packages: dependency: transitive description: name: reflectable - sha256: cdc1a278a2e9769abafaf9ba54ce1fd3432b2a38360e14b87ea6344f715340de + sha256: "35ee17c3b759fa935cc7e9247445903384520fd174e0d6c142d8288e5439fd5b" url: "https://pub.dev" source: hosted - version: "4.0.6" - rest_client: + version: "4.0.12" + rfc_6901: dependency: transitive description: - name: rest_client - sha256: "90473416250779b85f8d620e9dc277f38ea67acf84d3c6299e005ce08caedd69" + name: rfc_6901 + sha256: df1bbfa3d023009598f19636d6114c6ac1e0b7bb7bf6a260f0e6e6ce91416820 url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "0.2.0" ristretto255: dependency: transitive description: @@ -1318,98 +1391,98 @@ packages: dependency: transitive description: name: riverpod - sha256: f21b32ffd26a36555e501b04f4a5dca43ed59e16343f1a30c13632b2351dfa4d + sha256: "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959" url: "https://pub.dev" source: hosted - version: "2.5.1" + version: "2.6.1" rxdart: dependency: transitive description: name: rxdart - sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb" + sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962" url: "https://pub.dev" source: hosted - version: "0.27.7" + version: "0.28.0" screen_brightness: dependency: "direct main" description: name: screen_brightness - sha256: "7d4ac84ae26b37c01d6f5db7123a72db7933e1f2a2a8c369a51e08f81b3178d8" + sha256: "99b898dae860ebe55fc872d8e300c6eafff3ee4ccb09301b90adb3f241f29874" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.1.1" screen_brightness_android: dependency: transitive description: name: screen_brightness_android - sha256: "8c69d3ac475e4d625e7fa682a3a51a69ff59abe5b4a9e57f6ec7d830a6c69bd6" + sha256: ff9141bed547db02233e7dd88f990ab01973a0c8a8c04ddb855c7b072f33409a url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.1.0" screen_brightness_ios: dependency: transitive description: name: screen_brightness_ios - sha256: f08f70ca1ac3e30719764b5cfb8b3fe1e28163065018a41b3e6f243ab146c2f1 + sha256: bfd9bfd0ac852e7aa170e7e356cc27195b2a75037b72c8c6336cf6fb2115cffb url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.1.1" screen_brightness_macos: dependency: transitive description: name: screen_brightness_macos - sha256: "70c2efa4534e22b927e82693488f127dd4a0f008469fccf4f0eefe9061bbdd6a" + sha256: "4edf330ad21078686d8bfaf89413325fbaf571dcebe1e89254d675a3f288b5b9" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.1.1" screen_brightness_platform_interface: dependency: transitive description: name: screen_brightness_platform_interface - sha256: "9f3ebf7f22d5487e7676fe9ddaf3fc55b6ff8057707cf6dc0121c7dfda346a16" + sha256: "737bd47b57746bc4291cab1b8a5843ee881af499514881b0247ec77447ee769c" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.1.0" screen_brightness_windows: dependency: transitive description: name: screen_brightness_windows - sha256: c8e12a91cf6dd912a48bd41fcf749282a51afa17f536c3460d8d05702fb89ffa + sha256: d3518bf0f5d7a884cee2c14449ae0b36803802866de09f7ef74077874b6b2448 url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.1.0" secp256k1_ecdsa: dependency: transitive description: name: secp256k1_ecdsa - sha256: "7e731f4039f44d8e416a193db449f80c67a69ab6933a4970eb6ac7a91e1ca7b2" + sha256: "8d516e3f9ad716e721a4e961b890bb03bf3c68ba51bca256a617a055e3c7ef89" url: "https://pub.dev" source: hosted - version: "0.4.1" + version: "0.5.0" shared_preferences: dependency: "direct main" description: name: shared_preferences - sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180 + sha256: a752ce92ea7540fc35a0d19722816e04d0e72828a4200e83a98cf1a1eb524c9a url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.3.5" shared_preferences_android: - dependency: "direct overridden" + dependency: transitive description: name: shared_preferences_android - sha256: "853801ce6ba7429ec4e923e37317f32a57c903de50b8c33ffcfbdb7e6f0dd39c" + sha256: "138b7bbbc7f59c56236e426c37afb8f78cbc57b094ac64c440e0bb90e380a4f5" url: "https://pub.dev" source: hosted - version: "2.0.12" + version: "2.4.2" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - sha256: "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d" + sha256: "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03" url: "https://pub.dev" source: hosted - version: "2.5.3" + version: "2.5.4" shared_preferences_linux: dependency: transitive description: @@ -1446,24 +1519,24 @@ packages: dependency: transitive description: name: shelf - sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4 + sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12 url: "https://pub.dev" source: hosted - version: "1.4.1" + version: "1.4.2" shelf_web_socket: dependency: transitive description: name: shelf_web_socket - sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611" + sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67 url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.0.1" signer: dependency: transitive description: path: "packages/signer" - ref: main - resolved-ref: "68d4fda0ded7fbc3d6e9a594ebbf0ea7ff3b48b6" + ref: development_upgrade + resolved-ref: f0e49c35e14ef6644fb3fc39e2737264c99d8101 url: "https://github.com/threefoldtech/tfgrid-sdk-dart.git" source: git version: "0.1.0" @@ -1471,7 +1544,7 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" sliver_tools: dependency: transitive description: @@ -1480,14 +1553,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.2.12" - smart_auth: - dependency: transitive - description: - name: smart_auth - sha256: a25229b38c02f733d0a4e98d941b42bed91a976cb589e934895e60ccfa674cf6 - url: "https://pub.dev" - source: hosted - version: "1.1.1" smooth_page_indicator: dependency: "direct main" description: @@ -1500,34 +1565,34 @@ packages: dependency: "direct main" description: name: socket_io_client - sha256: "64bd271703db3682d4195dd813c555413d21a49bbaef7c3ed38932fd2a209a10" + sha256: "180fdbc7685e32a849511bbf8b1c7bcc46ab0ff116f7024aa204b425bb3a1ffe" url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "3.0.2" socket_io_common: dependency: transitive description: name: socket_io_common - sha256: "469c7e6bb0c8d571a5158c1352112654f03aedc2f0a246533e1cbdb41efa4937" + sha256: a914df90f25003fea62dbd0b186d98b745b1b72c16be87418e15a2511d25dadb url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "3.0.2" sodium: dependency: transitive description: name: sodium - sha256: d9830a388e37c82891888e64cfd4c6764fa3ac716bed80ac6eab89ee42c3cd76 + sha256: "93d7c8d9af1f57cbd1ddeeb815902d3e0c1e1c8579a78cf229bcd97e1714f061" url: "https://pub.dev" source: hosted - version: "2.3.1+1" + version: "3.4.4" sodium_libs: dependency: "direct main" description: name: sodium_libs - sha256: aa764acd6ccc6113e119c2d99471aeeb4637a9a501639549b297d3a143ff49b3 + sha256: "4e5d96a7805369dd51b24975a9072c51433466ae5716a33cff70316a14d97af9" url: "https://pub.dev" source: hosted - version: "2.2.1+6" + version: "3.4.3+1" source_span: dependency: transitive description: @@ -1548,42 +1613,66 @@ packages: dependency: transitive description: name: sqflite - sha256: a9016f495c927cb90557c909ff26a6d92d9bd54fc42ba92e19d4e79d61e798c6 + sha256: "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.1" + sqflite_android: + dependency: transitive + description: + name: sqflite_android + sha256: "78f489aab276260cdd26676d2169446c7ecd3484bbd5fead4ca14f3ed4dd9ee3" + url: "https://pub.dev" + source: hosted + version: "2.4.0" sqflite_common: dependency: transitive description: name: sqflite_common - sha256: "28d8c66baee4968519fb8bd6cdbedad982d6e53359091f0b74544a9f32ec72d5" + sha256: "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709" + url: "https://pub.dev" + source: hosted + version: "2.5.4+6" + sqflite_darwin: + dependency: transitive + description: + name: sqflite_darwin + sha256: "22adfd9a2c7d634041e96d6241e6e1c8138ca6817018afc5d443fef91dcefa9c" url: "https://pub.dev" source: hosted - version: "2.5.3" + version: "2.4.1+1" + sqflite_platform_interface: + dependency: transitive + description: + name: sqflite_platform_interface + sha256: "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920" + url: "https://pub.dev" + source: hosted + version: "2.4.0" sr25519: dependency: transitive description: name: sr25519 - sha256: "351a42deaf7656690fb3e09568701a13c1813229cee15a21a5ca1b322246c24d" + sha256: d10247ff98330efb658042357c8c7fc46074c3c160ea16d3dcdfedf8a9a87b60 url: "https://pub.dev" source: hosted - version: "0.4.1" + version: "0.5.0" ss58: dependency: transitive description: name: ss58 - sha256: "5c2f4be38fb657a4e1aa03a712871c3a8aeea734ebdd77f6a67e4a39cf36647a" + sha256: "74dce6fbfbac9dba5f87b8f104ed2b7253c6aeac39d508f088044cf4827d9cd7" url: "https://pub.dev" source: hosted - version: "1.1.3" + version: "1.2.0" stack_trace: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.0" state_notifier: dependency: transitive description: @@ -1595,20 +1684,18 @@ packages: stellar_client: dependency: "direct main" description: - path: "packages/stellar_client" - ref: development - resolved-ref: "2f7f0a8e729c87dc0ab9a973e1eac42b7686bc1c" - url: "https://github.com/threefoldtech/tfgrid-sdk-dart" - source: git + path: "../../../codescalers/tfgrid-sdk-dart/packages/stellar_client" + relative: true + source: path version: "0.1.0" stellar_flutter_sdk: dependency: "direct main" description: name: stellar_flutter_sdk - sha256: a25506529d40a040227cd565de6e1b4cc0a9ffc756472cf3c43420512e8a269b + sha256: dac5c9d4874ec8bb93541328718870a683dfb74d5f31c411f39b85e14cd70e79 url: "https://pub.dev" source: hosted - version: "1.8.9" + version: "1.9.2" stream_channel: dependency: transitive description: @@ -1621,18 +1708,18 @@ packages: dependency: transitive description: name: stream_transform - sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f" + sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871 url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" string_scanner: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" strobe: dependency: transitive description: @@ -1645,26 +1732,26 @@ packages: dependency: transitive description: name: substrate_bip39 - sha256: fa950b80b92b7fc96f13683033fe974cdfd3ee0d30d989f6b8f3fcbfe6021ac2 + sha256: "6680dc10eb4f165659374eec5c5aa75920e720b3c00b65490e1dfe3d5ea5a52d" url: "https://pub.dev" source: hosted - version: "0.4.1" + version: "0.5.0" substrate_metadata: dependency: transitive description: name: substrate_metadata - sha256: ed6511dcca9dae3b10d525a6b8c1688e4eda0ab27bed0bbdfc31bc31bf34b441 + sha256: "878bf0e818eed4543f0c9af303b8ffe201cb69bf56c32d717f1bdef88e691836" url: "https://pub.dev" source: hosted - version: "1.2.2" + version: "1.3.0" synchronized: dependency: transitive description: name: synchronized - sha256: "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558" + sha256: "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225" url: "https://pub.dev" source: hosted - version: "3.1.0+1" + version: "3.3.0+3" term_glyph: dependency: transitive description: @@ -1677,18 +1764,16 @@ packages: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.3" tfchain_client: dependency: "direct main" description: - path: "packages/tfchain_client" - ref: development - resolved-ref: a66b92b9947cbc6ce7adf289f4321153ac42b936 - url: "https://github.com/threefoldtech/tfgrid-sdk-dart" - source: git + path: "../../../codescalers/tfgrid-sdk-dart/packages/tfchain_client" + relative: true + source: path version: "0.1.0" timeago: dependency: "direct main" @@ -1702,10 +1787,10 @@ packages: dependency: transitive description: name: timing - sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32" + sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.2" toml: dependency: transitive description: @@ -1718,10 +1803,10 @@ packages: dependency: transitive description: name: typed_data - sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.4.0" uni_links: dependency: "direct main" description: @@ -1763,7 +1848,7 @@ packages: source: hosted version: "1.1.0" unorm_dart: - dependency: "direct overridden" + dependency: transitive description: name: unorm_dart sha256: "23d8bf65605401a6a32cff99435fed66ef3dab3ddcad3454059165df46496a3b" @@ -1790,34 +1875,34 @@ packages: dependency: transitive description: name: url_launcher_android - sha256: f0c73347dfcfa5b3db8bc06e1502668265d39c08f310c29bff4e28eea9699f79 + sha256: "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193" url: "https://pub.dev" source: hosted - version: "6.3.9" + version: "6.3.14" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e + sha256: "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626" url: "https://pub.dev" source: hosted - version: "6.3.1" + version: "6.3.2" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - sha256: e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af + sha256: "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935" url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "3.2.1" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - sha256: "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672" + sha256: "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2" url: "https://pub.dev" source: hosted - version: "3.2.1" + version: "3.2.2" url_launcher_platform_interface: dependency: transitive description: @@ -1830,18 +1915,18 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e" + sha256: "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9" url: "https://pub.dev" source: hosted - version: "2.3.3" + version: "2.4.0" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - sha256: "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185" + sha256: "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77" url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "3.1.4" utility: dependency: transitive description: @@ -1870,26 +1955,26 @@ packages: dependency: transitive description: name: vector_graphics - sha256: "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3" + sha256: "27d5fefe86fb9aace4a9f8375b56b3c292b64d8c04510df230f849850d912cb7" url: "https://pub.dev" source: hosted - version: "1.1.11+1" + version: "1.1.15" vector_graphics_codec: dependency: transitive description: name: vector_graphics_codec - sha256: c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da + sha256: "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146" url: "https://pub.dev" source: hosted - version: "1.1.11+1" + version: "1.1.13" vector_graphics_compiler: dependency: transitive description: name: vector_graphics_compiler - sha256: "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81" + sha256: "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad" url: "https://pub.dev" source: hosted - version: "1.1.11+1" + version: "1.1.16" vector_math: dependency: transitive description: @@ -1910,18 +1995,18 @@ packages: dependency: transitive description: name: video_player_android - sha256: e343701aa890b74a863fa460f5c0e628127ed06a975d7d9af6b697133fb25bdf + sha256: "7018dbcb395e2bca0b9a898e73989e67c0c4a5db269528e1b036ca38bcca0d0b" url: "https://pub.dev" source: hosted - version: "2.7.1" + version: "2.7.17" video_player_avfoundation: dependency: transitive description: name: video_player_avfoundation - sha256: cd5ab8a8bc0eab65ab0cea40304097edc46da574c8c1ecdee96f28cd8ef3792f + sha256: "8a4e73a3faf2b13512978a43cf1cdda66feeeb900a0527f1fbfd7b19cf3458d3" url: "https://pub.dev" source: hosted - version: "2.6.2" + version: "2.6.7" video_player_platform_interface: dependency: transitive description: @@ -1934,74 +2019,74 @@ packages: dependency: transitive description: name: video_player_web - sha256: "8e9cb7fe94e49490e67bbc15149691792b58a0ade31b32e3f3688d104a0e057b" + sha256: "881b375a934d8ebf868c7fb1423b2bfaa393a0a265fa3f733079a86536064a10" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.3.3" vm_service: dependency: transitive description: name: vm_service - sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b url: "https://pub.dev" source: hosted - version: "14.2.1" + version: "14.3.0" wakelock_plus: dependency: transitive description: name: wakelock_plus - sha256: f268ca2116db22e57577fb99d52515a24bdc1d570f12ac18bb762361d43b043d + sha256: "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e" url: "https://pub.dev" source: hosted - version: "1.1.4" + version: "1.2.10" wakelock_plus_platform_interface: dependency: transitive description: name: wakelock_plus_platform_interface - sha256: "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16" + sha256: "70e780bc99796e1db82fe764b1e7dcb89a86f1e5b3afb1db354de50f2e41eb7a" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" watcher: dependency: transitive description: name: watcher - sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" + sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104" url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" web: dependency: transitive description: name: web - sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" + sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "1.1.0" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42" + sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b url: "https://pub.dev" source: hosted - version: "2.4.5" + version: "2.4.0" webview_flutter: dependency: "direct main" description: name: webview_flutter - sha256: "6869c8786d179f929144b4a1f86e09ac0eddfe475984951ea6c634774c16b522" + sha256: "889a0a678e7c793c308c68739996227c9661590605e70b1f6cf6b9a6634f7aec" url: "https://pub.dev" source: hosted - version: "4.8.0" + version: "4.10.0" webview_flutter_android: dependency: transitive description: name: webview_flutter_android - sha256: ed021f27ae621bc97a6019fb601ab16331a3db4bf8afa305e9f6689bdb3edced + sha256: "5568f17a9c25c0fdd0737900fa1c2d1fee2d780bc212d9aec10c2d1f48ef0f59" url: "https://pub.dev" source: hosted - version: "3.16.8" + version: "4.3.1" webview_flutter_platform_interface: dependency: transitive description: @@ -2014,18 +2099,18 @@ packages: dependency: transitive description: name: webview_flutter_wkwebview - sha256: "9c62cc46fa4f2d41e10ab81014c1de470a6c6f26051a2de32111b2ee55287feb" + sha256: "4adc14ea9a770cc9e2c8f1ac734536bd40e82615bd0fa6b94be10982de656cc7" url: "https://pub.dev" source: hosted - version: "3.14.0" + version: "3.17.0" win32: dependency: transitive description: name: win32 - sha256: "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a" + sha256: "154360849a56b7b67331c21f09a386562d88903f90a1099c5987afc1912e1f29" url: "https://pub.dev" source: hosted - version: "5.5.4" + version: "5.10.0" win32_registry: dependency: transitive description: @@ -2054,26 +2139,18 @@ packages: dependency: "direct main" description: name: xml2json - sha256: "52b7c8d350fdce09545b058982c26689ee89f1eb188cc9910d585665bfe27bc0" + sha256: "9ff65c144a48f7f73d2bd6d919700c7697beced3b51216b982f78c68bc0da142" url: "https://pub.dev" source: hosted - version: "6.2.3" + version: "6.2.6" yaml: dependency: transitive description: name: yaml - sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" - url: "https://pub.dev" - source: hosted - version: "3.1.2" - yaon: - dependency: transitive - description: - name: yaon - sha256: "7ffb8284eb13e448fdabf340209c306336cfeabdca97294c27b5a11237eaa3c4" + sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce url: "https://pub.dev" source: hosted - version: "1.1.4+10" + version: "3.1.3" sdks: - dart: ">=3.4.0 <4.0.0" - flutter: ">=3.22.0" + dart: ">=3.6.0 <4.0.0" + flutter: ">=3.27.0" diff --git a/app/pubspec.yaml b/app/pubspec.yaml index 40142eaea..0108ac0a8 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -31,60 +31,60 @@ dependencies: url: https://github.com/threefoldtech/tfgrid-sdk-dart ref: main path: packages/gridproxy_client - flutter_svg: ^2.0.6 + flutter_svg: ^2.0.17 bip39: ^1.0.6 - socket_io_client: ^1.0.2 + socket_io_client: ^3.0.2 local_auth: 1.1.7 - url_launcher: ^6.0.10 - shared_preferences: ^2.0.7 - http: ^1.0.0 - package_info_plus: ^4.0.2 - cupertino_icons: ^1.0.4 - google_fonts: ^5.0.0 - intl_phone_field: ^3.1.0 - flagsmith: ^3.1.0 - flutter_inappwebview: ^5.3.2 - sodium_libs: ^2.1.0+1 + url_launcher: ^6.3.1 + shared_preferences: ^2.3.5 + http: ^1.3.0 + package_info_plus: ^8.1.3 + cupertino_icons: ^1.0.8 + google_fonts: ^6.2.1 + intl_phone_field: ^3.2.0 + flagsmith: ^6.0.0 + flutter_inappwebview: ^6.1.5 + sodium_libs: ^3.4.3+1 uni_links: ^0.5.1 pbkdf2ns: ^0.0.2 - qr_code_scanner: ^1.0.1 + # qr_code_scanner: ^1.0.1 flutter_json_viewer: ^1.0.1 - device_info_plus: ^9.0.2 - permission_handler: ^10.2.0 - path_provider: ^2.0.2 - dio: ^5.0.0 - open_filex: ^4.3.2 - country_picker: ^2.0.20 + device_info_plus: ^11.2.1 + permission_handler: ^11.3.1 + path_provider: ^2.1.5 + dio: ^5.7.0 + open_filex: ^4.6.0 + country_picker: ^2.0.27 pinenacl: ^0.6.0 - pinput: 3.0.1 - build_runner: ^2.4.9 + pinput: ^5.0.1 + build_runner: ^2.4.13 smooth_page_indicator: ^1.2.0+3 - webview_flutter: ^4.8.0 + webview_flutter: ^4.10.0 qr_flutter: ^4.1.0 - screen_brightness: ^1.0.1 + screen_brightness: ^2.1.1 validators: ^3.0.0 - lottie: ^3.1.2 - crisp_chat: 2.0.3 - xml2json: ^6.2.3 + lottie: ^3.3.1 + crisp_chat: ^2.2.3 + xml2json: ^6.2.6 timeago: ^3.7.0 - flutter_widget_from_html: ^0.15.2 - idenfy_sdk_flutter: 2.5.3 - flutter_riverpod: 2.5.1 + flutter_widget_from_html: ^0.15.3 + idenfy_sdk_flutter: ^2.6.0 + flutter_riverpod: ^2.6.1 - convert: any - crypto: any - hashlib: any - stellar_flutter_sdk: ^1.8.9 - flutter_launcher_icons: ^0.14.1 - logger: ^2.4.0 + convert: ^3.1.2 + crypto: ^3.0.6 + hashlib: ^1.21.1 + stellar_flutter_sdk: ^1.9.2 + flutter_launcher_icons: ^0.14.3 + logger: ^2.5.0 flutter_keyboard_visibility: ^6.0.0 mutex: ^3.1.0 - decimal: ^3.1.0 + decimal: ^3.2.1 infinite_scroll_pagination: ^4.1.0 dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.0 + flutter_lints: ^5.0.0 dependency_overrides: intl: ^0.19.0 From 43af34912205700289e9ddb3ffda4cdca1251e7a Mon Sep 17 00:00:00 2001 From: ahmedhanafy725 Date: Wed, 22 Jan 2025 11:25:02 +0200 Subject: [PATCH 02/17] Update app build.gradle files --- app/android/app/build_local | 5 ++-- app/android/app/build_production | 5 ++-- app/android/app/build_staging | 5 ++-- app/android/app/build_testing | 5 ++-- app/android/build.gradle | 29 +++++++++++++++++-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- app/lib/helpers/flags.dart | 4 +-- app/lib/providers/theme_provider.dart | 2 +- app/lib/screens/main_screen.dart | 4 +-- app/lib/services/socket_service.dart | 3 +- app/lib/widgets/preference_dialog.dart | 2 +- 11 files changed, 47 insertions(+), 19 deletions(-) diff --git a/app/android/app/build_local b/app/android/app/build_local index f06e5ef72..5df85dc23 100644 --- a/app/android/app/build_local +++ b/app/android/app/build_local @@ -8,7 +8,7 @@ if (localPropertiesFile.exists()) { def flutterRoot = localProperties.getProperty('flutter.sdk') if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") + throw GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") } def flutterVersionCode = localProperties.getProperty('flutter.versionCode') @@ -28,6 +28,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { compileSdkVersion flutter.compileSdkVersion ndkVersion flutter.ndkVersion + namespace "org.jimber.threebotlogin" sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -97,7 +98,7 @@ def lifecycle_version = "2.5.1" dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'androidx.multidex:multidex:2.0.1' - implementation 'com.hbb20:ccp:2.4.0' + // implementation 'com.hbb20:ccp:2.4.0' implementation 'com.google.code.gson:gson:2.8.6' implementation "androidx.preference:preference-ktx:1.1.1" implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" diff --git a/app/android/app/build_production b/app/android/app/build_production index 61d842a26..5a6b64bf1 100644 --- a/app/android/app/build_production +++ b/app/android/app/build_production @@ -8,7 +8,7 @@ if (localPropertiesFile.exists()) { def flutterRoot = localProperties.getProperty('flutter.sdk') if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") + throw GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") } def flutterVersionCode = localProperties.getProperty('flutter.versionCode') @@ -28,6 +28,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { compileSdkVersion flutter.compileSdkVersion ndkVersion flutter.ndkVersion + namespace "org.jimber.threebotlogin" sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -97,7 +98,7 @@ def lifecycle_version = "2.5.1" dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'androidx.multidex:multidex:2.0.1' - implementation 'com.hbb20:ccp:2.4.0' + // implementation 'com.hbb20:ccp:2.4.0' implementation 'com.google.code.gson:gson:2.8.6' implementation "androidx.preference:preference-ktx:1.1.1" implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" diff --git a/app/android/app/build_staging b/app/android/app/build_staging index f06e5ef72..5df85dc23 100644 --- a/app/android/app/build_staging +++ b/app/android/app/build_staging @@ -8,7 +8,7 @@ if (localPropertiesFile.exists()) { def flutterRoot = localProperties.getProperty('flutter.sdk') if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") + throw GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") } def flutterVersionCode = localProperties.getProperty('flutter.versionCode') @@ -28,6 +28,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { compileSdkVersion flutter.compileSdkVersion ndkVersion flutter.ndkVersion + namespace "org.jimber.threebotlogin" sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -97,7 +98,7 @@ def lifecycle_version = "2.5.1" dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'androidx.multidex:multidex:2.0.1' - implementation 'com.hbb20:ccp:2.4.0' + // implementation 'com.hbb20:ccp:2.4.0' implementation 'com.google.code.gson:gson:2.8.6' implementation "androidx.preference:preference-ktx:1.1.1" implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" diff --git a/app/android/app/build_testing b/app/android/app/build_testing index 61d842a26..5a6b64bf1 100644 --- a/app/android/app/build_testing +++ b/app/android/app/build_testing @@ -8,7 +8,7 @@ if (localPropertiesFile.exists()) { def flutterRoot = localProperties.getProperty('flutter.sdk') if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") + throw GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") } def flutterVersionCode = localProperties.getProperty('flutter.versionCode') @@ -28,6 +28,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { compileSdkVersion flutter.compileSdkVersion ndkVersion flutter.ndkVersion + namespace "org.jimber.threebotlogin" sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -97,7 +98,7 @@ def lifecycle_version = "2.5.1" dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'androidx.multidex:multidex:2.0.1' - implementation 'com.hbb20:ccp:2.4.0' + // implementation 'com.hbb20:ccp:2.4.0' implementation 'com.google.code.gson:gson:2.8.6' implementation "androidx.preference:preference-ktx:1.1.1" implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" diff --git a/app/android/build.gradle b/app/android/build.gradle index 48e5c828a..ff0cf4f22 100644 --- a/app/android/build.gradle +++ b/app/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '2.0.20' + ext.kotlin_version = '2.1.0' repositories { google() jcenter() @@ -11,7 +11,7 @@ buildscript { dependencies { // classpath 'com.android.tools.build:gradle:4.2.0' - classpath 'com.android.tools.build:gradle:7.3.0' + classpath 'com.android.tools.build:gradle:8.7.2' classpath 'com.google.gms:google-services:4.3.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } @@ -31,6 +31,31 @@ rootProject.buildDir = '../build' subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" } + +subprojects { + afterEvaluate { project -> + if (project.hasProperty('android')) { + project.android { + if (namespace == null) { + namespace project.group + } + } + } + } +} + +subprojects { + afterEvaluate { project -> + if (project.plugins.hasPlugin("com.android.application") || + project.plugins.hasPlugin("com.android.library")) { + project.android { + compileSdkVersion 34 + buildToolsVersion "34.0.0" + } + } + } +} + subprojects { project.evaluationDependsOn(':app') } diff --git a/app/android/gradle/wrapper/gradle-wrapper.properties b/app/android/gradle/wrapper/gradle-wrapper.properties index cfe88f690..db18181ac 100644 --- a/app/android/gradle/wrapper/gradle-wrapper.properties +++ b/app/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip diff --git a/app/lib/helpers/flags.dart b/app/lib/helpers/flags.dart index 1e11da701..e7e27b802 100644 --- a/app/lib/helpers/flags.dart +++ b/app/lib/helpers/flags.dart @@ -97,7 +97,7 @@ class Flags { Identity user = Identity(identifier: doubleName); return (await client.hasFeatureFlag(name, user: user) && await client.isFeatureFlagEnabled(name, user: user)); - return (await client.hasFeatureFlag(name) && + return (await client.hasFeatureFlag(name) && await client.isFeatureFlagEnabled(name)); } @@ -105,7 +105,7 @@ class Flags { String? doubleName = await getDoubleName(); Identity user = Identity(identifier: doubleName); return (await client.getFeatureFlagValue(name, user: user)); - return (await client.getFeatureFlagValue(name)); + return (await client.getFeatureFlagValue(name)); } Future setDeviceTrait(Identity user) async { diff --git a/app/lib/providers/theme_provider.dart b/app/lib/providers/theme_provider.dart index c4a65d4a3..7f104dd10 100644 --- a/app/lib/providers/theme_provider.dart +++ b/app/lib/providers/theme_provider.dart @@ -27,7 +27,7 @@ class ThemeModeNotifier extends StateNotifier { Future loadTheme() async { String? savedTheme = await getTheme(); state = savedTheme == 'dark' ? ThemeMode.dark : ThemeMode.light; - } + } } final themeModeNotifier = StateNotifierProvider( diff --git a/app/lib/screens/main_screen.dart b/app/lib/screens/main_screen.dart index 768124df2..df064d04d 100644 --- a/app/lib/screens/main_screen.dart +++ b/app/lib/screens/main_screen.dart @@ -214,7 +214,7 @@ class _AppState extends State { String? seedPhrase = await getPhrase(); if ((await isPKidMigrationIssueSolved() == false || - await isPKidMigrationIssueSolved() == null)) { + await isPKidMigrationIssueSolved() == null)) { fixPkidMigration(); } @@ -317,6 +317,6 @@ class _AppState extends State { twinId = await TFChain.getMyTwinId(); await saveTwinId(twinId); await updateUserData('twin_id', twinId.toString()); - } + } } } diff --git a/app/lib/services/socket_service.dart b/app/lib/services/socket_service.dart index 1590f8322..a51f4bbc7 100644 --- a/app/lib/services/socket_service.dart +++ b/app/lib/services/socket_service.dart @@ -310,8 +310,7 @@ Future openLogin(BuildContext ctx, Login loginData, BackendConnection backendConnection) async { String? messageType = loginData.type; - if (messageType != 'login' || - loginData.isMobile == true) { + if (messageType != 'login' || loginData.isMobile == true) { return; } diff --git a/app/lib/widgets/preference_dialog.dart b/app/lib/widgets/preference_dialog.dart index 2ff8539c4..89f7a0d00 100644 --- a/app/lib/widgets/preference_dialog.dart +++ b/app/lib/widgets/preference_dialog.dart @@ -58,7 +58,7 @@ class _PreferenceDialogState extends State { Map previousScopePermissionsObject; previousScopePermissionsObject = jsonDecode(previousScopePermissions); - + if (!scopeIsEqual(scopeAsMap, previousScopePermissionsObject)) { previousScopePermissionsObject = widget.scope!.toJson(); await savePreviousScopePermissions( From 59144691a75ce4e2503d2b365fae2a2b244ab00d Mon Sep 17 00:00:00 2001 From: ahmedhanafy725 Date: Wed, 22 Jan 2025 11:29:16 +0200 Subject: [PATCH 03/17] Update the manifest files --- app/android/app/src/main/AndroidManifest_local | 2 +- app/android/app/src/main/AndroidManifest_production | 2 +- app/android/app/src/main/AndroidManifest_staging | 2 +- app/android/app/src/main/AndroidManifest_testing | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/android/app/src/main/AndroidManifest_local b/app/android/app/src/main/AndroidManifest_local index ce9dba7a7..9e0499089 100644 --- a/app/android/app/src/main/AndroidManifest_local +++ b/app/android/app/src/main/AndroidManifest_local @@ -1,4 +1,4 @@ - + diff --git a/app/android/app/src/main/AndroidManifest_production b/app/android/app/src/main/AndroidManifest_production index 5ddec4700..b9219e889 100644 --- a/app/android/app/src/main/AndroidManifest_production +++ b/app/android/app/src/main/AndroidManifest_production @@ -1,4 +1,4 @@ - + diff --git a/app/android/app/src/main/AndroidManifest_staging b/app/android/app/src/main/AndroidManifest_staging index 47c590d8b..d5507e302 100644 --- a/app/android/app/src/main/AndroidManifest_staging +++ b/app/android/app/src/main/AndroidManifest_staging @@ -1,4 +1,4 @@ - + diff --git a/app/android/app/src/main/AndroidManifest_testing b/app/android/app/src/main/AndroidManifest_testing index 5baaf0b4f..e0e365b2e 100644 --- a/app/android/app/src/main/AndroidManifest_testing +++ b/app/android/app/src/main/AndroidManifest_testing @@ -1,4 +1,4 @@ - + From 1e8b8807b5c21508fef84d34abe2309e967cb5c8 Mon Sep 17 00:00:00 2001 From: ahmedhanafy725 Date: Wed, 22 Jan 2025 11:49:55 +0200 Subject: [PATCH 04/17] Revert "Upgrade the dependencies" This reverts commit 4b0b00571ae206affac4074bd6fc205001ad94f0. --- app/lib/apps/chatbot/chatbot_widget.dart | 4 +- app/lib/apps/farmers/farmers_widget.dart | 4 +- app/lib/apps/news/news_widget.dart | 4 +- app/lib/apps/wallet/wallet_widget.dart | 11 +- app/lib/browser.dart | 4 +- app/lib/helpers/flags.dart | 14 +- app/lib/providers/theme_provider.dart | 6 +- app/lib/screens/authentication_screen.dart | 3 +- app/lib/screens/home_screen.dart | 4 +- .../screens/identity_verification_screen.dart | 10 +- app/lib/screens/login_screen.dart | 9 +- app/lib/screens/main_screen.dart | 13 +- app/lib/screens/preference_screen.dart | 14 +- app/lib/screens/scan_screen.dart | 26 +- app/lib/screens/sign_screen.dart | 2 +- app/lib/screens/wallets/send.dart | 6 +- app/lib/services/pkid_service.dart | 2 +- .../services/shared_preference_service.dart | 21 +- app/lib/services/socket_service.dart | 20 +- app/lib/services/uni_link_service.dart | 12 +- app/lib/widgets/preference_dialog.dart | 8 +- app/lib/widgets/wallets/add_wallet.dart | 7 +- app/pubspec.lock | 783 ++++++++---------- app/pubspec.yaml | 74 +- 24 files changed, 507 insertions(+), 554 deletions(-) diff --git a/app/lib/apps/chatbot/chatbot_widget.dart b/app/lib/apps/chatbot/chatbot_widget.dart index 0fb6861d6..64f8ea047 100644 --- a/app/lib/apps/chatbot/chatbot_widget.dart +++ b/app/lib/apps/chatbot/chatbot_widget.dart @@ -26,8 +26,8 @@ class _ChatbotState extends State _ChatbotState({required this.email}) { iaWebview = InAppWebView( initialUrlRequest: URLRequest( - url: WebUri.uri(Uri.parse( - '${config.url()}$email&cache_buster=${DateTime.now().millisecondsSinceEpoch}'))), + url: Uri.parse( + '${config.url()}$email&cache_buster=${DateTime.now().millisecondsSinceEpoch}')), initialOptions: InAppWebViewGroupOptions( crossPlatform: InAppWebViewOptions(useShouldOverrideUrlLoading: true), android: AndroidInAppWebViewOptions( diff --git a/app/lib/apps/farmers/farmers_widget.dart b/app/lib/apps/farmers/farmers_widget.dart index b422741df..b0b8efc41 100644 --- a/app/lib/apps/farmers/farmers_widget.dart +++ b/app/lib/apps/farmers/farmers_widget.dart @@ -51,8 +51,8 @@ class _FarmersState extends State iaWebView = InAppWebView( initialUrlRequest: URLRequest( - url: WebUri.uri(Uri.parse( - '$farmersUri?cache_buster=${DateTime.now().millisecondsSinceEpoch}'))), + url: Uri.parse( + '$farmersUri?cache_buster=${DateTime.now().millisecondsSinceEpoch}')), initialOptions: InAppWebViewGroupOptions( crossPlatform: InAppWebViewOptions( cacheEnabled: Globals().isCacheClearedFarmer, diff --git a/app/lib/apps/news/news_widget.dart b/app/lib/apps/news/news_widget.dart index 54a6b19cc..bede24873 100644 --- a/app/lib/apps/news/news_widget.dart +++ b/app/lib/apps/news/news_widget.dart @@ -41,8 +41,8 @@ class _NewsState extends State with AutomaticKeepAliveClientMixin { initialEndsWith = DateTime.now().millisecondsSinceEpoch.toString(); iaWebView = InAppWebView( initialUrlRequest: URLRequest( - url: WebUri.uri(Uri.parse( - 'https://news.threefold.me?cache_buster=$initialEndsWith'))), + url: Uri.parse( + 'https://news.threefold.me?cache_buster=$initialEndsWith')), initialOptions: InAppWebViewGroupOptions( crossPlatform: InAppWebViewOptions(), android: AndroidInAppWebViewOptions( diff --git a/app/lib/apps/wallet/wallet_widget.dart b/app/lib/apps/wallet/wallet_widget.dart index 7f39e849f..1c05b6a9e 100644 --- a/app/lib/apps/wallet/wallet_widget.dart +++ b/app/lib/apps/wallet/wallet_widget.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_inappwebview/flutter_inappwebview.dart'; -// import 'package:qr_code_scanner/qr_code_scanner.dart'; +import 'package:qr_code_scanner/qr_code_scanner.dart'; import 'package:threebotlogin/apps/wallet/wallet_config.dart'; import 'package:threebotlogin/apps/wallet/wallet_events.dart'; import 'package:threebotlogin/apps/wallet/wallet_user_data.dart'; @@ -52,9 +52,9 @@ class _WalletState extends State : 'https://${config.appId()}/init'; iaWebView = InAppWebView( - // initialUrlRequest: URLRequest( - // url: Uri.parse( - // '$walletUri?cache_buster=${DateTime.now().millisecondsSinceEpoch}')), + initialUrlRequest: URLRequest( + url: Uri.parse( + '$walletUri?cache_buster=${DateTime.now().millisecondsSinceEpoch}')), initialOptions: InAppWebViewGroupOptions( crossPlatform: InAppWebViewOptions( cacheEnabled: Globals().isCacheClearedWallet, @@ -132,8 +132,7 @@ class _WalletState extends State // QRCode scanner is black if we don't sleep here. bool slept = await Future.delayed(const Duration(milliseconds: 400), () => true); - // late Barcode result; - late dynamic result; + late Barcode result; if (slept) { result = await Navigator.push( context, MaterialPageRoute(builder: (context) => const ScanScreen())); diff --git a/app/lib/browser.dart b/app/lib/browser.dart index 9945cb982..1438c0236 100644 --- a/app/lib/browser.dart +++ b/app/lib/browser.dart @@ -4,13 +4,13 @@ import 'package:threebotlogin/helpers/logger.dart'; class MyInAppBrowser extends InAppBrowser { @override void onLoadStart(Uri? url) { - super.onLoadStart(WebUri.uri(url!)); + super.onLoadStart(url); logger.i('\n\nStarted $url\n\n'); } @override void onLoadStop(Uri? url) { - super.onLoadStop(WebUri.uri(url!)); + super.onLoadStop(url); logger.i('\n\nStopped $url\n\n'); } diff --git a/app/lib/helpers/flags.dart b/app/lib/helpers/flags.dart index e7e27b802..63cbd6408 100644 --- a/app/lib/helpers/flags.dart +++ b/app/lib/helpers/flags.dart @@ -94,17 +94,21 @@ class Flags { Future hasFlagValueByFeatureName(String name) async { String? doubleName = await getDoubleName(); - Identity user = Identity(identifier: doubleName); - return (await client.hasFeatureFlag(name, user: user) && - await client.isFeatureFlagEnabled(name, user: user)); + if (doubleName != null) { + Identity user = Identity(identifier: doubleName); + return (await client.hasFeatureFlag(name, user: user) && + await client.isFeatureFlagEnabled(name, user: user)); + } return (await client.hasFeatureFlag(name) && await client.isFeatureFlagEnabled(name)); } Future getFlagValueByFeatureName(String name) async { String? doubleName = await getDoubleName(); - Identity user = Identity(identifier: doubleName); - return (await client.getFeatureFlagValue(name, user: user)); + if (doubleName != null) { + Identity user = Identity(identifier: doubleName); + return (await client.getFeatureFlagValue(name, user: user)); + } return (await client.getFeatureFlagValue(name)); } diff --git a/app/lib/providers/theme_provider.dart b/app/lib/providers/theme_provider.dart index 7f104dd10..9ab213699 100644 --- a/app/lib/providers/theme_provider.dart +++ b/app/lib/providers/theme_provider.dart @@ -26,7 +26,11 @@ class ThemeModeNotifier extends StateNotifier { Future loadTheme() async { String? savedTheme = await getTheme(); - state = savedTheme == 'dark' ? ThemeMode.dark : ThemeMode.light; + if (savedTheme != null) { + state = savedTheme == 'dark' ? ThemeMode.dark : ThemeMode.light; + } else { + state = ThemeMode.system; + } } } diff --git a/app/lib/screens/authentication_screen.dart b/app/lib/screens/authentication_screen.dart index 235f02c41..4f7ce7e49 100644 --- a/app/lib/screens/authentication_screen.dart +++ b/app/lib/screens/authentication_screen.dart @@ -58,7 +58,8 @@ class AuthenticationScreenState extends State { int? created = widget.loginData!.created; int currentTimestamp = DateTime.now().millisecondsSinceEpoch; - if (((currentTimestamp - created) / 1000) > Globals().loginTimeout) { + if (created != null && + ((currentTimestamp - created) / 1000) > Globals().loginTimeout) { timer.cancel(); await showDialog( diff --git a/app/lib/screens/home_screen.dart b/app/lib/screens/home_screen.dart index 96d91d042..78ffbe34f 100644 --- a/app/lib/screens/home_screen.dart +++ b/app/lib/screens/home_screen.dart @@ -54,7 +54,7 @@ class _HomeScreenState extends State context, MaterialPageRoute( builder: (context) => AuthenticationScreen( - correctPin: pin, + correctPin: pin!, userMessage: 'Please enter your PIN code', ), ), @@ -62,7 +62,7 @@ class _HomeScreenState extends State pinCheckOpen = false; - if (authenticated) { + if (authenticated != null && authenticated) { lastCheck = DateTime.now().millisecondsSinceEpoch; timeoutExpiredInBackground = false; globals.tabController.animateTo(indexIfAuthIsSuccess); diff --git a/app/lib/screens/identity_verification_screen.dart b/app/lib/screens/identity_verification_screen.dart index b1e40515f..cf214ab65 100644 --- a/app/lib/screens/identity_verification_screen.dart +++ b/app/lib/screens/identity_verification_screen.dart @@ -587,12 +587,12 @@ class _IdentityVerificationScreenState context, MaterialPageRoute( builder: (context) => AuthenticationScreen( - correctPin: pin, + correctPin: pin!, userMessage: 'Please enter your PIN code', ), )); - if (authenticated) { + if (authenticated != null && authenticated) { final phrase = await getPhrase(); showDialog( @@ -937,7 +937,7 @@ class _IdentityVerificationScreenState } String? phoneNumber = phoneMap['phone']; - if (phoneNumber.isEmpty) { + if (phoneNumber == null || phoneNumber.isEmpty) { return; } @@ -1129,7 +1129,7 @@ class _IdentityVerificationScreenState String? phoneNumber = phoneMap['phone']; if (phone != phoneNumber) { setState(() { - phone = phoneNumber; + phone = phoneNumber!; }); } return; @@ -1865,7 +1865,7 @@ class _IdentityVerificationScreenState return; } String? phoneNumber = phoneMap['phone']; - if (phoneNumber.isEmpty) { + if (phoneNumber == null || phoneNumber.isEmpty) { return; } diff --git a/app/lib/screens/login_screen.dart b/app/lib/screens/login_screen.dart index 6b8b03eba..9f76b133f 100644 --- a/app/lib/screens/login_screen.dart +++ b/app/lib/screens/login_screen.dart @@ -289,7 +289,7 @@ class _LoginScreenState extends State with BlockAndRunMixin { cancelIt() async { String? doubleName = await getDoubleName(); - cancelLogin(doubleName); + cancelLogin(doubleName!); } sendIt(bool includeData) async { @@ -300,10 +300,11 @@ class _LoginScreenState extends State with BlockAndRunMixin { int? created = widget.loginData.created; int currentTimestamp = DateTime.now().millisecondsSinceEpoch; - if (((currentTimestamp - created) / 1000) > Globals().loginTimeout) { + if (created != null && + ((currentTimestamp - created) / 1000) > Globals().loginTimeout) { await showExpiredDialog(context); await sendData( - state, null, selectedImageId, null, widget.loginData.appId!); + state!, null, selectedImageId, null, widget.loginData.appId!); if (Navigator.canPop(context)) { Navigator.pop(context, false); @@ -314,7 +315,7 @@ class _LoginScreenState extends State with BlockAndRunMixin { } // If the state is not passed through the regEx - bool stateCheck = RegExp(r'[^A-Za-z0-9]+').hasMatch(state); + bool stateCheck = RegExp(r'[^A-Za-z0-9]+').hasMatch(state!); if (stateCheck) { logger.i('States can only be alphanumeric [^A-Za-z0-9]'); return; diff --git a/app/lib/screens/main_screen.dart b/app/lib/screens/main_screen.dart index df064d04d..84eefae23 100644 --- a/app/lib/screens/main_screen.dart +++ b/app/lib/screens/main_screen.dart @@ -213,8 +213,9 @@ class _AppState extends State { try { String? seedPhrase = await getPhrase(); - if ((await isPKidMigrationIssueSolved() == false || - await isPKidMigrationIssueSolved() == null)) { + if (seedPhrase != null && + (await isPKidMigrationIssueSolved() == false || + await isPKidMigrationIssueSolved() == null)) { fixPkidMigration(); } @@ -313,10 +314,12 @@ class _AppState extends State { Future loadTwinId() async { int? twinId = await getTwinId(); - if (twinId == 0) { + if (twinId == null || twinId == 0) { twinId = await TFChain.getMyTwinId(); - await saveTwinId(twinId); - await updateUserData('twin_id', twinId.toString()); + if (twinId != null) { + await saveTwinId(twinId); + await updateUserData('twin_id', twinId.toString()); + } } } } diff --git a/app/lib/screens/preference_screen.dart b/app/lib/screens/preference_screen.dart index 3969ad31b..d61a7038b 100644 --- a/app/lib/screens/preference_screen.dart +++ b/app/lib/screens/preference_screen.dart @@ -77,7 +77,7 @@ class _PreferenceScreenState extends ConsumerState { context, MaterialPageRoute( builder: (context) => AuthenticationScreen( - correctPin: pin, + correctPin: pin!, userMessage: 'Please enter your PIN code', ), )); @@ -290,12 +290,12 @@ class _PreferenceScreenState extends ConsumerState { context, MaterialPageRoute( builder: (context) => AuthenticationScreen( - correctPin: pin, + correctPin: pin!, userMessage: 'Please enter your PIN code', ), )); - if (!authenticated) { + if (authenticated == null || !authenticated) { deleteLoading = false; setState(() {}); return false; @@ -386,13 +386,13 @@ class _PreferenceScreenState extends ConsumerState { context, MaterialPageRoute( builder: (context) => AuthenticationScreen( - correctPin: pin, + correctPin: pin!, userMessage: 'Please enter your PIN code', ), ), ); - if (authenticated) { + if (authenticated != null && authenticated) { finger = newFingerprintValue; await saveFingerprint(newFingerprintValue); setState(() {}); @@ -403,7 +403,7 @@ class _PreferenceScreenState extends ConsumerState { String? pin = await getPin(); bool? authenticated = false; - if (pin.isEmpty) { + if (pin == null || pin.isEmpty) { authenticated = true; // In case the pin wasn't set. } else { authenticated = await Navigator.push( @@ -417,7 +417,7 @@ class _PreferenceScreenState extends ConsumerState { ); } - if (authenticated) { + if (authenticated != null && authenticated) { bool pinChanged = await Navigator.push( context, MaterialPageRoute( diff --git a/app/lib/screens/scan_screen.dart b/app/lib/screens/scan_screen.dart index 233e1c9c8..9d46f99f7 100644 --- a/app/lib/screens/scan_screen.dart +++ b/app/lib/screens/scan_screen.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -// import 'package:qr_code_scanner/qr_code_scanner.dart'; +import 'package:qr_code_scanner/qr_code_scanner.dart'; class ScanScreen extends StatefulWidget { const ScanScreen({super.key}); @@ -24,24 +24,24 @@ class _ScanScreenState extends State { return Scaffold( body: Stack( children: [ - // QRView( - // key: qrKey, - // onQRViewCreated: _onQRViewCreated, - // ), + QRView( + key: qrKey, + onQRViewCreated: _onQRViewCreated, + ), Align(alignment: Alignment.bottomCenter, child: content()), ], ), ); } - // void _onQRViewCreated(QRViewController controller) { - // controller.scannedDataStream.listen((scanData) { - // if (!popped) { - // popped = true; - // Navigator.pop(context, scanData); - // } - // }); - // } + void _onQRViewCreated(QRViewController controller) { + controller.scannedDataStream.listen((scanData) { + if (!popped) { + popped = true; + Navigator.pop(context, scanData); + } + }); + } Widget content() { double height = MediaQuery.of(context).size.height; diff --git a/app/lib/screens/sign_screen.dart b/app/lib/screens/sign_screen.dart index dc376f23b..0497a9c30 100644 --- a/app/lib/screens/sign_screen.dart +++ b/app/lib/screens/sign_screen.dart @@ -460,6 +460,6 @@ class _SignScreenState extends State with BlockAndRunMixin { cancelSignAttempt() async { String? doubleName = await getDoubleName(); - cancelSign(doubleName); + cancelSign(doubleName!); } } diff --git a/app/lib/screens/wallets/send.dart b/app/lib/screens/wallets/send.dart index f7ed0c806..b56e46577 100644 --- a/app/lib/screens/wallets/send.dart +++ b/app/lib/screens/wallets/send.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -// import 'package:qr_code_scanner/qr_code_scanner.dart'; +import 'package:qr_code_scanner/qr_code_scanner.dart'; import 'package:threebotlogin/helpers/globals.dart'; import 'package:threebotlogin/helpers/transaction_helpers.dart'; import 'package:threebotlogin/models/wallet.dart'; @@ -374,9 +374,7 @@ class _WalletSendScreenState extends ConsumerState { // QRCode scanner is black if we don't sleep here. bool slept = await Future.delayed(const Duration(milliseconds: 400), () => true); - // late Barcode result; - late dynamic result; - + late Barcode result; if (slept) { if (context.mounted) { result = await Navigator.push(context, diff --git a/app/lib/services/pkid_service.dart b/app/lib/services/pkid_service.dart index e0f661aec..e4b9af087 100644 --- a/app/lib/services/pkid_service.dart +++ b/app/lib/services/pkid_service.dart @@ -11,7 +11,7 @@ Future getPkidClient({String seedPhrase = ''}) async { String pKidUrl = AppConfig().pKidUrl(); String? phrase = seedPhrase != '' ? seedPhrase : await getPhrase(); - KeyPair keyPair = await generateKeyPairFromSeedPhrase(phrase); + KeyPair keyPair = await generateKeyPairFromSeedPhrase(phrase!); return FlutterPkid(pKidUrl, keyPair); } diff --git a/app/lib/services/shared_preference_service.dart b/app/lib/services/shared_preference_service.dart index 4feeda001..702886a50 100644 --- a/app/lib/services/shared_preference_service.dart +++ b/app/lib/services/shared_preference_service.dart @@ -26,7 +26,7 @@ Future getPublicKey() async { if (isPublicKeyFixed == true) { String? encodedPublicKey = prefs.getString('publickey'); - return base64.decode(encodedPublicKey); + return base64.decode(encodedPublicKey!); } var userInfoResponse = await getUserInfo(await getDoubleName()); @@ -42,7 +42,7 @@ Future getPublicKey() async { } String? encodedPublicKey = prefs.getString('publickey'); - return base64.decode(encodedPublicKey); + return base64.decode(encodedPublicKey!); } Future savePublicKey(Uint8List publicKey) async { @@ -72,7 +72,7 @@ Future getPrivateKey() async { final SharedPreferences prefs = await SharedPreferences.getInstance(); String? privateKey = prefs.getString('privatekey'); - Uint8List decodedPrivateKey = base64.decode(privateKey); + Uint8List decodedPrivateKey = base64.decode(privateKey!); return decodedPrivateKey; } @@ -310,6 +310,11 @@ Future getFingerprint() async { final SharedPreferences prefs = await SharedPreferences.getInstance(); bool? result = prefs.getBool('useFingerPrint'); + if (result == null) { + prefs.setBool('useFingerPrint', false); + result = prefs.getBool('useFingerPrint'); + } + return result; } @@ -357,6 +362,10 @@ Future getInitDone() async { final SharedPreferences prefs = await SharedPreferences.getInstance(); bool? initDone = prefs.getBool('initDone'); + if (initDone == null) { + prefs.setBool('initDone', false); + initDone = prefs.getBool('initDone'); + } bool isInitDone = initDone == true; return isInitDone; @@ -441,7 +450,11 @@ Future> getLocationIdList() async { List locationIdList = []; - locationIdList = jsonDecode(locationIdListAsJson); + if (locationIdListAsJson != null) { + locationIdList = jsonDecode(locationIdListAsJson); + } else { + locationIdList = []; + } return locationIdList; } diff --git a/app/lib/services/socket_service.dart b/app/lib/services/socket_service.dart index a51f4bbc7..902c322bd 100644 --- a/app/lib/services/socket_service.dart +++ b/app/lib/services/socket_service.dart @@ -269,7 +269,7 @@ Future openSign(BuildContext ctx, Sign signData, BackendConnection backendConnection) async { String? messageType = signData.type; - if (messageType != 'sign') { + if (messageType == null || messageType != 'sign') { return; } @@ -280,11 +280,11 @@ Future openSign(BuildContext ctx, Sign signData, ctx, MaterialPageRoute( builder: (context) => AuthenticationScreen( - correctPin: pin, userMessage: 'Please enter your PIN code'), + correctPin: pin!, userMessage: 'Please enter your PIN code'), ), ); - if (authenticated == false) { + if (authenticated == null || authenticated == false) { return; } @@ -297,7 +297,7 @@ Future openSign(BuildContext ctx, Sign signData, ), ); - if (signAccepted == false) { + if (signAccepted == null || signAccepted == false) { backendConnection.joinRoom(signData.doubleName); return; } @@ -310,7 +310,9 @@ Future openLogin(BuildContext ctx, Login loginData, BackendConnection backendConnection) async { String? messageType = loginData.type; - if (messageType != 'login' || loginData.isMobile == true) { + if (messageType == null || + messageType != 'login' || + loginData.isMobile == true) { return; } @@ -322,13 +324,13 @@ Future openLogin(BuildContext ctx, Login loginData, ctx, MaterialPageRoute( builder: (context) => AuthenticationScreen( - correctPin: pin, + correctPin: pin!, userMessage: 'Please enter your PIN code.', loginData: loginData), ), ); - if (authenticated == false) { + if (authenticated == null || authenticated == false) { return; } @@ -340,7 +342,7 @@ Future openLogin(BuildContext ctx, Login loginData, ), ); - if (!warningScreenCompleted) { + if (warningScreenCompleted == null || !warningScreenCompleted) { return; } @@ -356,7 +358,7 @@ Future openLogin(BuildContext ctx, Login loginData, ), ); - if (loggedIn == false) { + if (loggedIn == null || loggedIn == false) { backendConnection.joinRoom(loginData.doubleName); return; } diff --git a/app/lib/services/uni_link_service.dart b/app/lib/services/uni_link_service.dart index 5919610c2..0b28e3995 100644 --- a/app/lib/services/uni_link_service.dart +++ b/app/lib/services/uni_link_service.dart @@ -53,11 +53,11 @@ void handleLoginUniLink(Uri link, BuildContext context) async { context, MaterialPageRoute( builder: (context) => AuthenticationScreen( - correctPin: pin, userMessage: 'Please enter your PIN code'), + correctPin: pin!, userMessage: 'Please enter your PIN code'), ), ); - if (authenticated == false) { + if (authenticated == null || authenticated == false) { return; } @@ -68,7 +68,7 @@ void handleLoginUniLink(Uri link, BuildContext context) async { ), ); - if (loggedIn == false) { + if (loggedIn == null || loggedIn == false) { return; } @@ -122,11 +122,11 @@ Future handleSignUniLink(Uri link, BuildContext context) async { context, MaterialPageRoute( builder: (context) => AuthenticationScreen( - correctPin: pin, userMessage: 'Please enter your PIN code'), + correctPin: pin!, userMessage: 'Please enter your PIN code'), ), ); - if (authenticated == false) { + if (authenticated == null || authenticated == false) { return; } @@ -137,7 +137,7 @@ Future handleSignUniLink(Uri link, BuildContext context) async { ), ); - if (loggedIn == false) { + if (loggedIn == null || loggedIn == false) { return; } diff --git a/app/lib/widgets/preference_dialog.dart b/app/lib/widgets/preference_dialog.dart index 89f7a0d00..0988649d4 100644 --- a/app/lib/widgets/preference_dialog.dart +++ b/app/lib/widgets/preference_dialog.dart @@ -57,7 +57,13 @@ class _PreferenceDialogState extends State { widget.appId!); // Scope from our history based on the appId. Map previousScopePermissionsObject; - previousScopePermissionsObject = jsonDecode(previousScopePermissions); + if (previousScopePermissions != null) { + previousScopePermissionsObject = jsonDecode(previousScopePermissions); + } else { + previousScopePermissionsObject = widget.scope!.toJson(); + await savePreviousScopePermissions( + widget.appId!, jsonEncode(previousScopePermissionsObject)); + } if (!scopeIsEqual(scopeAsMap, previousScopePermissionsObject)) { previousScopePermissionsObject = widget.scope!.toJson(); diff --git a/app/lib/widgets/wallets/add_wallet.dart b/app/lib/widgets/wallets/add_wallet.dart index 43f0fd802..67f90558c 100644 --- a/app/lib/widgets/wallets/add_wallet.dart +++ b/app/lib/widgets/wallets/add_wallet.dart @@ -139,8 +139,7 @@ class _NewWalletState extends ConsumerState { return false; } - if (walletSecret.startsWith('S') && - widget.wallets.any((wallet) => wallet.stellarSecret == walletSecret)) { + if (walletSecret.startsWith('S') && widget.wallets.any((wallet) => wallet.stellarSecret == walletSecret)){ secretError = 'Secret already exists'; return false; } @@ -153,9 +152,9 @@ class _NewWalletState extends ConsumerState { secretError = 'Invalid seed'; return false; } - if (widget.wallets.any((wallet) => wallet.tfchainSecret == walletSecret)) { + if (widget.wallets.any((wallet) => wallet.tfchainSecret == walletSecret)){ secretError = 'Secret already exists'; - return false; + return false; } if (!walletSecret.startsWith('0x') && walletSecret.length != 64) { secretError = 'Invalid seed length'; diff --git a/app/pubspec.lock b/app/pubspec.lock index 7ed7d5884..c7563e953 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -5,15 +5,10 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab" + sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7" url: "https://pub.dev" source: hosted - version: "76.0.0" - _macros: - dependency: transitive - description: dart - source: sdk - version: "0.3.3" + version: "67.0.0" adaptive_number: dependency: transitive description: @@ -26,34 +21,34 @@ packages: dependency: transitive description: name: analyzer - sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e" + sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d" url: "https://pub.dev" source: hosted - version: "6.11.0" + version: "6.4.1" archive: dependency: transitive description: name: archive - sha256: "6199c74e3db4fbfbd04f66d739e72fe11c8a8957d5f219f1f4482dbde6420b5a" + sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d url: "https://pub.dev" source: hosted - version: "4.0.2" + version: "3.6.1" args: dependency: transitive description: name: args - sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 + sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a" url: "https://pub.dev" source: hosted - version: "2.6.0" + version: "2.5.0" asn1lib: dependency: transitive description: name: asn1lib - sha256: "4bae5ae63e6d6dd17c4aac8086f3dec26c0236f6a0f03416c6c19d830c367cf5" + sha256: "6b151826fcc95ff246cd219a0bf4c753ea14f4081ad71c61939becf3aba27f70" url: "https://pub.dev" source: hosted - version: "1.5.8" + version: "1.5.5" async: dependency: transitive description: @@ -66,10 +61,10 @@ packages: dependency: transitive description: name: audio_session - sha256: b2a26ba8b7efa1790d6460e82971fde3e398cfbe2295df9dea22f3499d2c12a7 + sha256: "343e83bc7809fbda2591a49e525d6b63213ade10c76f15813be9aed6657b3261" url: "https://pub.dev" source: hosted - version: "0.1.23" + version: "0.1.21" base_x: dependency: transitive description: @@ -90,10 +85,10 @@ packages: dependency: transitive description: name: bip39_mnemonic - sha256: "3ae6ed74b97a0b820e71d01b75ac4bc5b036a8bb427d5ee5827427d2872eefb0" + sha256: "24855a62fb9dd930f697063a274e084b0a574e1cc55ec270ca4756f579ab512c" url: "https://pub.dev" source: hosted - version: "3.0.7" + version: "3.0.6" boolean_selector: dependency: transitive description: @@ -106,50 +101,50 @@ packages: dependency: transitive description: name: build - sha256: cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0 + sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0" url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.4.1" build_config: dependency: transitive description: name: build_config - sha256: "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33" + sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1 url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.1.1" build_daemon: dependency: transitive description: name: build_daemon - sha256: "294a2edaf4814a378725bfe6358210196f5ea37af89ecd81bfa32960113d4948" + sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9" url: "https://pub.dev" source: hosted - version: "4.0.3" + version: "4.0.2" build_resolvers: dependency: transitive description: name: build_resolvers - sha256: "99d3980049739a985cf9b21f30881f46db3ebc62c5b8d5e60e27440876b1ba1e" + sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a" url: "https://pub.dev" source: hosted - version: "2.4.3" + version: "2.4.2" build_runner: dependency: "direct main" description: name: build_runner - sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d" + sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7" url: "https://pub.dev" source: hosted - version: "2.4.13" + version: "2.4.11" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0 + sha256: e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe url: "https://pub.dev" source: hosted - version: "7.3.2" + version: "7.3.1" built_collection: dependency: transitive description: @@ -162,34 +157,34 @@ packages: dependency: transitive description: name: built_value - sha256: "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2" + sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb url: "https://pub.dev" source: hosted - version: "8.9.3" + version: "8.9.2" cached_network_image: dependency: transitive description: name: cached_network_image - sha256: "7c1183e361e5c8b0a0f21a28401eecdbde252441106a9816400dd4c2b2424916" + sha256: "28ea9690a8207179c319965c13cd8df184d5ee721ae2ce60f398ced1219cea1f" url: "https://pub.dev" source: hosted - version: "3.4.1" + version: "3.3.1" cached_network_image_platform_interface: dependency: transitive description: name: cached_network_image_platform_interface - sha256: "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829" + sha256: "9e90e78ae72caa874a323d78fa6301b3fb8fa7ea76a8f96dc5b5bf79f283bf2f" url: "https://pub.dev" source: hosted - version: "4.1.1" + version: "4.0.0" cached_network_image_web: dependency: transitive description: name: cached_network_image_web - sha256: "980842f4e8e2535b8dbd3d5ca0b1f0ba66bf61d14cc3a17a9b4788a3685ba062" + sha256: "205d6a9f1862de34b93184f22b9d2d94586b2f05c581d546695e3d8f6a805cd7" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.2.0" characters: dependency: transitive description: @@ -210,18 +205,18 @@ packages: dependency: transitive description: name: chewie - sha256: "6386fcc7ad7a8f7b25709ce988cd089cdde894bf335c7a0024a1bfcf8788a452" + sha256: "8bc4ac4cf3f316e50a25958c0f5eb9bb12cf7e8308bb1d74a43b230da2cfc144" url: "https://pub.dev" source: hosted - version: "1.9.2" + version: "1.7.5" cli_util: dependency: transitive description: name: cli_util - sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c + sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19 url: "https://pub.dev" source: hosted - version: "0.4.2" + version: "0.4.1" clock: dependency: transitive description: @@ -234,50 +229,50 @@ packages: dependency: transitive description: name: code_builder - sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e" + sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37 url: "https://pub.dev" source: hosted - version: "4.10.1" + version: "4.10.0" collection: dependency: transitive description: name: collection - sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.19.0" + version: "1.18.0" convert: dependency: "direct main" description: name: convert - sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 + sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "3.1.1" country_picker: dependency: "direct main" description: name: country_picker - sha256: "9b14c04f9a35e99f6de6bcbc453a556bb98345aecb481c7a0e843c94c2bee1f8" + sha256: "327f5e15a76352089a6b5057abb761ee5202e7516c9440d8d6a7524139f9b14e" url: "https://pub.dev" source: hosted - version: "2.0.27" + version: "2.0.26" crisp_chat: dependency: "direct main" description: name: crisp_chat - sha256: febd2412b87df213718d6d0308d72edc0a8638e07f6b89e3895e83785ffd092b + sha256: "7ef5ee1ab811d7797e1aa723d20f69a976e10114a58bf21c3f80936c5787827e" url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.0.3" crypto: dependency: "direct main" description: name: crypto - sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" + sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27 url: "https://pub.dev" source: hosted - version: "3.0.6" + version: "3.0.5" cryptography: dependency: transitive description: @@ -290,10 +285,10 @@ packages: dependency: transitive description: name: csslib - sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e" + sha256: "831883fb353c8bdc1d71979e5b342c7d88acfbc643113c14ae51e2442ea0f20f" url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "0.17.3" cupertino_icons: dependency: "direct main" description: @@ -306,42 +301,42 @@ packages: dependency: transitive description: name: dart_style - sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab" + sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9" url: "https://pub.dev" source: hosted - version: "2.3.7" + version: "2.3.6" dbus: dependency: transitive description: name: dbus - sha256: "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c" + sha256: "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac" url: "https://pub.dev" source: hosted - version: "0.7.11" + version: "0.7.10" decimal: dependency: "direct main" description: name: decimal - sha256: "28239b8b929c1bd8618702e6dbc96e2618cf99770bbe9cb040d6cf56a11e4ec3" + sha256: da8f65df568345f2738cc8b0de74971c86d2d93ce5fc8c4ec094f6b7c5d48eb5 url: "https://pub.dev" source: hosted - version: "3.2.1" + version: "3.1.0" device_info_plus: dependency: "direct main" description: name: device_info_plus - sha256: b37d37c2f912ad4e8ec694187de87d05de2a3cb82b465ff1f65f65a2d05de544 + sha256: "77f757b789ff68e4eaf9c56d1752309bd9f7ad557cb105b938a7f8eb89e59110" url: "https://pub.dev" source: hosted - version: "11.2.1" + version: "9.1.2" device_info_plus_platform_interface: dependency: transitive description: name: device_info_plus_platform_interface - sha256: "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2" + sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba" url: "https://pub.dev" source: hosted - version: "7.0.2" + version: "7.0.1" dio: dependency: "direct main" description: @@ -354,10 +349,10 @@ packages: dependency: transitive description: name: dio_web_adapter - sha256: "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8" + sha256: "36c5b2d79eb17cdae41e974b7a8284fec631651d2a6f39a8a2ff22327e90aeac" url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "1.0.1" ed25519_edwards: dependency: transitive description: @@ -386,10 +381,10 @@ packages: dependency: transitive description: name: equatable - sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7" + sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2 url: "https://pub.dev" source: hosted - version: "2.0.7" + version: "2.0.5" fake_async: dependency: transitive description: @@ -418,18 +413,26 @@ packages: dependency: transitive description: name: fixnum - sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be + sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.0" flagsmith: dependency: "direct main" description: name: flagsmith - sha256: "9c0723c002e8cc2782c382df2f93dcb3a19bde8dd318a5bf568013ee368cb7df" + sha256: "70a166ac4bd8d565bd1005400baa238fe8463763366a5605a87df36cf4c03cae" url: "https://pub.dev" source: hosted - version: "6.0.0" + version: "3.1.0" + flagsmith_flutter_core: + dependency: transitive + description: + name: flagsmith_flutter_core + sha256: c7fe448040165f9c2448c24d1b2c89745983d71183210131f52d831f3aabf3c9 + url: "https://pub.dev" + source: hosted + version: "2.3.1" flutter: dependency: "direct main" description: flutter @@ -439,18 +442,10 @@ packages: dependency: transitive description: name: flutter_cache_manager - sha256: "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386" + sha256: "8207f27539deb83732fdda03e259349046a39a4c767269285f449ade355d54ba" url: "https://pub.dev" source: hosted - version: "3.4.1" - flutter_client_sse: - dependency: transitive - description: - name: flutter_client_sse - sha256: "4ce0297206473dfc064b255fe086713240002e149f52519bd48c21423e4aa5d2" - url: "https://pub.dev" - source: hosted - version: "2.0.3" + version: "3.3.1" flutter_curve25519: dependency: transitive description: @@ -463,66 +458,10 @@ packages: dependency: "direct main" description: name: flutter_inappwebview - sha256: "80092d13d3e29b6227e25b67973c67c7210bd5e35c4b747ca908e31eb71a46d5" - url: "https://pub.dev" - source: hosted - version: "6.1.5" - flutter_inappwebview_android: - dependency: transitive - description: - name: flutter_inappwebview_android - sha256: "62557c15a5c2db5d195cb3892aab74fcaec266d7b86d59a6f0027abd672cddba" - url: "https://pub.dev" - source: hosted - version: "1.1.3" - flutter_inappwebview_internal_annotations: - dependency: transitive - description: - name: flutter_inappwebview_internal_annotations - sha256: "787171d43f8af67864740b6f04166c13190aa74a1468a1f1f1e9ee5b90c359cd" - url: "https://pub.dev" - source: hosted - version: "1.2.0" - flutter_inappwebview_ios: - dependency: transitive - description: - name: flutter_inappwebview_ios - sha256: "5818cf9b26cf0cbb0f62ff50772217d41ea8d3d9cc00279c45f8aabaa1b4025d" + sha256: d198297060d116b94048301ee6749cd2e7d03c1f2689783f52d210a6b7aba350 url: "https://pub.dev" source: hosted - version: "1.1.2" - flutter_inappwebview_macos: - dependency: transitive - description: - name: flutter_inappwebview_macos - sha256: c1fbb86af1a3738e3541364d7d1866315ffb0468a1a77e34198c9be571287da1 - url: "https://pub.dev" - source: hosted - version: "1.1.2" - flutter_inappwebview_platform_interface: - dependency: transitive - description: - name: flutter_inappwebview_platform_interface - sha256: cf5323e194096b6ede7a1ca808c3e0a078e4b33cc3f6338977d75b4024ba2500 - url: "https://pub.dev" - source: hosted - version: "1.3.0+1" - flutter_inappwebview_web: - dependency: transitive - description: - name: flutter_inappwebview_web - sha256: "55f89c83b0a0d3b7893306b3bb545ba4770a4df018204917148ebb42dc14a598" - url: "https://pub.dev" - source: hosted - version: "1.1.2" - flutter_inappwebview_windows: - dependency: transitive - description: - name: flutter_inappwebview_windows - sha256: "8b4d3a46078a2cdc636c4a3d10d10f2a16882f6be607962dbfff8874d1642055" - url: "https://pub.dev" - source: hosted - version: "0.6.0" + version: "5.8.0" flutter_json_viewer: dependency: "direct main" description: @@ -583,41 +522,43 @@ packages: dependency: "direct main" description: name: flutter_launcher_icons - sha256: bfa04787c85d80ecb3f8777bde5fc10c3de809240c48fa061a2c2bf15ea5211c + sha256: "619817c4b65b322b5104b6bb6dfe6cda62d9729bd7ad4303ecc8b4e690a67a77" url: "https://pub.dev" source: hosted - version: "0.14.3" + version: "0.14.1" flutter_lints: dependency: "direct dev" description: name: flutter_lints - sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" + sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 url: "https://pub.dev" source: hosted - version: "5.0.0" + version: "2.0.3" flutter_pkid: dependency: "direct main" description: - path: "../../threefold_connect_flutter_pkid_client" - relative: true - source: path + path: "." + ref: master + resolved-ref: "56cc03e8386a9f0530c3489d8bbbeedecb6f47f9" + url: "https://github.com/threefoldtech/threefold_connect_flutter_pkid_client" + source: git version: "0.0.1" flutter_plugin_android_lifecycle: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e" + sha256: "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda" url: "https://pub.dev" source: hosted - version: "2.0.24" + version: "2.0.22" flutter_riverpod: dependency: "direct main" description: name: flutter_riverpod - sha256: "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1" + sha256: "0f1974eff5bbe774bf1d870e406fc6f29e3d6f1c46bd9c58e7172ff68a785d7d" url: "https://pub.dev" source: hosted - version: "2.6.1" + version: "2.5.1" flutter_staggered_grid_view: dependency: transitive description: @@ -630,10 +571,10 @@ packages: dependency: "direct main" description: name: flutter_svg - sha256: c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b + sha256: "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2" url: "https://pub.dev" source: hosted - version: "2.0.17" + version: "2.0.10+1" flutter_test: dependency: "direct dev" description: flutter @@ -648,10 +589,10 @@ packages: dependency: "direct main" description: name: flutter_widget_from_html - sha256: f3967a5b42896662efdd420b5adaf8a7d3692b0f44462a07c80e3b4c173b1a02 + sha256: "9e2a6201c4d2eb910b6b3ebb2a9f5c490fc61c9a1aa35eafdde38f0fc659cf4c" url: "https://pub.dev" source: hosted - version: "0.15.3" + version: "0.15.2" flutter_widget_from_html_core: dependency: transitive description: @@ -720,10 +661,10 @@ packages: dependency: transitive description: name: fwfh_webview - sha256: c0a8b664b642f40f4c252a0ab4e72c22dcd97c7fb3a7e50a6b4bdb6f63afca19 + sha256: f67890bc0d6278da98bd197469ae9511c859f7db327e92299fe0ea0cf46c4057 url: "https://pub.dev" source: hosted - version: "0.15.3" + version: "0.15.2" glob: dependency: transitive description: @@ -736,10 +677,10 @@ packages: dependency: "direct main" description: name: google_fonts - sha256: b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82 + sha256: e20ff62b158b96f392bfc8afe29dee1503c94fbea2cbe8186fd59b756b8ae982 url: "https://pub.dev" source: hosted - version: "6.2.1" + version: "5.1.0" graphs: dependency: transitive description: @@ -751,18 +692,20 @@ packages: gridproxy_client: dependency: "direct main" description: - path: "../../../codescalers/tfgrid-sdk-dart/packages/gridproxy_client" - relative: true - source: path + path: "packages/gridproxy_client" + ref: main + resolved-ref: "68d4fda0ded7fbc3d6e9a594ebbf0ea7ff3b48b6" + url: "https://github.com/threefoldtech/tfgrid-sdk-dart" + source: git version: "1.0.0" hashlib: dependency: "direct main" description: name: hashlib - sha256: e13e8237d93fb275cd1c55fc339bb90638994d1a4f140c7ee270173b51f3d169 + sha256: f572f2abce09fc7aee53f15927052b9732ea1053e540af8cae211111ee0b99b1 url: "https://pub.dev" source: hosted - version: "1.21.1" + version: "1.21.0" hashlib_codecs: dependency: transitive description: @@ -783,50 +726,50 @@ packages: dependency: transitive description: name: html - sha256: "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec" + sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a" url: "https://pub.dev" source: hosted - version: "0.15.5" + version: "0.15.4" http: dependency: "direct main" description: name: http - sha256: fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f + sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.2.1" http_multi_server: dependency: transitive description: name: http_multi_server - sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8 + sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" url: "https://pub.dev" source: hosted - version: "3.2.2" + version: "3.2.1" http_parser: dependency: transitive description: name: http_parser - sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571" + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" url: "https://pub.dev" source: hosted - version: "4.1.2" + version: "4.0.2" idenfy_sdk_flutter: dependency: "direct main" description: name: idenfy_sdk_flutter - sha256: de34db373c3fdd5e93b5dc1f0cd70740a7a80bfbd2a390dedf7f0afe5738593e + sha256: "26d72aa9a0d5dc3c315a9e77abc7c8bea6f2ca53d72bcb2a34303cf169ca2187" url: "https://pub.dev" source: hosted - version: "2.6.0" + version: "2.5.3" image: dependency: transitive description: name: image - sha256: "8346ad4b5173924b5ddddab782fc7d8a6300178c8b1dc427775405a01701c4a6" + sha256: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d url: "https://pub.dev" source: hosted - version: "4.5.2" + version: "4.3.0" infinite_scroll_pagination: dependency: "direct main" description: @@ -855,10 +798,10 @@ packages: dependency: transitive description: name: io - sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b + sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "1.0.4" js: dependency: transitive description: @@ -875,22 +818,22 @@ packages: url: "https://pub.dev" source: hosted version: "4.9.0" - json_schema: + json_schema2: dependency: transitive description: - name: json_schema - sha256: b183ba828374365a89b81246c06a9a636935897d509cd846998bbc0d9bd0a2cf + name: json_schema2 + sha256: "094e60d3605333c0816eeb2e5310b4f71ffaea2c0abc026b27418c1ac41a5db3" url: "https://pub.dev" source: hosted - version: "5.2.0" + version: "2.0.4+9" just_audio: dependency: transitive description: name: just_audio - sha256: "1a1eb86e7d81e69a1d36943f2b3efd62dece3dad2cafd9ec2e62e6db7c04d9b7" + sha256: b41646a8241688f1d99c2e69c4da2bb26aa4b3a99795f6ff205c2a165e033fda url: "https://pub.dev" source: hosted - version: "0.9.43" + version: "0.9.41" just_audio_platform_interface: dependency: transitive description: @@ -903,26 +846,26 @@ packages: dependency: transitive description: name: just_audio_web - sha256: "9a98035b8b24b40749507687520ec5ab404e291d2b0937823ff45d92cb18d448" + sha256: "0edb481ad4aa1ff38f8c40f1a3576013c3420bf6669b686fe661627d49bc606c" url: "https://pub.dev" source: hosted - version: "0.4.13" + version: "0.4.11" leak_tracker: dependency: transitive description: name: leak_tracker - sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" url: "https://pub.dev" source: hosted - version: "10.0.7" + version: "10.0.4" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" url: "https://pub.dev" source: hosted - version: "3.0.8" + version: "3.0.3" leak_tracker_testing: dependency: transitive description: @@ -935,10 +878,10 @@ packages: dependency: transitive description: name: lints - sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 + sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" url: "https://pub.dev" source: hosted - version: "5.1.1" + version: "2.1.1" local_auth: dependency: "direct main" description: @@ -951,34 +894,26 @@ packages: dependency: "direct main" description: name: logger - sha256: be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1 + sha256: "697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32" url: "https://pub.dev" source: hosted - version: "2.5.0" + version: "2.4.0" logging: dependency: transitive description: name: logging - sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 + sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.2.0" lottie: dependency: "direct main" description: name: lottie - sha256: c5fa04a80a620066c15cf19cc44773e19e9b38e989ff23ea32e5903ef1015950 - url: "https://pub.dev" - source: hosted - version: "3.3.1" - macros: - dependency: transitive - description: - name: macros - sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656" + sha256: "6a24ade5d3d918c306bb1c21a6b9a04aab0489d51a2582522eea820b4093b62b" url: "https://pub.dev" source: hosted - version: "0.1.3-main.0" + version: "3.1.2" matcher: dependency: transitive description: @@ -991,10 +926,10 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.11.1" + version: "0.8.0" merlin: dependency: transitive description: @@ -1007,26 +942,26 @@ packages: dependency: transitive description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.12.0" mime: dependency: transitive description: name: mime - sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" + sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a" url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "1.0.6" moment_dart: dependency: transitive description: name: moment_dart - sha256: "35b99c62689613e84880dac9d0e81d1a624e4edbdf79897cdb3d444e964bf25b" + sha256: "721f008251341578a818140afe402be827bc29951846575598426f4039a0799b" url: "https://pub.dev" source: hosted - version: "3.2.1" + version: "2.2.1+beta.0" mutex: dependency: "direct main" description: @@ -1055,34 +990,34 @@ packages: dependency: "direct main" description: name: open_filex - sha256: dcb7bd3d32db8db5260253a62f1564c02c2c8df64bc0187cd213f65f827519bd + sha256: ba425ea49affd0a98a234aa9344b9ea5d4c4f7625a1377961eae9fe194c3d523 url: "https://pub.dev" source: hosted - version: "4.6.0" + version: "4.5.0" package_config: dependency: transitive description: name: package_config - sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67" + sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.0" package_info_plus: dependency: "direct main" description: name: package_info_plus - sha256: "739e0a5c3c4055152520fa321d0645ee98e932718b4c8efeeb51451968fe0790" + sha256: "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017" url: "https://pub.dev" source: hosted - version: "8.1.3" + version: "4.2.0" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b + sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6" url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "2.0.1" path: dependency: transitive description: @@ -1095,34 +1030,34 @@ packages: dependency: transitive description: name: path_parsing - sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca" + sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.0.1" path_provider: dependency: "direct main" description: name: path_provider - sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd" + sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378 url: "https://pub.dev" source: hosted - version: "2.1.5" + version: "2.1.4" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2" + sha256: "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7" url: "https://pub.dev" source: hosted - version: "2.2.15" + version: "2.2.10" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942" + sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16 url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.0" path_provider_linux: dependency: transitive description: @@ -1159,50 +1094,42 @@ packages: dependency: "direct main" description: name: permission_handler - sha256: "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb" + sha256: bc56bfe9d3f44c3c612d8d393bd9b174eb796d706759f9b495ac254e4294baa5 url: "https://pub.dev" source: hosted - version: "11.3.1" + version: "10.4.5" permission_handler_android: dependency: transitive description: name: permission_handler_android - sha256: "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1" + sha256: "59c6322171c29df93a22d150ad95f3aa19ed86542eaec409ab2691b8f35f9a47" url: "https://pub.dev" source: hosted - version: "12.0.13" + version: "10.3.6" permission_handler_apple: dependency: transitive description: name: permission_handler_apple - sha256: e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0 - url: "https://pub.dev" - source: hosted - version: "9.4.5" - permission_handler_html: - dependency: transitive - description: - name: permission_handler_html - sha256: "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24" + sha256: "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5" url: "https://pub.dev" source: hosted - version: "0.1.3+5" + version: "9.1.4" permission_handler_platform_interface: dependency: transitive description: name: permission_handler_platform_interface - sha256: e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9 + sha256: "6760eb5ef34589224771010805bea6054ad28453906936f843a8cc4d3a55c4a4" url: "https://pub.dev" source: hosted - version: "4.2.3" + version: "3.12.0" permission_handler_windows: dependency: transitive description: name: permission_handler_windows - sha256: "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e" + sha256: cc074aace208760f1eee6aa4fae766b45d947df85bc831cde77009cdb4720098 url: "https://pub.dev" source: hosted - version: "0.2.1" + version: "0.1.3" petitparser: dependency: transitive description: @@ -1223,18 +1150,18 @@ packages: dependency: "direct main" description: name: pinput - sha256: "8a73be426a91fefec90a7f130763ca39772d547e92f19a827cf4aa02e323d35a" + sha256: a92b55ecf9c25d1b9e100af45905385d5bc34fc9b6b04177a9e82cb88fe4d805 url: "https://pub.dev" source: hosted - version: "5.0.1" + version: "3.0.1" platform: dependency: transitive description: name: platform - sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" + sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65" url: "https://pub.dev" source: hosted - version: "3.1.6" + version: "3.1.5" plugin_platform_interface: dependency: transitive description: @@ -1255,34 +1182,34 @@ packages: dependency: transitive description: name: polkadart - sha256: "46604b1c6fb4f35b564194e51c53a9a77a15291671db6cfbed9fb188831b8560" + sha256: "55b40e205ea4227c97fdfc8dce1783d862ddcce0b097bae6327e3835017ce9bd" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.4.7" polkadart_cli: dependency: transitive description: name: polkadart_cli - sha256: ea16dc9eef662fed6c330f357b38402bc1fd2b862b4e47bf1f9d84c48fa3135b + sha256: a332ccdda670e634e266d4e38b4aba7c52cbc37a32ed037af40b37b3e6dd3c8d url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.4.3" polkadart_keyring: dependency: transitive description: name: polkadart_keyring - sha256: bed5af744e801e88bf7d067ea477fc7eb0a5955801491a8b3e57b578d9de8bea + sha256: "482260a119110ef21f8d66e69ae8c2716afab974247391535d1b02dee613f9e9" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.4.4" polkadart_scale_codec: dependency: transitive description: name: polkadart_scale_codec - sha256: a9b295ddbd8ace501066800ab521575095464f324cb4185be386bd78ee9316d0 + sha256: "0bc6700e93af2dd054db413837433b8383aae095348282d7837583da3e621978" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.2.1" pool: dependency: transitive description: @@ -1291,14 +1218,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.5.1" - posix: - dependency: transitive - description: - name: posix - sha256: a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a - url: "https://pub.dev" - source: hosted - version: "6.0.1" provider: dependency: transitive description: @@ -1311,18 +1230,18 @@ packages: dependency: transitive description: name: pub_semver - sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd" + sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" url: "https://pub.dev" source: hosted - version: "2.1.5" + version: "2.1.4" pubspec_parse: dependency: transitive description: name: pubspec_parse - sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082" + sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8 url: "https://pub.dev" source: hosted - version: "1.5.0" + version: "1.3.0" qr: dependency: transitive description: @@ -1331,6 +1250,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.2" + qr_code_scanner: + dependency: "direct main" + description: + name: qr_code_scanner + sha256: f23b68d893505a424f0bd2e324ebea71ed88465d572d26bb8d2e78a4749591fd + url: "https://pub.dev" + source: hosted + version: "1.0.1" qr_flutter: dependency: "direct main" description: @@ -1367,18 +1294,18 @@ packages: dependency: transitive description: name: reflectable - sha256: "35ee17c3b759fa935cc7e9247445903384520fd174e0d6c142d8288e5439fd5b" + sha256: cdc1a278a2e9769abafaf9ba54ce1fd3432b2a38360e14b87ea6344f715340de url: "https://pub.dev" source: hosted - version: "4.0.12" - rfc_6901: + version: "4.0.6" + rest_client: dependency: transitive description: - name: rfc_6901 - sha256: df1bbfa3d023009598f19636d6114c6ac1e0b7bb7bf6a260f0e6e6ce91416820 + name: rest_client + sha256: "90473416250779b85f8d620e9dc277f38ea67acf84d3c6299e005ce08caedd69" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "2.4.0" ristretto255: dependency: transitive description: @@ -1391,98 +1318,98 @@ packages: dependency: transitive description: name: riverpod - sha256: "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959" + sha256: f21b32ffd26a36555e501b04f4a5dca43ed59e16343f1a30c13632b2351dfa4d url: "https://pub.dev" source: hosted - version: "2.6.1" + version: "2.5.1" rxdart: dependency: transitive description: name: rxdart - sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962" + sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb" url: "https://pub.dev" source: hosted - version: "0.28.0" + version: "0.27.7" screen_brightness: dependency: "direct main" description: name: screen_brightness - sha256: "99b898dae860ebe55fc872d8e300c6eafff3ee4ccb09301b90adb3f241f29874" + sha256: "7d4ac84ae26b37c01d6f5db7123a72db7933e1f2a2a8c369a51e08f81b3178d8" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "1.0.1" screen_brightness_android: dependency: transitive description: name: screen_brightness_android - sha256: ff9141bed547db02233e7dd88f990ab01973a0c8a8c04ddb855c7b072f33409a + sha256: "8c69d3ac475e4d625e7fa682a3a51a69ff59abe5b4a9e57f6ec7d830a6c69bd6" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "1.0.1" screen_brightness_ios: dependency: transitive description: name: screen_brightness_ios - sha256: bfd9bfd0ac852e7aa170e7e356cc27195b2a75037b72c8c6336cf6fb2115cffb + sha256: f08f70ca1ac3e30719764b5cfb8b3fe1e28163065018a41b3e6f243ab146c2f1 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "1.0.1" screen_brightness_macos: dependency: transitive description: name: screen_brightness_macos - sha256: "4edf330ad21078686d8bfaf89413325fbaf571dcebe1e89254d675a3f288b5b9" + sha256: "70c2efa4534e22b927e82693488f127dd4a0f008469fccf4f0eefe9061bbdd6a" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "1.0.1" screen_brightness_platform_interface: dependency: transitive description: name: screen_brightness_platform_interface - sha256: "737bd47b57746bc4291cab1b8a5843ee881af499514881b0247ec77447ee769c" + sha256: "9f3ebf7f22d5487e7676fe9ddaf3fc55b6ff8057707cf6dc0121c7dfda346a16" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "1.0.1" screen_brightness_windows: dependency: transitive description: name: screen_brightness_windows - sha256: d3518bf0f5d7a884cee2c14449ae0b36803802866de09f7ef74077874b6b2448 + sha256: c8e12a91cf6dd912a48bd41fcf749282a51afa17f536c3460d8d05702fb89ffa url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "1.0.1" secp256k1_ecdsa: dependency: transitive description: name: secp256k1_ecdsa - sha256: "8d516e3f9ad716e721a4e961b890bb03bf3c68ba51bca256a617a055e3c7ef89" + sha256: "7e731f4039f44d8e416a193db449f80c67a69ab6933a4970eb6ac7a91e1ca7b2" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.4.1" shared_preferences: dependency: "direct main" description: name: shared_preferences - sha256: a752ce92ea7540fc35a0d19722816e04d0e72828a4200e83a98cf1a1eb524c9a + sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180 url: "https://pub.dev" source: hosted - version: "2.3.5" + version: "2.2.3" shared_preferences_android: - dependency: transitive + dependency: "direct overridden" description: name: shared_preferences_android - sha256: "138b7bbbc7f59c56236e426c37afb8f78cbc57b094ac64c440e0bb90e380a4f5" + sha256: "853801ce6ba7429ec4e923e37317f32a57c903de50b8c33ffcfbdb7e6f0dd39c" url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.0.12" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - sha256: "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03" + sha256: "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d" url: "https://pub.dev" source: hosted - version: "2.5.4" + version: "2.5.3" shared_preferences_linux: dependency: transitive description: @@ -1519,24 +1446,24 @@ packages: dependency: transitive description: name: shelf - sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12 + sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4 url: "https://pub.dev" source: hosted - version: "1.4.2" + version: "1.4.1" shelf_web_socket: dependency: transitive description: name: shelf_web_socket - sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67 + sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.0.0" signer: dependency: transitive description: path: "packages/signer" - ref: development_upgrade - resolved-ref: f0e49c35e14ef6644fb3fc39e2737264c99d8101 + ref: main + resolved-ref: "68d4fda0ded7fbc3d6e9a594ebbf0ea7ff3b48b6" url: "https://github.com/threefoldtech/tfgrid-sdk-dart.git" source: git version: "0.1.0" @@ -1544,7 +1471,7 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.0" + version: "0.0.99" sliver_tools: dependency: transitive description: @@ -1553,6 +1480,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.2.12" + smart_auth: + dependency: transitive + description: + name: smart_auth + sha256: a25229b38c02f733d0a4e98d941b42bed91a976cb589e934895e60ccfa674cf6 + url: "https://pub.dev" + source: hosted + version: "1.1.1" smooth_page_indicator: dependency: "direct main" description: @@ -1565,34 +1500,34 @@ packages: dependency: "direct main" description: name: socket_io_client - sha256: "180fdbc7685e32a849511bbf8b1c7bcc46ab0ff116f7024aa204b425bb3a1ffe" + sha256: "64bd271703db3682d4195dd813c555413d21a49bbaef7c3ed38932fd2a209a10" url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "1.0.2" socket_io_common: dependency: transitive description: name: socket_io_common - sha256: a914df90f25003fea62dbd0b186d98b745b1b72c16be87418e15a2511d25dadb + sha256: "469c7e6bb0c8d571a5158c1352112654f03aedc2f0a246533e1cbdb41efa4937" url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "1.0.1" sodium: dependency: transitive description: name: sodium - sha256: "93d7c8d9af1f57cbd1ddeeb815902d3e0c1e1c8579a78cf229bcd97e1714f061" + sha256: d9830a388e37c82891888e64cfd4c6764fa3ac716bed80ac6eab89ee42c3cd76 url: "https://pub.dev" source: hosted - version: "3.4.4" + version: "2.3.1+1" sodium_libs: dependency: "direct main" description: name: sodium_libs - sha256: "4e5d96a7805369dd51b24975a9072c51433466ae5716a33cff70316a14d97af9" + sha256: aa764acd6ccc6113e119c2d99471aeeb4637a9a501639549b297d3a143ff49b3 url: "https://pub.dev" source: hosted - version: "3.4.3+1" + version: "2.2.1+6" source_span: dependency: transitive description: @@ -1613,66 +1548,42 @@ packages: dependency: transitive description: name: sqflite - sha256: "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb" - url: "https://pub.dev" - source: hosted - version: "2.4.1" - sqflite_android: - dependency: transitive - description: - name: sqflite_android - sha256: "78f489aab276260cdd26676d2169446c7ecd3484bbd5fead4ca14f3ed4dd9ee3" + sha256: a9016f495c927cb90557c909ff26a6d92d9bd54fc42ba92e19d4e79d61e798c6 url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.3.2" sqflite_common: dependency: transitive description: name: sqflite_common - sha256: "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709" - url: "https://pub.dev" - source: hosted - version: "2.5.4+6" - sqflite_darwin: - dependency: transitive - description: - name: sqflite_darwin - sha256: "22adfd9a2c7d634041e96d6241e6e1c8138ca6817018afc5d443fef91dcefa9c" + sha256: "28d8c66baee4968519fb8bd6cdbedad982d6e53359091f0b74544a9f32ec72d5" url: "https://pub.dev" source: hosted - version: "2.4.1+1" - sqflite_platform_interface: - dependency: transitive - description: - name: sqflite_platform_interface - sha256: "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920" - url: "https://pub.dev" - source: hosted - version: "2.4.0" + version: "2.5.3" sr25519: dependency: transitive description: name: sr25519 - sha256: d10247ff98330efb658042357c8c7fc46074c3c160ea16d3dcdfedf8a9a87b60 + sha256: "351a42deaf7656690fb3e09568701a13c1813229cee15a21a5ca1b322246c24d" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.4.1" ss58: dependency: transitive description: name: ss58 - sha256: "74dce6fbfbac9dba5f87b8f104ed2b7253c6aeac39d508f088044cf4827d9cd7" + sha256: "5c2f4be38fb657a4e1aa03a712871c3a8aeea734ebdd77f6a67e4a39cf36647a" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.1.3" stack_trace: dependency: transitive description: name: stack_trace - sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.11.1" state_notifier: dependency: transitive description: @@ -1684,18 +1595,20 @@ packages: stellar_client: dependency: "direct main" description: - path: "../../../codescalers/tfgrid-sdk-dart/packages/stellar_client" - relative: true - source: path + path: "packages/stellar_client" + ref: development + resolved-ref: "2f7f0a8e729c87dc0ab9a973e1eac42b7686bc1c" + url: "https://github.com/threefoldtech/tfgrid-sdk-dart" + source: git version: "0.1.0" stellar_flutter_sdk: dependency: "direct main" description: name: stellar_flutter_sdk - sha256: dac5c9d4874ec8bb93541328718870a683dfb74d5f31c411f39b85e14cd70e79 + sha256: a25506529d40a040227cd565de6e1b4cc0a9ffc756472cf3c43420512e8a269b url: "https://pub.dev" source: hosted - version: "1.9.2" + version: "1.8.9" stream_channel: dependency: transitive description: @@ -1708,18 +1621,18 @@ packages: dependency: transitive description: name: stream_transform - sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871 + sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner - sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.2.0" strobe: dependency: transitive description: @@ -1732,26 +1645,26 @@ packages: dependency: transitive description: name: substrate_bip39 - sha256: "6680dc10eb4f165659374eec5c5aa75920e720b3c00b65490e1dfe3d5ea5a52d" + sha256: fa950b80b92b7fc96f13683033fe974cdfd3ee0d30d989f6b8f3fcbfe6021ac2 url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.4.1" substrate_metadata: dependency: transitive description: name: substrate_metadata - sha256: "878bf0e818eed4543f0c9af303b8ffe201cb69bf56c32d717f1bdef88e691836" + sha256: ed6511dcca9dae3b10d525a6b8c1688e4eda0ab27bed0bbdfc31bc31bf34b441 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.2.2" synchronized: dependency: transitive description: name: synchronized - sha256: "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225" + sha256: "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558" url: "https://pub.dev" source: hosted - version: "3.3.0+3" + version: "3.1.0+1" term_glyph: dependency: transitive description: @@ -1764,16 +1677,18 @@ packages: dependency: transitive description: name: test_api - sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.7.3" + version: "0.7.0" tfchain_client: dependency: "direct main" description: - path: "../../../codescalers/tfgrid-sdk-dart/packages/tfchain_client" - relative: true - source: path + path: "packages/tfchain_client" + ref: development + resolved-ref: a66b92b9947cbc6ce7adf289f4321153ac42b936 + url: "https://github.com/threefoldtech/tfgrid-sdk-dart" + source: git version: "0.1.0" timeago: dependency: "direct main" @@ -1787,10 +1702,10 @@ packages: dependency: transitive description: name: timing - sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe" + sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32" url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.0.1" toml: dependency: transitive description: @@ -1803,10 +1718,10 @@ packages: dependency: transitive description: name: typed_data - sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c url: "https://pub.dev" source: hosted - version: "1.4.0" + version: "1.3.2" uni_links: dependency: "direct main" description: @@ -1848,7 +1763,7 @@ packages: source: hosted version: "1.1.0" unorm_dart: - dependency: transitive + dependency: "direct overridden" description: name: unorm_dart sha256: "23d8bf65605401a6a32cff99435fed66ef3dab3ddcad3454059165df46496a3b" @@ -1875,34 +1790,34 @@ packages: dependency: transitive description: name: url_launcher_android - sha256: "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193" + sha256: f0c73347dfcfa5b3db8bc06e1502668265d39c08f310c29bff4e28eea9699f79 url: "https://pub.dev" source: hosted - version: "6.3.14" + version: "6.3.9" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626" + sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e url: "https://pub.dev" source: hosted - version: "6.3.2" + version: "6.3.1" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - sha256: "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935" + sha256: e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af url: "https://pub.dev" source: hosted - version: "3.2.1" + version: "3.2.0" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - sha256: "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2" + sha256: "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672" url: "https://pub.dev" source: hosted - version: "3.2.2" + version: "3.2.1" url_launcher_platform_interface: dependency: transitive description: @@ -1915,18 +1830,18 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9" + sha256: "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.3.3" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - sha256: "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77" + sha256: "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185" url: "https://pub.dev" source: hosted - version: "3.1.4" + version: "3.1.2" utility: dependency: transitive description: @@ -1955,26 +1870,26 @@ packages: dependency: transitive description: name: vector_graphics - sha256: "27d5fefe86fb9aace4a9f8375b56b3c292b64d8c04510df230f849850d912cb7" + sha256: "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3" url: "https://pub.dev" source: hosted - version: "1.1.15" + version: "1.1.11+1" vector_graphics_codec: dependency: transitive description: name: vector_graphics_codec - sha256: "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146" + sha256: c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da url: "https://pub.dev" source: hosted - version: "1.1.13" + version: "1.1.11+1" vector_graphics_compiler: dependency: transitive description: name: vector_graphics_compiler - sha256: "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad" + sha256: "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81" url: "https://pub.dev" source: hosted - version: "1.1.16" + version: "1.1.11+1" vector_math: dependency: transitive description: @@ -1995,18 +1910,18 @@ packages: dependency: transitive description: name: video_player_android - sha256: "7018dbcb395e2bca0b9a898e73989e67c0c4a5db269528e1b036ca38bcca0d0b" + sha256: e343701aa890b74a863fa460f5c0e628127ed06a975d7d9af6b697133fb25bdf url: "https://pub.dev" source: hosted - version: "2.7.17" + version: "2.7.1" video_player_avfoundation: dependency: transitive description: name: video_player_avfoundation - sha256: "8a4e73a3faf2b13512978a43cf1cdda66feeeb900a0527f1fbfd7b19cf3458d3" + sha256: cd5ab8a8bc0eab65ab0cea40304097edc46da574c8c1ecdee96f28cd8ef3792f url: "https://pub.dev" source: hosted - version: "2.6.7" + version: "2.6.2" video_player_platform_interface: dependency: transitive description: @@ -2019,74 +1934,74 @@ packages: dependency: transitive description: name: video_player_web - sha256: "881b375a934d8ebf868c7fb1423b2bfaa393a0a265fa3f733079a86536064a10" + sha256: "8e9cb7fe94e49490e67bbc15149691792b58a0ade31b32e3f3688d104a0e057b" url: "https://pub.dev" source: hosted - version: "2.3.3" + version: "2.2.0" vm_service: dependency: transitive description: name: vm_service - sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" url: "https://pub.dev" source: hosted - version: "14.3.0" + version: "14.2.1" wakelock_plus: dependency: transitive description: name: wakelock_plus - sha256: "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e" + sha256: f268ca2116db22e57577fb99d52515a24bdc1d570f12ac18bb762361d43b043d url: "https://pub.dev" source: hosted - version: "1.2.10" + version: "1.1.4" wakelock_plus_platform_interface: dependency: transitive description: name: wakelock_plus_platform_interface - sha256: "70e780bc99796e1db82fe764b1e7dcb89a86f1e5b3afb1db354de50f2e41eb7a" + sha256: "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16" url: "https://pub.dev" source: hosted - version: "1.2.2" + version: "1.2.1" watcher: dependency: transitive description: name: watcher - sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104" + sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.0" web: dependency: transitive description: name: web - sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb + sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "0.5.1" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b + sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.4.5" webview_flutter: dependency: "direct main" description: name: webview_flutter - sha256: "889a0a678e7c793c308c68739996227c9661590605e70b1f6cf6b9a6634f7aec" + sha256: "6869c8786d179f929144b4a1f86e09ac0eddfe475984951ea6c634774c16b522" url: "https://pub.dev" source: hosted - version: "4.10.0" + version: "4.8.0" webview_flutter_android: dependency: transitive description: name: webview_flutter_android - sha256: "5568f17a9c25c0fdd0737900fa1c2d1fee2d780bc212d9aec10c2d1f48ef0f59" + sha256: ed021f27ae621bc97a6019fb601ab16331a3db4bf8afa305e9f6689bdb3edced url: "https://pub.dev" source: hosted - version: "4.3.1" + version: "3.16.8" webview_flutter_platform_interface: dependency: transitive description: @@ -2099,18 +2014,18 @@ packages: dependency: transitive description: name: webview_flutter_wkwebview - sha256: "4adc14ea9a770cc9e2c8f1ac734536bd40e82615bd0fa6b94be10982de656cc7" + sha256: "9c62cc46fa4f2d41e10ab81014c1de470a6c6f26051a2de32111b2ee55287feb" url: "https://pub.dev" source: hosted - version: "3.17.0" + version: "3.14.0" win32: dependency: transitive description: name: win32 - sha256: "154360849a56b7b67331c21f09a386562d88903f90a1099c5987afc1912e1f29" + sha256: "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a" url: "https://pub.dev" source: hosted - version: "5.10.0" + version: "5.5.4" win32_registry: dependency: transitive description: @@ -2139,18 +2054,26 @@ packages: dependency: "direct main" description: name: xml2json - sha256: "9ff65c144a48f7f73d2bd6d919700c7697beced3b51216b982f78c68bc0da142" + sha256: "52b7c8d350fdce09545b058982c26689ee89f1eb188cc9910d585665bfe27bc0" url: "https://pub.dev" source: hosted - version: "6.2.6" + version: "6.2.3" yaml: dependency: transitive description: name: yaml - sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce + sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + url: "https://pub.dev" + source: hosted + version: "3.1.2" + yaon: + dependency: transitive + description: + name: yaon + sha256: "7ffb8284eb13e448fdabf340209c306336cfeabdca97294c27b5a11237eaa3c4" url: "https://pub.dev" source: hosted - version: "3.1.3" + version: "1.1.4+10" sdks: - dart: ">=3.6.0 <4.0.0" - flutter: ">=3.27.0" + dart: ">=3.4.0 <4.0.0" + flutter: ">=3.22.0" diff --git a/app/pubspec.yaml b/app/pubspec.yaml index 0108ac0a8..40142eaea 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -31,60 +31,60 @@ dependencies: url: https://github.com/threefoldtech/tfgrid-sdk-dart ref: main path: packages/gridproxy_client - flutter_svg: ^2.0.17 + flutter_svg: ^2.0.6 bip39: ^1.0.6 - socket_io_client: ^3.0.2 + socket_io_client: ^1.0.2 local_auth: 1.1.7 - url_launcher: ^6.3.1 - shared_preferences: ^2.3.5 - http: ^1.3.0 - package_info_plus: ^8.1.3 - cupertino_icons: ^1.0.8 - google_fonts: ^6.2.1 - intl_phone_field: ^3.2.0 - flagsmith: ^6.0.0 - flutter_inappwebview: ^6.1.5 - sodium_libs: ^3.4.3+1 + url_launcher: ^6.0.10 + shared_preferences: ^2.0.7 + http: ^1.0.0 + package_info_plus: ^4.0.2 + cupertino_icons: ^1.0.4 + google_fonts: ^5.0.0 + intl_phone_field: ^3.1.0 + flagsmith: ^3.1.0 + flutter_inappwebview: ^5.3.2 + sodium_libs: ^2.1.0+1 uni_links: ^0.5.1 pbkdf2ns: ^0.0.2 - # qr_code_scanner: ^1.0.1 + qr_code_scanner: ^1.0.1 flutter_json_viewer: ^1.0.1 - device_info_plus: ^11.2.1 - permission_handler: ^11.3.1 - path_provider: ^2.1.5 - dio: ^5.7.0 - open_filex: ^4.6.0 - country_picker: ^2.0.27 + device_info_plus: ^9.0.2 + permission_handler: ^10.2.0 + path_provider: ^2.0.2 + dio: ^5.0.0 + open_filex: ^4.3.2 + country_picker: ^2.0.20 pinenacl: ^0.6.0 - pinput: ^5.0.1 - build_runner: ^2.4.13 + pinput: 3.0.1 + build_runner: ^2.4.9 smooth_page_indicator: ^1.2.0+3 - webview_flutter: ^4.10.0 + webview_flutter: ^4.8.0 qr_flutter: ^4.1.0 - screen_brightness: ^2.1.1 + screen_brightness: ^1.0.1 validators: ^3.0.0 - lottie: ^3.3.1 - crisp_chat: ^2.2.3 - xml2json: ^6.2.6 + lottie: ^3.1.2 + crisp_chat: 2.0.3 + xml2json: ^6.2.3 timeago: ^3.7.0 - flutter_widget_from_html: ^0.15.3 - idenfy_sdk_flutter: ^2.6.0 - flutter_riverpod: ^2.6.1 + flutter_widget_from_html: ^0.15.2 + idenfy_sdk_flutter: 2.5.3 + flutter_riverpod: 2.5.1 - convert: ^3.1.2 - crypto: ^3.0.6 - hashlib: ^1.21.1 - stellar_flutter_sdk: ^1.9.2 - flutter_launcher_icons: ^0.14.3 - logger: ^2.5.0 + convert: any + crypto: any + hashlib: any + stellar_flutter_sdk: ^1.8.9 + flutter_launcher_icons: ^0.14.1 + logger: ^2.4.0 flutter_keyboard_visibility: ^6.0.0 mutex: ^3.1.0 - decimal: ^3.2.1 + decimal: ^3.1.0 infinite_scroll_pagination: ^4.1.0 dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^5.0.0 + flutter_lints: ^2.0.0 dependency_overrides: intl: ^0.19.0 From 816f8542f542a97cede3f4ae374f0af1e5463741 Mon Sep 17 00:00:00 2001 From: ahmedhanafy725 Date: Wed, 22 Jan 2025 11:52:46 +0200 Subject: [PATCH 05/17] Upgrade dependencies --- app/pubspec.lock | 575 +++++++++++++++++++++++++++-------------------- app/pubspec.yaml | 74 +++--- 2 files changed, 363 insertions(+), 286 deletions(-) diff --git a/app/pubspec.lock b/app/pubspec.lock index c7563e953..669fc987d 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -5,10 +5,15 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7" + sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab" url: "https://pub.dev" source: hosted - version: "67.0.0" + version: "76.0.0" + _macros: + dependency: transitive + description: dart + source: sdk + version: "0.3.3" adaptive_number: dependency: transitive description: @@ -21,26 +26,26 @@ packages: dependency: transitive description: name: analyzer - sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d" + sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e" url: "https://pub.dev" source: hosted - version: "6.4.1" + version: "6.11.0" archive: dependency: transitive description: name: archive - sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d + sha256: "6199c74e3db4fbfbd04f66d739e72fe11c8a8957d5f219f1f4482dbde6420b5a" url: "https://pub.dev" source: hosted - version: "3.6.1" + version: "4.0.2" args: dependency: transitive description: name: args - sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a" + sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 url: "https://pub.dev" source: hosted - version: "2.5.0" + version: "2.6.0" asn1lib: dependency: transitive description: @@ -85,10 +90,10 @@ packages: dependency: transitive description: name: bip39_mnemonic - sha256: "24855a62fb9dd930f697063a274e084b0a574e1cc55ec270ca4756f579ab512c" + sha256: "3ae6ed74b97a0b820e71d01b75ac4bc5b036a8bb427d5ee5827427d2872eefb0" url: "https://pub.dev" source: hosted - version: "3.0.6" + version: "3.0.7" boolean_selector: dependency: transitive description: @@ -133,10 +138,10 @@ packages: dependency: "direct main" description: name: build_runner - sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7" + sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d" url: "https://pub.dev" source: hosted - version: "2.4.11" + version: "2.4.13" build_runner_core: dependency: transitive description: @@ -237,42 +242,42 @@ packages: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.0" convert: dependency: "direct main" description: name: convert - sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" country_picker: dependency: "direct main" description: name: country_picker - sha256: "327f5e15a76352089a6b5057abb761ee5202e7516c9440d8d6a7524139f9b14e" + sha256: "9b14c04f9a35e99f6de6bcbc453a556bb98345aecb481c7a0e843c94c2bee1f8" url: "https://pub.dev" source: hosted - version: "2.0.26" + version: "2.0.27" crisp_chat: dependency: "direct main" description: name: crisp_chat - sha256: "7ef5ee1ab811d7797e1aa723d20f69a976e10114a58bf21c3f80936c5787827e" + sha256: febd2412b87df213718d6d0308d72edc0a8638e07f6b89e3895e83785ffd092b url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "2.2.3" crypto: dependency: "direct main" description: name: crypto - sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27 + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.6" cryptography: dependency: transitive description: @@ -285,10 +290,10 @@ packages: dependency: transitive description: name: csslib - sha256: "831883fb353c8bdc1d71979e5b342c7d88acfbc643113c14ae51e2442ea0f20f" + sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e" url: "https://pub.dev" source: hosted - version: "0.17.3" + version: "1.0.2" cupertino_icons: dependency: "direct main" description: @@ -317,26 +322,26 @@ packages: dependency: "direct main" description: name: decimal - sha256: da8f65df568345f2738cc8b0de74971c86d2d93ce5fc8c4ec094f6b7c5d48eb5 + sha256: "28239b8b929c1bd8618702e6dbc96e2618cf99770bbe9cb040d6cf56a11e4ec3" url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.2.1" device_info_plus: dependency: "direct main" description: name: device_info_plus - sha256: "77f757b789ff68e4eaf9c56d1752309bd9f7ad557cb105b938a7f8eb89e59110" + sha256: b37d37c2f912ad4e8ec694187de87d05de2a3cb82b465ff1f65f65a2d05de544 url: "https://pub.dev" source: hosted - version: "9.1.2" + version: "11.2.1" device_info_plus_platform_interface: dependency: transitive description: name: device_info_plus_platform_interface - sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba" + sha256: "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2" url: "https://pub.dev" source: hosted - version: "7.0.1" + version: "7.0.2" dio: dependency: "direct main" description: @@ -421,18 +426,10 @@ packages: dependency: "direct main" description: name: flagsmith - sha256: "70a166ac4bd8d565bd1005400baa238fe8463763366a5605a87df36cf4c03cae" + sha256: "9c0723c002e8cc2782c382df2f93dcb3a19bde8dd318a5bf568013ee368cb7df" url: "https://pub.dev" source: hosted - version: "3.1.0" - flagsmith_flutter_core: - dependency: transitive - description: - name: flagsmith_flutter_core - sha256: c7fe448040165f9c2448c24d1b2c89745983d71183210131f52d831f3aabf3c9 - url: "https://pub.dev" - source: hosted - version: "2.3.1" + version: "6.0.0" flutter: dependency: "direct main" description: flutter @@ -442,10 +439,18 @@ packages: dependency: transitive description: name: flutter_cache_manager - sha256: "8207f27539deb83732fdda03e259349046a39a4c767269285f449ade355d54ba" + sha256: "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386" url: "https://pub.dev" source: hosted - version: "3.3.1" + version: "3.4.1" + flutter_client_sse: + dependency: transitive + description: + name: flutter_client_sse + sha256: "4ce0297206473dfc064b255fe086713240002e149f52519bd48c21423e4aa5d2" + url: "https://pub.dev" + source: hosted + version: "2.0.3" flutter_curve25519: dependency: transitive description: @@ -458,10 +463,66 @@ packages: dependency: "direct main" description: name: flutter_inappwebview - sha256: d198297060d116b94048301ee6749cd2e7d03c1f2689783f52d210a6b7aba350 + sha256: "80092d13d3e29b6227e25b67973c67c7210bd5e35c4b747ca908e31eb71a46d5" + url: "https://pub.dev" + source: hosted + version: "6.1.5" + flutter_inappwebview_android: + dependency: transitive + description: + name: flutter_inappwebview_android + sha256: "62557c15a5c2db5d195cb3892aab74fcaec266d7b86d59a6f0027abd672cddba" + url: "https://pub.dev" + source: hosted + version: "1.1.3" + flutter_inappwebview_internal_annotations: + dependency: transitive + description: + name: flutter_inappwebview_internal_annotations + sha256: "787171d43f8af67864740b6f04166c13190aa74a1468a1f1f1e9ee5b90c359cd" + url: "https://pub.dev" + source: hosted + version: "1.2.0" + flutter_inappwebview_ios: + dependency: transitive + description: + name: flutter_inappwebview_ios + sha256: "5818cf9b26cf0cbb0f62ff50772217d41ea8d3d9cc00279c45f8aabaa1b4025d" + url: "https://pub.dev" + source: hosted + version: "1.1.2" + flutter_inappwebview_macos: + dependency: transitive + description: + name: flutter_inappwebview_macos + sha256: c1fbb86af1a3738e3541364d7d1866315ffb0468a1a77e34198c9be571287da1 + url: "https://pub.dev" + source: hosted + version: "1.1.2" + flutter_inappwebview_platform_interface: + dependency: transitive + description: + name: flutter_inappwebview_platform_interface + sha256: cf5323e194096b6ede7a1ca808c3e0a078e4b33cc3f6338977d75b4024ba2500 + url: "https://pub.dev" + source: hosted + version: "1.3.0+1" + flutter_inappwebview_web: + dependency: transitive + description: + name: flutter_inappwebview_web + sha256: "55f89c83b0a0d3b7893306b3bb545ba4770a4df018204917148ebb42dc14a598" + url: "https://pub.dev" + source: hosted + version: "1.1.2" + flutter_inappwebview_windows: + dependency: transitive + description: + name: flutter_inappwebview_windows + sha256: "8b4d3a46078a2cdc636c4a3d10d10f2a16882f6be607962dbfff8874d1642055" url: "https://pub.dev" source: hosted - version: "5.8.0" + version: "0.6.0" flutter_json_viewer: dependency: "direct main" description: @@ -522,26 +583,24 @@ packages: dependency: "direct main" description: name: flutter_launcher_icons - sha256: "619817c4b65b322b5104b6bb6dfe6cda62d9729bd7ad4303ecc8b4e690a67a77" + sha256: bfa04787c85d80ecb3f8777bde5fc10c3de809240c48fa061a2c2bf15ea5211c url: "https://pub.dev" source: hosted - version: "0.14.1" + version: "0.14.3" flutter_lints: dependency: "direct dev" description: name: flutter_lints - sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 + sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "5.0.0" flutter_pkid: dependency: "direct main" description: - path: "." - ref: master - resolved-ref: "56cc03e8386a9f0530c3489d8bbbeedecb6f47f9" - url: "https://github.com/threefoldtech/threefold_connect_flutter_pkid_client" - source: git + path: "../../threefold_connect_flutter_pkid_client" + relative: true + source: path version: "0.0.1" flutter_plugin_android_lifecycle: dependency: transitive @@ -555,10 +614,10 @@ packages: dependency: "direct main" description: name: flutter_riverpod - sha256: "0f1974eff5bbe774bf1d870e406fc6f29e3d6f1c46bd9c58e7172ff68a785d7d" + sha256: "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1" url: "https://pub.dev" source: hosted - version: "2.5.1" + version: "2.6.1" flutter_staggered_grid_view: dependency: transitive description: @@ -571,10 +630,10 @@ packages: dependency: "direct main" description: name: flutter_svg - sha256: "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2" + sha256: c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b url: "https://pub.dev" source: hosted - version: "2.0.10+1" + version: "2.0.17" flutter_test: dependency: "direct dev" description: flutter @@ -589,10 +648,10 @@ packages: dependency: "direct main" description: name: flutter_widget_from_html - sha256: "9e2a6201c4d2eb910b6b3ebb2a9f5c490fc61c9a1aa35eafdde38f0fc659cf4c" + sha256: f3967a5b42896662efdd420b5adaf8a7d3692b0f44462a07c80e3b4c173b1a02 url: "https://pub.dev" source: hosted - version: "0.15.2" + version: "0.15.3" flutter_widget_from_html_core: dependency: transitive description: @@ -661,10 +720,10 @@ packages: dependency: transitive description: name: fwfh_webview - sha256: f67890bc0d6278da98bd197469ae9511c859f7db327e92299fe0ea0cf46c4057 + sha256: c0a8b664b642f40f4c252a0ab4e72c22dcd97c7fb3a7e50a6b4bdb6f63afca19 url: "https://pub.dev" source: hosted - version: "0.15.2" + version: "0.15.3" glob: dependency: transitive description: @@ -677,10 +736,10 @@ packages: dependency: "direct main" description: name: google_fonts - sha256: e20ff62b158b96f392bfc8afe29dee1503c94fbea2cbe8186fd59b756b8ae982 + sha256: b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82 url: "https://pub.dev" source: hosted - version: "5.1.0" + version: "6.2.1" graphs: dependency: transitive description: @@ -692,20 +751,18 @@ packages: gridproxy_client: dependency: "direct main" description: - path: "packages/gridproxy_client" - ref: main - resolved-ref: "68d4fda0ded7fbc3d6e9a594ebbf0ea7ff3b48b6" - url: "https://github.com/threefoldtech/tfgrid-sdk-dart" - source: git + path: "../../../codescalers/tfgrid-sdk-dart/packages/gridproxy_client" + relative: true + source: path version: "1.0.0" hashlib: dependency: "direct main" description: name: hashlib - sha256: f572f2abce09fc7aee53f15927052b9732ea1053e540af8cae211111ee0b99b1 + sha256: e13e8237d93fb275cd1c55fc339bb90638994d1a4f140c7ee270173b51f3d169 url: "https://pub.dev" source: hosted - version: "1.21.0" + version: "1.21.1" hashlib_codecs: dependency: transitive description: @@ -726,18 +783,18 @@ packages: dependency: transitive description: name: html - sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a" + sha256: "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec" url: "https://pub.dev" source: hosted - version: "0.15.4" + version: "0.15.5" http: dependency: "direct main" description: name: http - sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938" + sha256: fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" http_multi_server: dependency: transitive description: @@ -758,18 +815,18 @@ packages: dependency: "direct main" description: name: idenfy_sdk_flutter - sha256: "26d72aa9a0d5dc3c315a9e77abc7c8bea6f2ca53d72bcb2a34303cf169ca2187" + sha256: de34db373c3fdd5e93b5dc1f0cd70740a7a80bfbd2a390dedf7f0afe5738593e url: "https://pub.dev" source: hosted - version: "2.5.3" + version: "2.6.0" image: dependency: transitive description: name: image - sha256: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d + sha256: "8346ad4b5173924b5ddddab782fc7d8a6300178c8b1dc427775405a01701c4a6" url: "https://pub.dev" source: hosted - version: "4.3.0" + version: "4.5.2" infinite_scroll_pagination: dependency: "direct main" description: @@ -818,14 +875,14 @@ packages: url: "https://pub.dev" source: hosted version: "4.9.0" - json_schema2: + json_schema: dependency: transitive description: - name: json_schema2 - sha256: "094e60d3605333c0816eeb2e5310b4f71ffaea2c0abc026b27418c1ac41a5db3" + name: json_schema + sha256: b183ba828374365a89b81246c06a9a636935897d509cd846998bbc0d9bd0a2cf url: "https://pub.dev" source: hosted - version: "2.0.4+9" + version: "5.2.0" just_audio: dependency: transitive description: @@ -846,26 +903,26 @@ packages: dependency: transitive description: name: just_audio_web - sha256: "0edb481ad4aa1ff38f8c40f1a3576013c3420bf6669b686fe661627d49bc606c" + sha256: "9a98035b8b24b40749507687520ec5ab404e291d2b0937823ff45d92cb18d448" url: "https://pub.dev" source: hosted - version: "0.4.11" + version: "0.4.13" leak_tracker: dependency: transitive description: name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" url: "https://pub.dev" source: hosted - version: "10.0.4" + version: "10.0.7" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.8" leak_tracker_testing: dependency: transitive description: @@ -878,10 +935,10 @@ packages: dependency: transitive description: name: lints - sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "5.1.1" local_auth: dependency: "direct main" description: @@ -894,10 +951,10 @@ packages: dependency: "direct main" description: name: logger - sha256: "697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32" + sha256: be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1 url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.5.0" logging: dependency: transitive description: @@ -910,10 +967,18 @@ packages: dependency: "direct main" description: name: lottie - sha256: "6a24ade5d3d918c306bb1c21a6b9a04aab0489d51a2582522eea820b4093b62b" + sha256: c5fa04a80a620066c15cf19cc44773e19e9b38e989ff23ea32e5903ef1015950 url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "3.3.1" + macros: + dependency: transitive + description: + name: macros + sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656" + url: "https://pub.dev" + source: hosted + version: "0.1.3-main.0" matcher: dependency: transitive description: @@ -926,10 +991,10 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" merlin: dependency: transitive description: @@ -942,10 +1007,10 @@ packages: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.15.0" mime: dependency: transitive description: @@ -958,10 +1023,10 @@ packages: dependency: transitive description: name: moment_dart - sha256: "721f008251341578a818140afe402be827bc29951846575598426f4039a0799b" + sha256: "35b99c62689613e84880dac9d0e81d1a624e4edbdf79897cdb3d444e964bf25b" url: "https://pub.dev" source: hosted - version: "2.2.1+beta.0" + version: "3.2.1" mutex: dependency: "direct main" description: @@ -990,10 +1055,10 @@ packages: dependency: "direct main" description: name: open_filex - sha256: ba425ea49affd0a98a234aa9344b9ea5d4c4f7625a1377961eae9fe194c3d523 + sha256: dcb7bd3d32db8db5260253a62f1564c02c2c8df64bc0187cd213f65f827519bd url: "https://pub.dev" source: hosted - version: "4.5.0" + version: "4.6.0" package_config: dependency: transitive description: @@ -1006,18 +1071,18 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017" + sha256: "739e0a5c3c4055152520fa321d0645ee98e932718b4c8efeeb51451968fe0790" url: "https://pub.dev" source: hosted - version: "4.2.0" + version: "8.1.3" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6" + sha256: a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.2" path: dependency: transitive description: @@ -1038,10 +1103,10 @@ packages: dependency: "direct main" description: name: path_provider - sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378 + sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.5" path_provider_android: dependency: transitive description: @@ -1094,42 +1159,50 @@ packages: dependency: "direct main" description: name: permission_handler - sha256: bc56bfe9d3f44c3c612d8d393bd9b174eb796d706759f9b495ac254e4294baa5 + sha256: "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb" url: "https://pub.dev" source: hosted - version: "10.4.5" + version: "11.3.1" permission_handler_android: dependency: transitive description: name: permission_handler_android - sha256: "59c6322171c29df93a22d150ad95f3aa19ed86542eaec409ab2691b8f35f9a47" + sha256: "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1" url: "https://pub.dev" source: hosted - version: "10.3.6" + version: "12.0.13" permission_handler_apple: dependency: transitive description: name: permission_handler_apple - sha256: "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5" + sha256: e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0 + url: "https://pub.dev" + source: hosted + version: "9.4.5" + permission_handler_html: + dependency: transitive + description: + name: permission_handler_html + sha256: "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24" url: "https://pub.dev" source: hosted - version: "9.1.4" + version: "0.1.3+5" permission_handler_platform_interface: dependency: transitive description: name: permission_handler_platform_interface - sha256: "6760eb5ef34589224771010805bea6054ad28453906936f843a8cc4d3a55c4a4" + sha256: e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9 url: "https://pub.dev" source: hosted - version: "3.12.0" + version: "4.2.3" permission_handler_windows: dependency: transitive description: name: permission_handler_windows - sha256: cc074aace208760f1eee6aa4fae766b45d947df85bc831cde77009cdb4720098 + sha256: "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e" url: "https://pub.dev" source: hosted - version: "0.1.3" + version: "0.2.1" petitparser: dependency: transitive description: @@ -1150,10 +1223,10 @@ packages: dependency: "direct main" description: name: pinput - sha256: a92b55ecf9c25d1b9e100af45905385d5bc34fc9b6b04177a9e82cb88fe4d805 + sha256: "8a73be426a91fefec90a7f130763ca39772d547e92f19a827cf4aa02e323d35a" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "5.0.1" platform: dependency: transitive description: @@ -1182,34 +1255,34 @@ packages: dependency: transitive description: name: polkadart - sha256: "55b40e205ea4227c97fdfc8dce1783d862ddcce0b097bae6327e3835017ce9bd" + sha256: "46604b1c6fb4f35b564194e51c53a9a77a15291671db6cfbed9fb188831b8560" url: "https://pub.dev" source: hosted - version: "0.4.7" + version: "0.5.0" polkadart_cli: dependency: transitive description: name: polkadart_cli - sha256: a332ccdda670e634e266d4e38b4aba7c52cbc37a32ed037af40b37b3e6dd3c8d + sha256: ea16dc9eef662fed6c330f357b38402bc1fd2b862b4e47bf1f9d84c48fa3135b url: "https://pub.dev" source: hosted - version: "0.4.3" + version: "0.5.0" polkadart_keyring: dependency: transitive description: name: polkadart_keyring - sha256: "482260a119110ef21f8d66e69ae8c2716afab974247391535d1b02dee613f9e9" + sha256: bed5af744e801e88bf7d067ea477fc7eb0a5955801491a8b3e57b578d9de8bea url: "https://pub.dev" source: hosted - version: "0.4.4" + version: "0.5.0" polkadart_scale_codec: dependency: transitive description: name: polkadart_scale_codec - sha256: "0bc6700e93af2dd054db413837433b8383aae095348282d7837583da3e621978" + sha256: a9b295ddbd8ace501066800ab521575095464f324cb4185be386bd78ee9316d0 url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" pool: dependency: transitive description: @@ -1218,6 +1291,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.5.1" + posix: + dependency: transitive + description: + name: posix + sha256: a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a + url: "https://pub.dev" + source: hosted + version: "6.0.1" provider: dependency: transitive description: @@ -1250,14 +1331,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.2" - qr_code_scanner: - dependency: "direct main" - description: - name: qr_code_scanner - sha256: f23b68d893505a424f0bd2e324ebea71ed88465d572d26bb8d2e78a4749591fd - url: "https://pub.dev" - source: hosted - version: "1.0.1" qr_flutter: dependency: "direct main" description: @@ -1294,18 +1367,18 @@ packages: dependency: transitive description: name: reflectable - sha256: cdc1a278a2e9769abafaf9ba54ce1fd3432b2a38360e14b87ea6344f715340de + sha256: "35ee17c3b759fa935cc7e9247445903384520fd174e0d6c142d8288e5439fd5b" url: "https://pub.dev" source: hosted - version: "4.0.6" - rest_client: + version: "4.0.12" + rfc_6901: dependency: transitive description: - name: rest_client - sha256: "90473416250779b85f8d620e9dc277f38ea67acf84d3c6299e005ce08caedd69" + name: rfc_6901 + sha256: df1bbfa3d023009598f19636d6114c6ac1e0b7bb7bf6a260f0e6e6ce91416820 url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "0.2.0" ristretto255: dependency: transitive description: @@ -1318,90 +1391,90 @@ packages: dependency: transitive description: name: riverpod - sha256: f21b32ffd26a36555e501b04f4a5dca43ed59e16343f1a30c13632b2351dfa4d + sha256: "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959" url: "https://pub.dev" source: hosted - version: "2.5.1" + version: "2.6.1" rxdart: dependency: transitive description: name: rxdart - sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb" + sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962" url: "https://pub.dev" source: hosted - version: "0.27.7" + version: "0.28.0" screen_brightness: dependency: "direct main" description: name: screen_brightness - sha256: "7d4ac84ae26b37c01d6f5db7123a72db7933e1f2a2a8c369a51e08f81b3178d8" + sha256: "99b898dae860ebe55fc872d8e300c6eafff3ee4ccb09301b90adb3f241f29874" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.1.1" screen_brightness_android: dependency: transitive description: name: screen_brightness_android - sha256: "8c69d3ac475e4d625e7fa682a3a51a69ff59abe5b4a9e57f6ec7d830a6c69bd6" + sha256: ff9141bed547db02233e7dd88f990ab01973a0c8a8c04ddb855c7b072f33409a url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.1.0" screen_brightness_ios: dependency: transitive description: name: screen_brightness_ios - sha256: f08f70ca1ac3e30719764b5cfb8b3fe1e28163065018a41b3e6f243ab146c2f1 + sha256: bfd9bfd0ac852e7aa170e7e356cc27195b2a75037b72c8c6336cf6fb2115cffb url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.1.1" screen_brightness_macos: dependency: transitive description: name: screen_brightness_macos - sha256: "70c2efa4534e22b927e82693488f127dd4a0f008469fccf4f0eefe9061bbdd6a" + sha256: "4edf330ad21078686d8bfaf89413325fbaf571dcebe1e89254d675a3f288b5b9" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.1.1" screen_brightness_platform_interface: dependency: transitive description: name: screen_brightness_platform_interface - sha256: "9f3ebf7f22d5487e7676fe9ddaf3fc55b6ff8057707cf6dc0121c7dfda346a16" + sha256: "737bd47b57746bc4291cab1b8a5843ee881af499514881b0247ec77447ee769c" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.1.0" screen_brightness_windows: dependency: transitive description: name: screen_brightness_windows - sha256: c8e12a91cf6dd912a48bd41fcf749282a51afa17f536c3460d8d05702fb89ffa + sha256: d3518bf0f5d7a884cee2c14449ae0b36803802866de09f7ef74077874b6b2448 url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.1.0" secp256k1_ecdsa: dependency: transitive description: name: secp256k1_ecdsa - sha256: "7e731f4039f44d8e416a193db449f80c67a69ab6933a4970eb6ac7a91e1ca7b2" + sha256: "8d516e3f9ad716e721a4e961b890bb03bf3c68ba51bca256a617a055e3c7ef89" url: "https://pub.dev" source: hosted - version: "0.4.1" + version: "0.5.0" shared_preferences: dependency: "direct main" description: name: shared_preferences - sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180 + sha256: a752ce92ea7540fc35a0d19722816e04d0e72828a4200e83a98cf1a1eb524c9a url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.3.5" shared_preferences_android: - dependency: "direct overridden" + dependency: transitive description: name: shared_preferences_android - sha256: "853801ce6ba7429ec4e923e37317f32a57c903de50b8c33ffcfbdb7e6f0dd39c" + sha256: "138b7bbbc7f59c56236e426c37afb8f78cbc57b094ac64c440e0bb90e380a4f5" url: "https://pub.dev" source: hosted - version: "2.0.12" + version: "2.4.2" shared_preferences_foundation: dependency: transitive description: @@ -1462,8 +1535,8 @@ packages: dependency: transitive description: path: "packages/signer" - ref: main - resolved-ref: "68d4fda0ded7fbc3d6e9a594ebbf0ea7ff3b48b6" + ref: development_upgrade + resolved-ref: "78ab0cc09dfe72a25e94b40c783a4ec3a1f81e36" url: "https://github.com/threefoldtech/tfgrid-sdk-dart.git" source: git version: "0.1.0" @@ -1471,7 +1544,7 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" sliver_tools: dependency: transitive description: @@ -1480,14 +1553,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.2.12" - smart_auth: - dependency: transitive - description: - name: smart_auth - sha256: a25229b38c02f733d0a4e98d941b42bed91a976cb589e934895e60ccfa674cf6 - url: "https://pub.dev" - source: hosted - version: "1.1.1" smooth_page_indicator: dependency: "direct main" description: @@ -1500,34 +1565,34 @@ packages: dependency: "direct main" description: name: socket_io_client - sha256: "64bd271703db3682d4195dd813c555413d21a49bbaef7c3ed38932fd2a209a10" + sha256: "180fdbc7685e32a849511bbf8b1c7bcc46ab0ff116f7024aa204b425bb3a1ffe" url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "3.0.2" socket_io_common: dependency: transitive description: name: socket_io_common - sha256: "469c7e6bb0c8d571a5158c1352112654f03aedc2f0a246533e1cbdb41efa4937" + sha256: a914df90f25003fea62dbd0b186d98b745b1b72c16be87418e15a2511d25dadb url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "3.0.2" sodium: dependency: transitive description: name: sodium - sha256: d9830a388e37c82891888e64cfd4c6764fa3ac716bed80ac6eab89ee42c3cd76 + sha256: "93d7c8d9af1f57cbd1ddeeb815902d3e0c1e1c8579a78cf229bcd97e1714f061" url: "https://pub.dev" source: hosted - version: "2.3.1+1" + version: "3.4.4" sodium_libs: dependency: "direct main" description: name: sodium_libs - sha256: aa764acd6ccc6113e119c2d99471aeeb4637a9a501639549b297d3a143ff49b3 + sha256: "4e5d96a7805369dd51b24975a9072c51433466ae5716a33cff70316a14d97af9" url: "https://pub.dev" source: hosted - version: "2.2.1+6" + version: "3.4.3+1" source_span: dependency: transitive description: @@ -1548,42 +1613,66 @@ packages: dependency: transitive description: name: sqflite - sha256: a9016f495c927cb90557c909ff26a6d92d9bd54fc42ba92e19d4e79d61e798c6 + sha256: "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.1" + sqflite_android: + dependency: transitive + description: + name: sqflite_android + sha256: "78f489aab276260cdd26676d2169446c7ecd3484bbd5fead4ca14f3ed4dd9ee3" + url: "https://pub.dev" + source: hosted + version: "2.4.0" sqflite_common: dependency: transitive description: name: sqflite_common - sha256: "28d8c66baee4968519fb8bd6cdbedad982d6e53359091f0b74544a9f32ec72d5" + sha256: "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709" url: "https://pub.dev" source: hosted - version: "2.5.3" + version: "2.5.4+6" + sqflite_darwin: + dependency: transitive + description: + name: sqflite_darwin + sha256: "22adfd9a2c7d634041e96d6241e6e1c8138ca6817018afc5d443fef91dcefa9c" + url: "https://pub.dev" + source: hosted + version: "2.4.1+1" + sqflite_platform_interface: + dependency: transitive + description: + name: sqflite_platform_interface + sha256: "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920" + url: "https://pub.dev" + source: hosted + version: "2.4.0" sr25519: dependency: transitive description: name: sr25519 - sha256: "351a42deaf7656690fb3e09568701a13c1813229cee15a21a5ca1b322246c24d" + sha256: d10247ff98330efb658042357c8c7fc46074c3c160ea16d3dcdfedf8a9a87b60 url: "https://pub.dev" source: hosted - version: "0.4.1" + version: "0.5.0" ss58: dependency: transitive description: name: ss58 - sha256: "5c2f4be38fb657a4e1aa03a712871c3a8aeea734ebdd77f6a67e4a39cf36647a" + sha256: "74dce6fbfbac9dba5f87b8f104ed2b7253c6aeac39d508f088044cf4827d9cd7" url: "https://pub.dev" source: hosted - version: "1.1.3" + version: "1.2.0" stack_trace: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.0" state_notifier: dependency: transitive description: @@ -1595,20 +1684,18 @@ packages: stellar_client: dependency: "direct main" description: - path: "packages/stellar_client" - ref: development - resolved-ref: "2f7f0a8e729c87dc0ab9a973e1eac42b7686bc1c" - url: "https://github.com/threefoldtech/tfgrid-sdk-dart" - source: git + path: "../../../codescalers/tfgrid-sdk-dart/packages/stellar_client" + relative: true + source: path version: "0.1.0" stellar_flutter_sdk: dependency: "direct main" description: name: stellar_flutter_sdk - sha256: a25506529d40a040227cd565de6e1b4cc0a9ffc756472cf3c43420512e8a269b + sha256: dac5c9d4874ec8bb93541328718870a683dfb74d5f31c411f39b85e14cd70e79 url: "https://pub.dev" source: hosted - version: "1.8.9" + version: "1.9.2" stream_channel: dependency: transitive description: @@ -1629,10 +1716,10 @@ packages: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" strobe: dependency: transitive description: @@ -1645,26 +1732,26 @@ packages: dependency: transitive description: name: substrate_bip39 - sha256: fa950b80b92b7fc96f13683033fe974cdfd3ee0d30d989f6b8f3fcbfe6021ac2 + sha256: "6680dc10eb4f165659374eec5c5aa75920e720b3c00b65490e1dfe3d5ea5a52d" url: "https://pub.dev" source: hosted - version: "0.4.1" + version: "0.5.0" substrate_metadata: dependency: transitive description: name: substrate_metadata - sha256: ed6511dcca9dae3b10d525a6b8c1688e4eda0ab27bed0bbdfc31bc31bf34b441 + sha256: "878bf0e818eed4543f0c9af303b8ffe201cb69bf56c32d717f1bdef88e691836" url: "https://pub.dev" source: hosted - version: "1.2.2" + version: "1.3.0" synchronized: dependency: transitive description: name: synchronized - sha256: "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558" + sha256: "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225" url: "https://pub.dev" source: hosted - version: "3.1.0+1" + version: "3.3.0+3" term_glyph: dependency: transitive description: @@ -1677,18 +1764,16 @@ packages: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.3" tfchain_client: dependency: "direct main" description: - path: "packages/tfchain_client" - ref: development - resolved-ref: a66b92b9947cbc6ce7adf289f4321153ac42b936 - url: "https://github.com/threefoldtech/tfgrid-sdk-dart" - source: git + path: "../../../codescalers/tfgrid-sdk-dart/packages/tfchain_client" + relative: true + source: path version: "0.1.0" timeago: dependency: "direct main" @@ -1763,7 +1848,7 @@ packages: source: hosted version: "1.1.0" unorm_dart: - dependency: "direct overridden" + dependency: transitive description: name: unorm_dart sha256: "23d8bf65605401a6a32cff99435fed66ef3dab3ddcad3454059165df46496a3b" @@ -1870,10 +1955,10 @@ packages: dependency: transitive description: name: vector_graphics - sha256: "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3" + sha256: "27d5fefe86fb9aace4a9f8375b56b3c292b64d8c04510df230f849850d912cb7" url: "https://pub.dev" source: hosted - version: "1.1.11+1" + version: "1.1.15" vector_graphics_codec: dependency: transitive description: @@ -1886,10 +1971,10 @@ packages: dependency: transitive description: name: vector_graphics_compiler - sha256: "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81" + sha256: "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad" url: "https://pub.dev" source: hosted - version: "1.1.11+1" + version: "1.1.16" vector_math: dependency: transitive description: @@ -1942,26 +2027,26 @@ packages: dependency: transitive description: name: vm_service - sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b url: "https://pub.dev" source: hosted - version: "14.2.1" + version: "14.3.0" wakelock_plus: dependency: transitive description: name: wakelock_plus - sha256: f268ca2116db22e57577fb99d52515a24bdc1d570f12ac18bb762361d43b043d + sha256: "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e" url: "https://pub.dev" source: hosted - version: "1.1.4" + version: "1.2.10" wakelock_plus_platform_interface: dependency: transitive description: name: wakelock_plus_platform_interface - sha256: "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16" + sha256: "70e780bc99796e1db82fe764b1e7dcb89a86f1e5b3afb1db354de50f2e41eb7a" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" watcher: dependency: transitive description: @@ -1974,34 +2059,34 @@ packages: dependency: transitive description: name: web - sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" + sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "1.1.0" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42" + sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b url: "https://pub.dev" source: hosted - version: "2.4.5" + version: "2.4.0" webview_flutter: dependency: "direct main" description: name: webview_flutter - sha256: "6869c8786d179f929144b4a1f86e09ac0eddfe475984951ea6c634774c16b522" + sha256: "889a0a678e7c793c308c68739996227c9661590605e70b1f6cf6b9a6634f7aec" url: "https://pub.dev" source: hosted - version: "4.8.0" + version: "4.10.0" webview_flutter_android: dependency: transitive description: name: webview_flutter_android - sha256: ed021f27ae621bc97a6019fb601ab16331a3db4bf8afa305e9f6689bdb3edced + sha256: "5568f17a9c25c0fdd0737900fa1c2d1fee2d780bc212d9aec10c2d1f48ef0f59" url: "https://pub.dev" source: hosted - version: "3.16.8" + version: "4.3.1" webview_flutter_platform_interface: dependency: transitive description: @@ -2014,10 +2099,10 @@ packages: dependency: transitive description: name: webview_flutter_wkwebview - sha256: "9c62cc46fa4f2d41e10ab81014c1de470a6c6f26051a2de32111b2ee55287feb" + sha256: "4adc14ea9a770cc9e2c8f1ac734536bd40e82615bd0fa6b94be10982de656cc7" url: "https://pub.dev" source: hosted - version: "3.14.0" + version: "3.17.0" win32: dependency: transitive description: @@ -2054,10 +2139,10 @@ packages: dependency: "direct main" description: name: xml2json - sha256: "52b7c8d350fdce09545b058982c26689ee89f1eb188cc9910d585665bfe27bc0" + sha256: "9ff65c144a48f7f73d2bd6d919700c7697beced3b51216b982f78c68bc0da142" url: "https://pub.dev" source: hosted - version: "6.2.3" + version: "6.2.6" yaml: dependency: transitive description: @@ -2066,14 +2151,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.2" - yaon: - dependency: transitive - description: - name: yaon - sha256: "7ffb8284eb13e448fdabf340209c306336cfeabdca97294c27b5a11237eaa3c4" - url: "https://pub.dev" - source: hosted - version: "1.1.4+10" sdks: - dart: ">=3.4.0 <4.0.0" - flutter: ">=3.22.0" + dart: ">=3.6.0 <4.0.0" + flutter: ">=3.27.0" diff --git a/app/pubspec.yaml b/app/pubspec.yaml index 40142eaea..0108ac0a8 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -31,60 +31,60 @@ dependencies: url: https://github.com/threefoldtech/tfgrid-sdk-dart ref: main path: packages/gridproxy_client - flutter_svg: ^2.0.6 + flutter_svg: ^2.0.17 bip39: ^1.0.6 - socket_io_client: ^1.0.2 + socket_io_client: ^3.0.2 local_auth: 1.1.7 - url_launcher: ^6.0.10 - shared_preferences: ^2.0.7 - http: ^1.0.0 - package_info_plus: ^4.0.2 - cupertino_icons: ^1.0.4 - google_fonts: ^5.0.0 - intl_phone_field: ^3.1.0 - flagsmith: ^3.1.0 - flutter_inappwebview: ^5.3.2 - sodium_libs: ^2.1.0+1 + url_launcher: ^6.3.1 + shared_preferences: ^2.3.5 + http: ^1.3.0 + package_info_plus: ^8.1.3 + cupertino_icons: ^1.0.8 + google_fonts: ^6.2.1 + intl_phone_field: ^3.2.0 + flagsmith: ^6.0.0 + flutter_inappwebview: ^6.1.5 + sodium_libs: ^3.4.3+1 uni_links: ^0.5.1 pbkdf2ns: ^0.0.2 - qr_code_scanner: ^1.0.1 + # qr_code_scanner: ^1.0.1 flutter_json_viewer: ^1.0.1 - device_info_plus: ^9.0.2 - permission_handler: ^10.2.0 - path_provider: ^2.0.2 - dio: ^5.0.0 - open_filex: ^4.3.2 - country_picker: ^2.0.20 + device_info_plus: ^11.2.1 + permission_handler: ^11.3.1 + path_provider: ^2.1.5 + dio: ^5.7.0 + open_filex: ^4.6.0 + country_picker: ^2.0.27 pinenacl: ^0.6.0 - pinput: 3.0.1 - build_runner: ^2.4.9 + pinput: ^5.0.1 + build_runner: ^2.4.13 smooth_page_indicator: ^1.2.0+3 - webview_flutter: ^4.8.0 + webview_flutter: ^4.10.0 qr_flutter: ^4.1.0 - screen_brightness: ^1.0.1 + screen_brightness: ^2.1.1 validators: ^3.0.0 - lottie: ^3.1.2 - crisp_chat: 2.0.3 - xml2json: ^6.2.3 + lottie: ^3.3.1 + crisp_chat: ^2.2.3 + xml2json: ^6.2.6 timeago: ^3.7.0 - flutter_widget_from_html: ^0.15.2 - idenfy_sdk_flutter: 2.5.3 - flutter_riverpod: 2.5.1 + flutter_widget_from_html: ^0.15.3 + idenfy_sdk_flutter: ^2.6.0 + flutter_riverpod: ^2.6.1 - convert: any - crypto: any - hashlib: any - stellar_flutter_sdk: ^1.8.9 - flutter_launcher_icons: ^0.14.1 - logger: ^2.4.0 + convert: ^3.1.2 + crypto: ^3.0.6 + hashlib: ^1.21.1 + stellar_flutter_sdk: ^1.9.2 + flutter_launcher_icons: ^0.14.3 + logger: ^2.5.0 flutter_keyboard_visibility: ^6.0.0 mutex: ^3.1.0 - decimal: ^3.1.0 + decimal: ^3.2.1 infinite_scroll_pagination: ^4.1.0 dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.0 + flutter_lints: ^5.0.0 dependency_overrides: intl: ^0.19.0 From e447aace2cf439ee174db7f8848056fc2c2605f9 Mon Sep 17 00:00:00 2001 From: ahmedhanafy725 Date: Wed, 22 Jan 2025 11:55:59 +0200 Subject: [PATCH 06/17] Use WebUri for InAppWebView --- app/lib/apps/chatbot/chatbot_widget.dart | 4 ++-- app/lib/apps/farmers/farmers_widget.dart | 4 ++-- app/lib/apps/news/news_widget.dart | 4 ++-- app/lib/apps/wallet/wallet_widget.dart | 4 ++-- app/lib/browser.dart | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/lib/apps/chatbot/chatbot_widget.dart b/app/lib/apps/chatbot/chatbot_widget.dart index 64f8ea047..0fb6861d6 100644 --- a/app/lib/apps/chatbot/chatbot_widget.dart +++ b/app/lib/apps/chatbot/chatbot_widget.dart @@ -26,8 +26,8 @@ class _ChatbotState extends State _ChatbotState({required this.email}) { iaWebview = InAppWebView( initialUrlRequest: URLRequest( - url: Uri.parse( - '${config.url()}$email&cache_buster=${DateTime.now().millisecondsSinceEpoch}')), + url: WebUri.uri(Uri.parse( + '${config.url()}$email&cache_buster=${DateTime.now().millisecondsSinceEpoch}'))), initialOptions: InAppWebViewGroupOptions( crossPlatform: InAppWebViewOptions(useShouldOverrideUrlLoading: true), android: AndroidInAppWebViewOptions( diff --git a/app/lib/apps/farmers/farmers_widget.dart b/app/lib/apps/farmers/farmers_widget.dart index b0b8efc41..b422741df 100644 --- a/app/lib/apps/farmers/farmers_widget.dart +++ b/app/lib/apps/farmers/farmers_widget.dart @@ -51,8 +51,8 @@ class _FarmersState extends State iaWebView = InAppWebView( initialUrlRequest: URLRequest( - url: Uri.parse( - '$farmersUri?cache_buster=${DateTime.now().millisecondsSinceEpoch}')), + url: WebUri.uri(Uri.parse( + '$farmersUri?cache_buster=${DateTime.now().millisecondsSinceEpoch}'))), initialOptions: InAppWebViewGroupOptions( crossPlatform: InAppWebViewOptions( cacheEnabled: Globals().isCacheClearedFarmer, diff --git a/app/lib/apps/news/news_widget.dart b/app/lib/apps/news/news_widget.dart index bede24873..54a6b19cc 100644 --- a/app/lib/apps/news/news_widget.dart +++ b/app/lib/apps/news/news_widget.dart @@ -41,8 +41,8 @@ class _NewsState extends State with AutomaticKeepAliveClientMixin { initialEndsWith = DateTime.now().millisecondsSinceEpoch.toString(); iaWebView = InAppWebView( initialUrlRequest: URLRequest( - url: Uri.parse( - 'https://news.threefold.me?cache_buster=$initialEndsWith')), + url: WebUri.uri(Uri.parse( + 'https://news.threefold.me?cache_buster=$initialEndsWith'))), initialOptions: InAppWebViewGroupOptions( crossPlatform: InAppWebViewOptions(), android: AndroidInAppWebViewOptions( diff --git a/app/lib/apps/wallet/wallet_widget.dart b/app/lib/apps/wallet/wallet_widget.dart index 1c05b6a9e..61aed431a 100644 --- a/app/lib/apps/wallet/wallet_widget.dart +++ b/app/lib/apps/wallet/wallet_widget.dart @@ -53,8 +53,8 @@ class _WalletState extends State iaWebView = InAppWebView( initialUrlRequest: URLRequest( - url: Uri.parse( - '$walletUri?cache_buster=${DateTime.now().millisecondsSinceEpoch}')), + url: WebUri.uri(Uri.parse( + '$walletUri?cache_buster=${DateTime.now().millisecondsSinceEpoch}'))), initialOptions: InAppWebViewGroupOptions( crossPlatform: InAppWebViewOptions( cacheEnabled: Globals().isCacheClearedWallet, diff --git a/app/lib/browser.dart b/app/lib/browser.dart index 1438c0236..9945cb982 100644 --- a/app/lib/browser.dart +++ b/app/lib/browser.dart @@ -4,13 +4,13 @@ import 'package:threebotlogin/helpers/logger.dart'; class MyInAppBrowser extends InAppBrowser { @override void onLoadStart(Uri? url) { - super.onLoadStart(url); + super.onLoadStart(WebUri.uri(url!)); logger.i('\n\nStarted $url\n\n'); } @override void onLoadStop(Uri? url) { - super.onLoadStop(url); + super.onLoadStop(WebUri.uri(url!)); logger.i('\n\nStopped $url\n\n'); } From 0dd51e953fd4d1ca0dede423b03f95e9a14befb3 Mon Sep 17 00:00:00 2001 From: ahmedhanafy725 Date: Wed, 22 Jan 2025 12:38:32 +0200 Subject: [PATCH 07/17] Use mobile field instead phone field package --- app/lib/widgets/phone_widget.dart | 6 +++--- app/pubspec.lock | 8 ++++---- app/pubspec.yaml | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/lib/widgets/phone_widget.dart b/app/lib/widgets/phone_widget.dart index 16878621f..f8696019b 100644 --- a/app/lib/widgets/phone_widget.dart +++ b/app/lib/widgets/phone_widget.dart @@ -3,8 +3,8 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter_pkid/flutter_pkid.dart'; import 'package:http/http.dart'; -import 'package:intl_phone_field/countries.dart'; -import 'package:intl_phone_field/intl_phone_field.dart'; +import 'package:intl_mobile_field/countries.dart'; +import 'package:intl_mobile_field/intl_mobile_field.dart'; import 'package:threebotlogin/helpers/globals.dart'; import 'package:threebotlogin/services/open_kyc_service.dart'; import 'package:threebotlogin/services/phone_service.dart'; @@ -105,7 +105,7 @@ class PhoneAlertDialogState extends State { ), Padding( padding: const EdgeInsets.symmetric(horizontal: 16), - child: IntlPhoneField( + child: IntlMobileField( initialCountryCode: widget.defaultCountryCode, decoration: const InputDecoration( labelText: 'Phone Number', diff --git a/app/pubspec.lock b/app/pubspec.lock index 669fc987d..2c9c5e70b 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -843,14 +843,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.19.0" - intl_phone_field: + intl_mobile_field: dependency: "direct main" description: - name: intl_phone_field - sha256: "73819d3dfcb68d2c85663606f6842597c3ddf6688ac777f051b17814fe767bbf" + name: intl_mobile_field + sha256: f1a004c1e05d88da01d199812b94249e3dfbaa39ee017037a4ec8886b264854a url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "1.1.1" io: dependency: transitive description: diff --git a/app/pubspec.yaml b/app/pubspec.yaml index 0108ac0a8..9574242dd 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -41,7 +41,7 @@ dependencies: package_info_plus: ^8.1.3 cupertino_icons: ^1.0.8 google_fonts: ^6.2.1 - intl_phone_field: ^3.2.0 + # intl_phone_field: ^3.2.0 flagsmith: ^6.0.0 flutter_inappwebview: ^6.1.5 sodium_libs: ^3.4.3+1 @@ -81,6 +81,7 @@ dependencies: mutex: ^3.1.0 decimal: ^3.2.1 infinite_scroll_pagination: ^4.1.0 + intl_mobile_field: ^1.1.1 dev_dependencies: flutter_test: sdk: flutter From dba7e8e66b4242f359b2015ba87f405af70cdd35 Mon Sep 17 00:00:00 2001 From: ahmedhanafy725 Date: Wed, 22 Jan 2025 13:24:51 +0200 Subject: [PATCH 08/17] Use mobile scanner to scan qr codes --- app/android/gradle.properties | 1 + app/lib/apps/wallet/wallet_widget.dart | 4 ++-- app/lib/screens/scan_screen.dart | 25 +++++++++---------------- app/lib/screens/wallets/send.dart | 8 ++++---- app/pubspec.lock | 8 ++++++++ app/pubspec.yaml | 1 + 6 files changed, 25 insertions(+), 22 deletions(-) diff --git a/app/android/gradle.properties b/app/android/gradle.properties index 88a3fab58..a8ac4d340 100644 --- a/app/android/gradle.properties +++ b/app/android/gradle.properties @@ -12,3 +12,4 @@ org.gradle.jvmargs=-Xmx4096M \ --add-opens=java.base/java.lang.reflect=ALL-UNNAMED \ --add-opens=java.base/java.io=ALL-UNNAMED \ --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED +dev.steenbakker.mobile_scanner.useUnbundled=true diff --git a/app/lib/apps/wallet/wallet_widget.dart b/app/lib/apps/wallet/wallet_widget.dart index 61aed431a..12244a231 100644 --- a/app/lib/apps/wallet/wallet_widget.dart +++ b/app/lib/apps/wallet/wallet_widget.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_inappwebview/flutter_inappwebview.dart'; -import 'package:qr_code_scanner/qr_code_scanner.dart'; +import 'package:mobile_scanner/mobile_scanner.dart'; import 'package:threebotlogin/apps/wallet/wallet_config.dart'; import 'package:threebotlogin/apps/wallet/wallet_events.dart'; import 'package:threebotlogin/apps/wallet/wallet_user_data.dart'; @@ -137,7 +137,7 @@ class _WalletState extends State result = await Navigator.push( context, MaterialPageRoute(builder: (context) => const ScanScreen())); } - return result.code; + return result.rawValue; } addHandler() { diff --git a/app/lib/screens/scan_screen.dart b/app/lib/screens/scan_screen.dart index 9d46f99f7..c6d9c7e79 100644 --- a/app/lib/screens/scan_screen.dart +++ b/app/lib/screens/scan_screen.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:qr_code_scanner/qr_code_scanner.dart'; +import 'package:mobile_scanner/mobile_scanner.dart'; class ScanScreen extends StatefulWidget { const ScanScreen({super.key}); @@ -14,19 +14,14 @@ class _ScanScreenState extends State { final GlobalKey qrKey = GlobalKey(debugLabel: 'QR'); - @override - void initState() { - super.initState(); - } - @override Widget build(BuildContext context) { return Scaffold( body: Stack( children: [ - QRView( - key: qrKey, - onQRViewCreated: _onQRViewCreated, + MobileScanner( + onDetect: _handleBarcode, + fit: BoxFit.contain, ), Align(alignment: Alignment.bottomCenter, child: content()), ], @@ -34,13 +29,11 @@ class _ScanScreenState extends State { ); } - void _onQRViewCreated(QRViewController controller) { - controller.scannedDataStream.listen((scanData) { - if (!popped) { - popped = true; - Navigator.pop(context, scanData); - } - }); + void _handleBarcode(BarcodeCapture barcodes) { + if (!popped) { + popped = true; + Navigator.pop(context, barcodes.barcodes.firstOrNull); + } } Widget content() { diff --git a/app/lib/screens/wallets/send.dart b/app/lib/screens/wallets/send.dart index b56e46577..0e88607af 100644 --- a/app/lib/screens/wallets/send.dart +++ b/app/lib/screens/wallets/send.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:qr_code_scanner/qr_code_scanner.dart'; +import 'package:mobile_scanner/mobile_scanner.dart'; import 'package:threebotlogin/helpers/globals.dart'; import 'package:threebotlogin/helpers/transaction_helpers.dart'; import 'package:threebotlogin/models/wallet.dart'; @@ -381,8 +381,8 @@ class _WalletSendScreenState extends ConsumerState { MaterialPageRoute(builder: (context) => const ScanScreen())); } } - if (result.code != null) { - final code = Uri.parse(result.code!); + if (result.rawValue != null) { + final code = Uri.parse(result.rawValue!); toController.text = code.path; if (code.queryParameters.containsKey('amount')) { amountController.text = code.queryParameters['amount']!; @@ -394,7 +394,7 @@ class _WalletSendScreenState extends ConsumerState { setState(() {}); } - return result.code; + return result.rawValue!; } calculateAmount(int percentage) { diff --git a/app/pubspec.lock b/app/pubspec.lock index 2c9c5e70b..4cb821762 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -1019,6 +1019,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.6" + mobile_scanner: + dependency: "direct main" + description: + name: mobile_scanner + sha256: "57d6269d10912d5d583606b46d963d7c5d0299d2c37add8b7192dd769d40a319" + url: "https://pub.dev" + source: hosted + version: "6.0.3" moment_dart: dependency: transitive description: diff --git a/app/pubspec.yaml b/app/pubspec.yaml index 9574242dd..2c6e8066e 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -82,6 +82,7 @@ dependencies: decimal: ^3.2.1 infinite_scroll_pagination: ^4.1.0 intl_mobile_field: ^1.1.1 + mobile_scanner: ^6.0.3 dev_dependencies: flutter_test: sdk: flutter From 5272d5fa870a0ae40e65f160de72bd354c88ead6 Mon Sep 17 00:00:00 2001 From: ahmedhanafy725 Date: Wed, 22 Jan 2025 13:44:16 +0200 Subject: [PATCH 09/17] Upgrade github packages' branch --- app/pubspec.lock | 32 ++++++++++++++++++++------------ app/pubspec.yaml | 12 ++++++------ 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/app/pubspec.lock b/app/pubspec.lock index 4cb821762..d91bfce20 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -598,9 +598,11 @@ packages: flutter_pkid: dependency: "direct main" description: - path: "../../threefold_connect_flutter_pkid_client" - relative: true - source: path + path: "." + ref: master_update + resolved-ref: ccae3c8ee136a88305de178ca69211b1784bfc04 + url: "https://github.com/threefoldtech/threefold_connect_flutter_pkid_client" + source: git version: "0.0.1" flutter_plugin_android_lifecycle: dependency: transitive @@ -751,9 +753,11 @@ packages: gridproxy_client: dependency: "direct main" description: - path: "../../../codescalers/tfgrid-sdk-dart/packages/gridproxy_client" - relative: true - source: path + path: "packages/gridproxy_client" + ref: development_upgrade + resolved-ref: "78ab0cc09dfe72a25e94b40c783a4ec3a1f81e36" + url: "https://github.com/threefoldtech/tfgrid-sdk-dart" + source: git version: "1.0.0" hashlib: dependency: "direct main" @@ -1692,9 +1696,11 @@ packages: stellar_client: dependency: "direct main" description: - path: "../../../codescalers/tfgrid-sdk-dart/packages/stellar_client" - relative: true - source: path + path: "packages/stellar_client" + ref: development_upgrade + resolved-ref: "78ab0cc09dfe72a25e94b40c783a4ec3a1f81e36" + url: "https://github.com/threefoldtech/tfgrid-sdk-dart" + source: git version: "0.1.0" stellar_flutter_sdk: dependency: "direct main" @@ -1779,9 +1785,11 @@ packages: tfchain_client: dependency: "direct main" description: - path: "../../../codescalers/tfgrid-sdk-dart/packages/tfchain_client" - relative: true - source: path + path: "packages/tfchain_client" + ref: development_upgrade + resolved-ref: "78ab0cc09dfe72a25e94b40c783a4ec3a1f81e36" + url: "https://github.com/threefoldtech/tfgrid-sdk-dart" + source: git version: "0.1.0" timeago: dependency: "direct main" diff --git a/app/pubspec.yaml b/app/pubspec.yaml index 2c6e8066e..26b02f1df 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -15,21 +15,21 @@ dependencies: flutter_pkid: git: url: https://github.com/threefoldtech/threefold_connect_flutter_pkid_client - ref: master + ref: master_update tfchain_client: git: url: https://github.com/threefoldtech/tfgrid-sdk-dart - ref: development + ref: development_upgrade path: packages/tfchain_client stellar_client: git: url: https://github.com/threefoldtech/tfgrid-sdk-dart - ref: development + ref: development_upgrade path: packages/stellar_client gridproxy_client: git: url: https://github.com/threefoldtech/tfgrid-sdk-dart - ref: main + ref: development_upgrade path: packages/gridproxy_client flutter_svg: ^2.0.17 bip39: ^1.0.6 @@ -90,8 +90,8 @@ dev_dependencies: dependency_overrides: intl: ^0.19.0 - unorm_dart: 0.3.0 - shared_preferences_android: 2.0.12 + # unorm_dart: 0.3.0 + # shared_preferences_android: 2.0.12 flutter: uses-material-design: true From 50b965f6147b8a64bfc0d7972425b34550d42f8b Mon Sep 17 00:00:00 2001 From: ahmedhanafy725 Date: Wed, 22 Jan 2025 17:00:04 +0200 Subject: [PATCH 10/17] Downgrade idenfy and mobile scanner for ios --- app/pubspec.lock | 8 ++++---- app/pubspec.yaml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/pubspec.lock b/app/pubspec.lock index d91bfce20..9bbbac7ff 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -819,10 +819,10 @@ packages: dependency: "direct main" description: name: idenfy_sdk_flutter - sha256: de34db373c3fdd5e93b5dc1f0cd70740a7a80bfbd2a390dedf7f0afe5738593e + sha256: "89eebaca7b6fb0c955d51416546b81f3c76a944dfbfa4354c3a044d0cdd10010" url: "https://pub.dev" source: hosted - version: "2.6.0" + version: "2.5.6" image: dependency: transitive description: @@ -1027,10 +1027,10 @@ packages: dependency: "direct main" description: name: mobile_scanner - sha256: "57d6269d10912d5d583606b46d963d7c5d0299d2c37add8b7192dd769d40a319" + sha256: d234581c090526676fd8fab4ada92f35c6746e3fb4f05a399665d75a399fb760 url: "https://pub.dev" source: hosted - version: "6.0.3" + version: "5.2.3" moment_dart: dependency: transitive description: diff --git a/app/pubspec.yaml b/app/pubspec.yaml index 26b02f1df..b9441463c 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -68,7 +68,7 @@ dependencies: xml2json: ^6.2.6 timeago: ^3.7.0 flutter_widget_from_html: ^0.15.3 - idenfy_sdk_flutter: ^2.6.0 + idenfy_sdk_flutter: 2.5.6 flutter_riverpod: ^2.6.1 convert: ^3.1.2 @@ -82,7 +82,7 @@ dependencies: decimal: ^3.2.1 infinite_scroll_pagination: ^4.1.0 intl_mobile_field: ^1.1.1 - mobile_scanner: ^6.0.3 + mobile_scanner: 5.2.3 dev_dependencies: flutter_test: sdk: flutter From c1feb6a6ea2164a55f0dee78a0bc3c843b1b2293 Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Wed, 22 Jan 2025 17:28:32 +0200 Subject: [PATCH 11/17] handle flutter updrade with ios --- app/ios/Podfile.lock | 209 ++++++++++++++++------- app/ios/Runner.xcodeproj/project.pbxproj | 18 ++ 2 files changed, 165 insertions(+), 62 deletions(-) diff --git a/app/ios/Podfile.lock b/app/ios/Podfile.lock index afdcec547..90f352467 100644 --- a/app/ios/Podfile.lock +++ b/app/ios/Podfile.lock @@ -1,52 +1,108 @@ PODS: - audio_session (0.0.1): - Flutter + - Crisp (2.8.2): + - Crisp/Crisp (= 2.8.2) + - Crisp/Crisp (2.8.2) + - crisp_chat (2.2.3): + - Crisp (~> 2.8.1) + - Flutter - device_info_plus (0.0.1): - Flutter - Flutter (1.0.0) - - flutter_inappwebview (0.0.1): + - flutter_inappwebview_ios (0.0.1): + - Flutter + - flutter_inappwebview_ios/Core (= 0.0.1) + - OrderedSet (~> 6.0.3) + - flutter_inappwebview_ios/Core (0.0.1): - Flutter - - flutter_inappwebview/Core (= 0.0.1) - - OrderedSet (~> 5.0) - - flutter_inappwebview/Core (0.0.1): + - OrderedSet (~> 6.0.3) + - flutter_keyboard_visibility (0.0.1): - Flutter - - OrderedSet (~> 5.0) - flutter_pkid (0.0.1): - Flutter - - idenfy_sdk_flutter (2.5.3): + - GoogleDataTransport (9.4.1): + - GoogleUtilities/Environment (~> 7.7) + - nanopb (< 2.30911.0, >= 2.30908.0) + - PromisesObjC (< 3.0, >= 1.2) + - GoogleMLKit/BarcodeScanning (6.0.0): + - GoogleMLKit/MLKitCore + - MLKitBarcodeScanning (~> 5.0.0) + - GoogleMLKit/MLKitCore (6.0.0): + - MLKitCommon (~> 11.0.0) + - GoogleToolboxForMac/Defines (4.2.1) + - GoogleToolboxForMac/Logger (4.2.1): + - GoogleToolboxForMac/Defines (= 4.2.1) + - "GoogleToolboxForMac/NSData+zlib (4.2.1)": + - GoogleToolboxForMac/Defines (= 4.2.1) + - GoogleUtilities/Environment (7.13.3): + - GoogleUtilities/Privacy + - PromisesObjC (< 3.0, >= 1.2) + - GoogleUtilities/Logger (7.13.3): + - GoogleUtilities/Environment + - GoogleUtilities/Privacy + - GoogleUtilities/Privacy (7.13.3) + - GoogleUtilities/UserDefaults (7.13.3): + - GoogleUtilities/Logger + - GoogleUtilities/Privacy + - GoogleUtilitiesComponents (1.1.0): + - GoogleUtilities/Logger + - GTMSessionFetcher/Core (3.5.0) + - idenfy_sdk_flutter (2.5.6): - Flutter - - iDenfySDK/iDenfyLiveness (= 8.4.5) - - iDenfySDK/iDenfyLiveness (8.4.5): + - iDenfySDK/iDenfyLiveness (= 8.5.3) + - iDenfySDK/iDenfyLiveness (8.5.3): - lottie-ios (= 4.4.3) - just_audio (0.0.1): - Flutter - local_auth (0.0.1): - Flutter - lottie-ios (4.4.3) - - MTBBarcodeScanner (5.0.11) + - MLImage (1.0.0-beta5) + - MLKitBarcodeScanning (5.0.0): + - MLKitCommon (~> 11.0) + - MLKitVision (~> 7.0) + - MLKitCommon (11.0.0): + - GoogleDataTransport (< 10.0, >= 9.4.1) + - GoogleToolboxForMac/Logger (< 5.0, >= 4.2.1) + - "GoogleToolboxForMac/NSData+zlib (< 5.0, >= 4.2.1)" + - GoogleUtilities/UserDefaults (< 8.0, >= 7.13.0) + - GoogleUtilitiesComponents (~> 1.0) + - GTMSessionFetcher/Core (< 4.0, >= 3.3.2) + - MLKitVision (7.0.0): + - GoogleToolboxForMac/Logger (< 5.0, >= 4.2.1) + - "GoogleToolboxForMac/NSData+zlib (< 5.0, >= 4.2.1)" + - GTMSessionFetcher/Core (< 4.0, >= 3.3.2) + - MLImage (= 1.0.0-beta5) + - MLKitCommon (~> 11.0) + - mobile_scanner (5.2.3): + - Flutter + - GoogleMLKit/BarcodeScanning (~> 6.0.0) + - nanopb (2.30910.0): + - nanopb/decode (= 2.30910.0) + - nanopb/encode (= 2.30910.0) + - nanopb/decode (2.30910.0) + - nanopb/encode (2.30910.0) - open_filex (0.0.2): - Flutter - - OrderedSet (5.0.0) + - OrderedSet (6.0.3) - package_info_plus (0.4.5): - Flutter - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS - - permission_handler_apple (9.1.1): - - Flutter - - qr_code_scanner (0.2.0): + - permission_handler_apple (9.3.0): - Flutter - - MTBBarcodeScanner + - PromisesObjC (2.4.0) - screen_brightness_ios (0.1.0): - Flutter - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS - - smart_auth (0.0.1): + - "sodium_libs (3.4.3+1)": - Flutter - - sodium_libs (2.2.1): - - Flutter - - sqflite (0.0.3): + - FlutterMacOS + - sqflite_darwin (0.0.4): - Flutter - FlutterMacOS - uni_links (0.0.1): @@ -60,48 +116,66 @@ PODS: - Flutter - webview_flutter_wkwebview (0.0.1): - Flutter + - FlutterMacOS DEPENDENCIES: - audio_session (from `.symlinks/plugins/audio_session/ios`) + - crisp_chat (from `.symlinks/plugins/crisp_chat/ios`) - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) - Flutter (from `Flutter`) - - flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`) + - flutter_inappwebview_ios (from `.symlinks/plugins/flutter_inappwebview_ios/ios`) + - flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`) - flutter_pkid (from `.symlinks/plugins/flutter_pkid/ios`) - idenfy_sdk_flutter (from `.symlinks/plugins/idenfy_sdk_flutter/ios`) - just_audio (from `.symlinks/plugins/just_audio/ios`) - local_auth (from `.symlinks/plugins/local_auth/ios`) + - mobile_scanner (from `.symlinks/plugins/mobile_scanner/ios`) - open_filex (from `.symlinks/plugins/open_filex/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`) - screen_brightness_ios (from `.symlinks/plugins/screen_brightness_ios/ios`) - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - - smart_auth (from `.symlinks/plugins/smart_auth/ios`) - - sodium_libs (from `.symlinks/plugins/sodium_libs/ios`) - - sqflite (from `.symlinks/plugins/sqflite/darwin`) + - sodium_libs (from `.symlinks/plugins/sodium_libs/darwin`) + - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`) - uni_links (from `.symlinks/plugins/uni_links/ios`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`) - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`) - - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`) + - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/darwin`) SPEC REPOS: trunk: + - Crisp + - GoogleDataTransport + - GoogleMLKit + - GoogleToolboxForMac + - GoogleUtilities + - GoogleUtilitiesComponents + - GTMSessionFetcher - iDenfySDK - lottie-ios - - MTBBarcodeScanner + - MLImage + - MLKitBarcodeScanning + - MLKitCommon + - MLKitVision + - nanopb - OrderedSet + - PromisesObjC EXTERNAL SOURCES: audio_session: :path: ".symlinks/plugins/audio_session/ios" + crisp_chat: + :path: ".symlinks/plugins/crisp_chat/ios" device_info_plus: :path: ".symlinks/plugins/device_info_plus/ios" Flutter: :path: Flutter - flutter_inappwebview: - :path: ".symlinks/plugins/flutter_inappwebview/ios" + flutter_inappwebview_ios: + :path: ".symlinks/plugins/flutter_inappwebview_ios/ios" + flutter_keyboard_visibility: + :path: ".symlinks/plugins/flutter_keyboard_visibility/ios" flutter_pkid: :path: ".symlinks/plugins/flutter_pkid/ios" idenfy_sdk_flutter: @@ -110,6 +184,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/just_audio/ios" local_auth: :path: ".symlinks/plugins/local_auth/ios" + mobile_scanner: + :path: ".symlinks/plugins/mobile_scanner/ios" open_filex: :path: ".symlinks/plugins/open_filex/ios" package_info_plus: @@ -118,18 +194,14 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/path_provider_foundation/darwin" permission_handler_apple: :path: ".symlinks/plugins/permission_handler_apple/ios" - qr_code_scanner: - :path: ".symlinks/plugins/qr_code_scanner/ios" screen_brightness_ios: :path: ".symlinks/plugins/screen_brightness_ios/ios" shared_preferences_foundation: :path: ".symlinks/plugins/shared_preferences_foundation/darwin" - smart_auth: - :path: ".symlinks/plugins/smart_auth/ios" sodium_libs: - :path: ".symlinks/plugins/sodium_libs/ios" - sqflite: - :path: ".symlinks/plugins/sqflite/darwin" + :path: ".symlinks/plugins/sodium_libs/darwin" + sqflite_darwin: + :path: ".symlinks/plugins/sqflite_darwin/darwin" uni_links: :path: ".symlinks/plugins/uni_links/ios" url_launcher_ios: @@ -139,37 +211,50 @@ EXTERNAL SOURCES: wakelock_plus: :path: ".symlinks/plugins/wakelock_plus/ios" webview_flutter_wkwebview: - :path: ".symlinks/plugins/webview_flutter_wkwebview/ios" + :path: ".symlinks/plugins/webview_flutter_wkwebview/darwin" SPEC CHECKSUMS: - audio_session: 088d2483ebd1dc43f51d253d4a1c517d9a2e7207 - device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6 + audio_session: f08db0697111ac84ba46191b55488c0563bb29c6 + Crisp: 6747c96b2b2c2a81babf1eaecd1688a65d98edd4 + crisp_chat: 3bdffe847beeaf0277d5d6d1473962d758af5685 + device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 - flutter_inappwebview: 3d32228f1304635e7c028b0d4252937730bbc6cf - flutter_pkid: 7808bd0baee7580afc1cebebf2a6f3b290e190c5 - idenfy_sdk_flutter: 3f53cc19cd757e9bb9f01d83386a6db84192dae9 - iDenfySDK: 4bba551e7e824daf7db2b3bac166a9fe339c4269 - just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa - local_auth: 1740f55d7af0a2e2a8684ce225fe79d8931e808c + flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99 + flutter_keyboard_visibility: 4625131e43015dbbe759d9b20daaf77e0e3f6619 + flutter_pkid: 816b9b6b9e0db3bd65fb88a23a6e70e6a3e9473e + GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a + GoogleMLKit: 97ac7af399057e99182ee8edfa8249e3226a4065 + GoogleToolboxForMac: d1a2cbf009c453f4d6ded37c105e2f67a32206d8 + GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15 + GoogleUtilitiesComponents: 679b2c881db3b615a2777504623df6122dd20afe + GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6 + idenfy_sdk_flutter: 3f17044441bdb67c5512092516b3119b0fbc888c + iDenfySDK: 92f176f19108688d86fb3ed8859356a645c35536 + just_audio: 6c031bb61297cf218b4462be616638e81c058e97 + local_auth: 9797b7f53f113470a9ae99c3ff005c9f19e5fb4c lottie-ios: fcb5e73e17ba4c983140b7d21095c834b3087418 - MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb - open_filex: 6e26e659846ec990262224a12ef1c528bb4edbe4 - OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c - package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 - path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 - permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6 - qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e - screen_brightness_ios: 7437207a2a9bc56553aa10f782afecf830b4c4e2 - shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 - smart_auth: 4bedbc118723912d0e45a07e8ab34039c19e04f2 - sodium_libs: 1faae17af662384acbd13e41867a0008cd2e2318 - sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec - uni_links: d97da20c7701486ba192624d99bffaaffcfc298a - url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe - video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3 - wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47 - webview_flutter_wkwebview: 2a23822e9039b7b1bc52e5add778e5d89ad488d1 + MLImage: 1824212150da33ef225fbd3dc49f184cf611046c + MLKitBarcodeScanning: 10ca0845a6d15f2f6e911f682a1998b68b973e8b + MLKitCommon: afec63980417d29ffbb4790529a1b0a2291699e1 + MLKitVision: e858c5f125ecc288e4a31127928301eaba9ae0c1 + mobile_scanner: 92e8812bf22a8f84131e2a7f9d0f44dad1a4742b + nanopb: 438bc412db1928dac798aa6fd75726007be04262 + open_filex: 432f3cd11432da3e39f47fcc0df2b1603854eff1 + OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94 + package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499 + path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564 + permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d + PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 + screen_brightness_ios: 28c5fbdb40634de44f86025d84470158ad4df48c + shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7 + sodium_libs: d5a8c0ec38806fe1cff3caf98c8319378da0bc1d + sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0 + uni_links: ed8c961e47ed9ce42b6d91e1de8049e38a4b3152 + url_launcher_ios: 694010445543906933d732453a59da0a173ae33d + video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b + wakelock_plus: 04623e3f525556020ebd4034310f20fe7fda8b49 + webview_flutter_wkwebview: 44d4dee7d7056d5ad185d25b38404436d56c547c -PODFILE CHECKSUM: f8ab9e5577c96127975d4ff88c95faaa16cd71bb +PODFILE CHECKSUM: 050ff199c8e97450c391a88d64db90da96da9995 -COCOAPODS: 1.14.3 \ No newline at end of file +COCOAPODS: 1.16.2 diff --git a/app/ios/Runner.xcodeproj/project.pbxproj b/app/ios/Runner.xcodeproj/project.pbxproj index e553da226..3ff246be8 100644 --- a/app/ios/Runner.xcodeproj/project.pbxproj +++ b/app/ios/Runner.xcodeproj/project.pbxproj @@ -152,6 +152,7 @@ 3B06AD1E1E4923F5004D2608 /* Thin Binary */, 7E75E6CA262DCE56000C2EBB /* Embed App Extensions */, 1577792F4C138F0A6A12C487 /* [CP] Embed Pods Frameworks */, + 0AA71E2D6715C5B29C833181 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -211,6 +212,23 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 0AA71E2D6715C5B29C833181 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; 1577792F4C138F0A6A12C487 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; From 02c95d5f707feb8e6ad9a34d85069db50cf95d6a Mon Sep 17 00:00:00 2001 From: ahmedhanafy725 Date: Thu, 23 Jan 2025 15:10:22 +0200 Subject: [PATCH 12/17] Downgrade socket io client --- app/pubspec.lock | 8 ++++---- app/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/pubspec.lock b/app/pubspec.lock index 9bbbac7ff..0a8f54515 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -1577,18 +1577,18 @@ packages: dependency: "direct main" description: name: socket_io_client - sha256: "180fdbc7685e32a849511bbf8b1c7bcc46ab0ff116f7024aa204b425bb3a1ffe" + sha256: "64bd271703db3682d4195dd813c555413d21a49bbaef7c3ed38932fd2a209a10" url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "1.0.2" socket_io_common: dependency: transitive description: name: socket_io_common - sha256: a914df90f25003fea62dbd0b186d98b745b1b72c16be87418e15a2511d25dadb + sha256: "469c7e6bb0c8d571a5158c1352112654f03aedc2f0a246533e1cbdb41efa4937" url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "1.0.1" sodium: dependency: transitive description: diff --git a/app/pubspec.yaml b/app/pubspec.yaml index b9441463c..fdaf832f2 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -33,7 +33,7 @@ dependencies: path: packages/gridproxy_client flutter_svg: ^2.0.17 bip39: ^1.0.6 - socket_io_client: ^3.0.2 + socket_io_client: 1.0.2 local_auth: 1.1.7 url_launcher: ^6.3.1 shared_preferences: ^2.3.5 From 3646761484c1703a6276f63098a7a0a90cc1158c Mon Sep 17 00:00:00 2001 From: ahmedhanafy725 Date: Thu, 23 Jan 2025 15:11:06 +0200 Subject: [PATCH 13/17] Log error if the websocket connection failed --- app/lib/services/socket_service.dart | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/app/lib/services/socket_service.dart b/app/lib/services/socket_service.dart index 902c322bd..fa17c2b4d 100644 --- a/app/lib/services/socket_service.dart +++ b/app/lib/services/socket_service.dart @@ -36,12 +36,16 @@ class BackendConnection { logger.i( 'Creating socket connection with $threeBotSocketUrl for $doubleName'); - socket = IO.io(threeBotSocketUrl, { - 'transports': ['websocket'], - 'forceNew': true + socket = IO.io( + threeBotSocketUrl, + IO.OptionBuilder() + .setTransports(['websocket']) + .enableForceNew() + .build()); + socket.onError((e) { + logger.e('Failed to start websocket connection: $e'); }); - - socket.on('connect', (res) { + socket.onConnect((_) { logger.i('[connect]'); socket.emit('join', {'room': doubleName.toLowerCase(), 'app': true}); @@ -75,7 +79,7 @@ class BackendConnection { Events().emit(NewSignEvent(signData: signData)); }); - socket.on('disconnect', (_) { + socket.onDisconnect((_) { logger.i('disconnect'); }); From 5f40d32a64c596187bc6230a619ec966b1c187aa Mon Sep 17 00:00:00 2001 From: ahmedhanafy725 Date: Thu, 23 Jan 2025 16:15:53 +0200 Subject: [PATCH 14/17] Update the build.gradle --- app/android/app/build_local | 19 ++++------ app/android/app/build_production | 19 ++++------ app/android/app/build_staging | 19 ++++------ app/android/app/build_testing | 19 ++++------ .../app/src/main/AndroidManifest_local | 2 +- .../app/src/main/AndroidManifest_production | 2 +- .../app/src/main/AndroidManifest_staging | 2 +- .../app/src/main/AndroidManifest_testing | 2 +- app/android/build.gradle | 19 ---------- app/android/settings.gradle | 38 +++++++++---------- 10 files changed, 55 insertions(+), 86 deletions(-) diff --git a/app/android/app/build_local b/app/android/app/build_local index 5df85dc23..841ab2c08 100644 --- a/app/android/app/build_local +++ b/app/android/app/build_local @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,10 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { @@ -21,10 +23,6 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { compileSdkVersion flutter.compileSdkVersion ndkVersion flutter.ndkVersion @@ -96,12 +94,11 @@ flutter { def lifecycle_version = "2.5.1" dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'androidx.multidex:multidex:2.0.1' - // implementation 'com.hbb20:ccp:2.4.0' + implementation 'com.hbb20:ccp:2.7.3' implementation 'com.google.code.gson:gson:2.8.6' implementation "androidx.preference:preference-ktx:1.1.1" implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" - + implementation "androidx.activity:activity:1.9.3" } diff --git a/app/android/app/build_production b/app/android/app/build_production index 5a6b64bf1..304d7e0f6 100644 --- a/app/android/app/build_production +++ b/app/android/app/build_production @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,10 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { @@ -21,10 +23,6 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { compileSdkVersion flutter.compileSdkVersion ndkVersion flutter.ndkVersion @@ -96,12 +94,11 @@ flutter { def lifecycle_version = "2.5.1" dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'androidx.multidex:multidex:2.0.1' - // implementation 'com.hbb20:ccp:2.4.0' + implementation 'com.hbb20:ccp:2.7.3' implementation 'com.google.code.gson:gson:2.8.6' implementation "androidx.preference:preference-ktx:1.1.1" implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" - + implementation "androidx.activity:activity:1.9.3" } diff --git a/app/android/app/build_staging b/app/android/app/build_staging index 5df85dc23..841ab2c08 100644 --- a/app/android/app/build_staging +++ b/app/android/app/build_staging @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,10 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { @@ -21,10 +23,6 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { compileSdkVersion flutter.compileSdkVersion ndkVersion flutter.ndkVersion @@ -96,12 +94,11 @@ flutter { def lifecycle_version = "2.5.1" dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'androidx.multidex:multidex:2.0.1' - // implementation 'com.hbb20:ccp:2.4.0' + implementation 'com.hbb20:ccp:2.7.3' implementation 'com.google.code.gson:gson:2.8.6' implementation "androidx.preference:preference-ktx:1.1.1" implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" - + implementation "androidx.activity:activity:1.9.3" } diff --git a/app/android/app/build_testing b/app/android/app/build_testing index 5a6b64bf1..304d7e0f6 100644 --- a/app/android/app/build_testing +++ b/app/android/app/build_testing @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,10 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { @@ -21,10 +23,6 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { compileSdkVersion flutter.compileSdkVersion ndkVersion flutter.ndkVersion @@ -96,12 +94,11 @@ flutter { def lifecycle_version = "2.5.1" dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'androidx.multidex:multidex:2.0.1' - // implementation 'com.hbb20:ccp:2.4.0' + implementation 'com.hbb20:ccp:2.7.3' implementation 'com.google.code.gson:gson:2.8.6' implementation "androidx.preference:preference-ktx:1.1.1" implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" - + implementation "androidx.activity:activity:1.9.3" } diff --git a/app/android/app/src/main/AndroidManifest_local b/app/android/app/src/main/AndroidManifest_local index 9e0499089..3f0180a79 100644 --- a/app/android/app/src/main/AndroidManifest_local +++ b/app/android/app/src/main/AndroidManifest_local @@ -1,5 +1,5 @@ - + diff --git a/app/android/app/src/main/AndroidManifest_production b/app/android/app/src/main/AndroidManifest_production index b9219e889..578607cbe 100644 --- a/app/android/app/src/main/AndroidManifest_production +++ b/app/android/app/src/main/AndroidManifest_production @@ -1,5 +1,5 @@ - + diff --git a/app/android/app/src/main/AndroidManifest_staging b/app/android/app/src/main/AndroidManifest_staging index d5507e302..e0b354202 100644 --- a/app/android/app/src/main/AndroidManifest_staging +++ b/app/android/app/src/main/AndroidManifest_staging @@ -1,5 +1,5 @@ - + diff --git a/app/android/app/src/main/AndroidManifest_testing b/app/android/app/src/main/AndroidManifest_testing index e0e365b2e..2c829c582 100644 --- a/app/android/app/src/main/AndroidManifest_testing +++ b/app/android/app/src/main/AndroidManifest_testing @@ -1,5 +1,5 @@ - + diff --git a/app/android/build.gradle b/app/android/build.gradle index ff0cf4f22..0cf2fae20 100644 --- a/app/android/build.gradle +++ b/app/android/build.gradle @@ -1,22 +1,3 @@ -buildscript { - ext.kotlin_version = '2.1.0' - repositories { - google() - jcenter() - mavenCentral() - maven { url 'https://jitpack.io' } // add this line - maven { url 'https://maven.google.com' } - - } - - dependencies { - // classpath 'com.android.tools.build:gradle:4.2.0' - classpath 'com.android.tools.build:gradle:8.7.2' - classpath 'com.google.gms:google-services:4.3.3' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - allprojects { repositories { google() diff --git a/app/android/settings.gradle b/app/android/settings.gradle index 01dbec3d4..72e8d42af 100644 --- a/app/android/settings.gradle +++ b/app/android/settings.gradle @@ -1,25 +1,25 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + }() -def flutterProjectRoot = rootProject.projectDir.parentFile.toPath() + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") -def plugins = new Properties() -def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins') -if (pluginsFile.exists()) { - pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } } -plugins.each { name, path -> - def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile() - include ":$name" - project(":$name").projectDir = pluginDirectory +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "8.7.2" apply false + id "org.jetbrains.kotlin.android" version "2.1.0" apply false } -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() - -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } - -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +include ":app" From 042c1500fbd3444c6295418a1324c1436ff89b8a Mon Sep 17 00:00:00 2001 From: ahmedhanafy725 Date: Thu, 23 Jan 2025 16:18:36 +0200 Subject: [PATCH 15/17] Use the correct branch for the github packages --- app/pubspec.lock | 20 ++++++++++---------- app/pubspec.yaml | 10 ++++------ 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/app/pubspec.lock b/app/pubspec.lock index 0a8f54515..395cdcf9a 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -599,8 +599,8 @@ packages: dependency: "direct main" description: path: "." - ref: master_update - resolved-ref: ccae3c8ee136a88305de178ca69211b1784bfc04 + ref: master + resolved-ref: ab13fa12bfe14b0fc6d482d3a23ac24d416d8167 url: "https://github.com/threefoldtech/threefold_connect_flutter_pkid_client" source: git version: "0.0.1" @@ -754,8 +754,8 @@ packages: dependency: "direct main" description: path: "packages/gridproxy_client" - ref: development_upgrade - resolved-ref: "78ab0cc09dfe72a25e94b40c783a4ec3a1f81e36" + ref: development + resolved-ref: "77f8f563f35d13016aada278feb6431fcfc6731d" url: "https://github.com/threefoldtech/tfgrid-sdk-dart" source: git version: "1.0.0" @@ -1547,8 +1547,8 @@ packages: dependency: transitive description: path: "packages/signer" - ref: development_upgrade - resolved-ref: "78ab0cc09dfe72a25e94b40c783a4ec3a1f81e36" + ref: development + resolved-ref: "77f8f563f35d13016aada278feb6431fcfc6731d" url: "https://github.com/threefoldtech/tfgrid-sdk-dart.git" source: git version: "0.1.0" @@ -1697,8 +1697,8 @@ packages: dependency: "direct main" description: path: "packages/stellar_client" - ref: development_upgrade - resolved-ref: "78ab0cc09dfe72a25e94b40c783a4ec3a1f81e36" + ref: development + resolved-ref: "77f8f563f35d13016aada278feb6431fcfc6731d" url: "https://github.com/threefoldtech/tfgrid-sdk-dart" source: git version: "0.1.0" @@ -1786,8 +1786,8 @@ packages: dependency: "direct main" description: path: "packages/tfchain_client" - ref: development_upgrade - resolved-ref: "78ab0cc09dfe72a25e94b40c783a4ec3a1f81e36" + ref: development + resolved-ref: "77f8f563f35d13016aada278feb6431fcfc6731d" url: "https://github.com/threefoldtech/tfgrid-sdk-dart" source: git version: "0.1.0" diff --git a/app/pubspec.yaml b/app/pubspec.yaml index fdaf832f2..3020b6b70 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -15,21 +15,21 @@ dependencies: flutter_pkid: git: url: https://github.com/threefoldtech/threefold_connect_flutter_pkid_client - ref: master_update + ref: master tfchain_client: git: url: https://github.com/threefoldtech/tfgrid-sdk-dart - ref: development_upgrade + ref: development path: packages/tfchain_client stellar_client: git: url: https://github.com/threefoldtech/tfgrid-sdk-dart - ref: development_upgrade + ref: development path: packages/stellar_client gridproxy_client: git: url: https://github.com/threefoldtech/tfgrid-sdk-dart - ref: development_upgrade + ref: development path: packages/gridproxy_client flutter_svg: ^2.0.17 bip39: ^1.0.6 @@ -90,8 +90,6 @@ dev_dependencies: dependency_overrides: intl: ^0.19.0 - # unorm_dart: 0.3.0 - # shared_preferences_android: 2.0.12 flutter: uses-material-design: true From 56147b2a8f2dc106b5fc21915ee50c6cb951f152 Mon Sep 17 00:00:00 2001 From: ahmedhanafy725 Date: Thu, 23 Jan 2025 16:37:35 +0200 Subject: [PATCH 16/17] Remove unused config --- app/android/build.gradle | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/app/android/build.gradle b/app/android/build.gradle index 0cf2fae20..96238cfd8 100644 --- a/app/android/build.gradle +++ b/app/android/build.gradle @@ -25,18 +25,6 @@ subprojects { } } -subprojects { - afterEvaluate { project -> - if (project.plugins.hasPlugin("com.android.application") || - project.plugins.hasPlugin("com.android.library")) { - project.android { - compileSdkVersion 34 - buildToolsVersion "34.0.0" - } - } - } -} - subprojects { project.evaluationDependsOn(':app') } From ac800df0415a8c569dc181224710c4830e8dc452 Mon Sep 17 00:00:00 2001 From: ahmedhanafy725 Date: Thu, 23 Jan 2025 16:48:40 +0200 Subject: [PATCH 17/17] Revert "Remove unused config" This reverts commit 56147b2a8f2dc106b5fc21915ee50c6cb951f152. --- app/android/build.gradle | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/android/build.gradle b/app/android/build.gradle index 96238cfd8..0cf2fae20 100644 --- a/app/android/build.gradle +++ b/app/android/build.gradle @@ -25,6 +25,18 @@ subprojects { } } +subprojects { + afterEvaluate { project -> + if (project.plugins.hasPlugin("com.android.application") || + project.plugins.hasPlugin("com.android.library")) { + project.android { + compileSdkVersion 34 + buildToolsVersion "34.0.0" + } + } + } +} + subprojects { project.evaluationDependsOn(':app') }