diff --git a/lib/screens/certifications.dart b/lib/screens/certifications.dart index 7259504..f4ef126 100644 --- a/lib/screens/certifications.dart +++ b/lib/screens/certifications.dart @@ -19,9 +19,9 @@ class CertificationsScreen extends StatelessWidget { appBar: AppBar( elevation: 0, toolbarHeight: 60 * ratio, - title: const SizedBox( + title: SizedBox( height: 22, - child: Text('Certifications'), + child: Text('Certifications de $username'), )), body: SafeArea( child: Accordion( diff --git a/lib/screens/myWallets/wallet_options.dart b/lib/screens/myWallets/wallet_options.dart index aa402ec..d47834b 100644 --- a/lib/screens/myWallets/wallet_options.dart +++ b/lib/screens/myWallets/wallet_options.dart @@ -12,10 +12,12 @@ import 'package:gecko/models/wallet_data.dart'; import 'package:gecko/providers/substrate_sdk.dart'; import 'package:gecko/providers/wallet_options.dart'; import 'package:gecko/providers/wallets_profiles.dart'; +import 'package:gecko/screens/certifications.dart'; import 'package:gecko/screens/common_elements.dart'; import 'package:gecko/screens/activity.dart'; import 'package:gecko/screens/myWallets/manage_membership.dart'; import 'package:gecko/screens/qrcode_fullscreen.dart'; +import 'package:gecko/widgets/page_route_no_transition.dart'; import 'package:provider/provider.dart'; import 'package:qr_flutter/qr_flutter.dart'; @@ -143,16 +145,38 @@ class WalletOptions extends StatelessWidget { balance( context, walletProvider.address.text, 21), const SizedBox(width: 30), - Column( - crossAxisAlignment: - CrossAxisAlignment.center, - children: [ - walletOptions.idtyStatus( - context, walletOptions.address.text, - isOwner: true, color: orangeC), - getCerts(context, - walletProvider.address.text, 15), - ]), + + InkWell( + onTap: () => duniterIndexer.walletNameIndexer[ + walletProvider.address.text] != + null + ? { + Navigator.push( + context, + PageNoTransit(builder: (context) { + return CertificationsScreen( + address: walletProvider + .address.text, + username: duniterIndexer + .walletNameIndexer[ + walletProvider + .address.text]!); + }), + ), + } + : null, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + children: [ + walletOptions.idtyStatus( + context, walletOptions.address.text, + isOwner: true, color: orangeC), + getCerts(context, + walletProvider.address.text, 15), + ]), + ), + SizedBox(height: 10 * ratio), ]), const Spacer(flex: 2), diff --git a/lib/widgets/header_profile.dart b/lib/widgets/header_profile.dart index aa73ea4..ac7a028 100644 --- a/lib/widgets/header_profile.dart +++ b/lib/widgets/header_profile.dart @@ -3,6 +3,7 @@ import 'package:flutter/services.dart'; import 'package:gecko/globals.dart'; import 'package:gecko/models/widgets_keys.dart'; import 'package:gecko/providers/cesium_plus.dart'; +import 'package:gecko/providers/duniter_indexer.dart'; import 'package:gecko/providers/substrate_sdk.dart'; import 'package:gecko/providers/wallet_options.dart'; import 'package:gecko/providers/wallets_profiles.dart'; @@ -27,6 +28,7 @@ class HeaderProfile extends StatelessWidget { final walletOptions = Provider.of(context, listen: false); + final duniterIndexer = Provider.of(context, listen: false); return Stack(children: [ Consumer(builder: (context, sub, _) { @@ -75,15 +77,19 @@ class HeaderProfile extends StatelessWidget { const SizedBox(height: 10), InkWell( - onTap: () => { - Navigator.push( - context, - PageNoTransit(builder: (context) { - return CertificationsScreen( - address: address, username: ''); - }), - ), - }, + onTap: () => duniterIndexer.walletNameIndexer[address] != null + ? { + Navigator.push( + context, + PageNoTransit(builder: (context) { + return CertificationsScreen( + address: address, + username: duniterIndexer + .walletNameIndexer[address]!); + }), + ), + } + : null, child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ diff --git a/pubspec.yaml b/pubspec.yaml index dfd6eef..d3ee49d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,7 @@ description: Pay with G1. # pub.dev using `pub publish`. This is preferred for private packages. publish_to: 'none' # Remove this line if you wish to publish to pub.dev -version: 0.0.12+36 +version: 0.0.12+37 environment: sdk: '>=2.12.0 <3.0.0'