fix: null username on payments

This commit is contained in:
poka 2023-04-12 03:10:02 +02:00
parent 5b04c5b19e
commit c316c0d630
4 changed files with 18 additions and 12 deletions

View File

@ -344,7 +344,11 @@ class _WalletsHomeState extends State<WalletsHome> {
.getWalletDataByAddress(senderAddress);
await sub.setCurrentWallet(walletData!);
sub.reload();
paymentPopup(context, repository.address);
paymentPopup(
context,
repository.address,
g1WalletsBox.get(repository.address)!.username ??
repository.name!);
},
onMove: (details) {
if (repository.address != myWalletProvider.lastFlyBy) {

View File

@ -53,6 +53,8 @@ class WalletViewScreen extends StatelessWidget {
walletProfile.address = address;
sub.setCurrentWallet(defaultWallet);
log.d("username: $username");
return Scaffold(
backgroundColor: backgroundColor,
resizeToAvoidBottomInset: true,
@ -359,7 +361,7 @@ class WalletViewScreen extends StatelessWidget {
splashColor: yellowC,
onTap: sub.nodeConnected
? () {
paymentPopup(context, address);
paymentPopup(context, address, username);
}
: null,
child: const Padding(
@ -418,7 +420,7 @@ class WalletViewScreen extends StatelessWidget {
}
}
void paymentPopup(BuildContext context, String toAddress) {
void paymentPopup(BuildContext context, String toAddress, String username) {
final walletViewProvider =
Provider.of<WalletsProfilesProvider>(context, listen: false);
@ -426,13 +428,11 @@ void paymentPopup(BuildContext context, String toAddress) {
Provider.of<MyWalletsProvider>(context, listen: false);
const double shapeSize = 20;
WalletData? defaultWallet = myWalletProvider.getDefaultWallet();
final defaultWallet = myWalletProvider.getDefaultWallet();
log.d(defaultWallet.address);
bool canValidate = false;
final toWalletData = myWalletProvider.getWalletDataByAddress(toAddress);
Future executeTransfert() async {
String? pin;
if (myWalletProvider.pinCode == '') {
@ -582,7 +582,10 @@ void paymentPopup(BuildContext context, String toAddress) {
),
padding: const EdgeInsets.all(10),
child: Row(children: [
Text(defaultWallet.name!),
Text(g1WalletsBox
.get(defaultWallet.address)
?.username ??
defaultWallet.name!),
const Spacer(),
Balance(address: defaultWallet.address, size: 20),
]),
@ -604,9 +607,9 @@ void paymentPopup(BuildContext context, String toAddress) {
children: [
const SizedBox(height: 2),
Text(
toWalletData == null
username == ''
? getShortPubkey(toAddress)
: toWalletData.name!,
: username,
style: const TextStyle(
fontSize: 21,
fontWeight: FontWeight.w600,

View File

@ -124,7 +124,7 @@ class SearchIdentityQuery extends StatelessWidget {
walletsProfiles.address = profile['pubkey'];
return WalletViewScreen(
address: profile['pubkey'],
username: name,
username: profile['name'] ?? '',
avatar:
g1WalletsBox.get(profile['pubkey'])?.avatar,
);

View File

@ -100,8 +100,7 @@ class SearchResult extends StatelessWidget {
walletsProfilesClass.address = g1Wallet.address;
return WalletViewScreen(
address: g1Wallet.address,
username:
duniterIndexer.walletNameIndexer[g1Wallet.address] ?? '',
username: g1WalletsBox.get(g1Wallet)!.username ?? '',
avatar: g1WalletsBox.get(g1Wallet.address)?.avatar,
);
}),