chain network name display fixed

2025-12-24 18:17:35 +01:00
parent 5836292adb
commit 9e6d530385
24 changed files with 143 additions and 78 deletions
--- a/frontend/pshared/lib/data/mapper/payment/enums.dart
+++ b/frontend/pshared/lib/data/mapper/payment/enums.dart
@@ -83,7 +83,9 @@ String fxSideToValue(FxSide side) {
 }

 ChainNetwork chainNetworkFromValue(String? value) {
-  switch (value) {
+  final raw = value ?? '';
+  final normalized = _normalizeChainNetwork(raw);
+  switch (normalized) {
    case 'ethereum_mainnet':
      return ChainNetwork.ethereumMainnet;
    case 'arbitrum_one':
@@ -95,7 +97,7 @@ ChainNetwork chainNetworkFromValue(String? value) {
    case 'unspecified':
      return ChainNetwork.unspecified;
    default:
-      throw ArgumentError('Unknown ChainNetwork value: $value');
+      throw ArgumentError('Unknown ChainNetwork value: $raw');
  }
 }

@@ -114,6 +116,19 @@ String chainNetworkToValue(ChainNetwork chain) {
  }
 }

+String _normalizeChainNetwork(String value) {
+  final trimmed = value.trim();
+  if (trimmed.isEmpty) {
+    return 'unspecified';
+  }
+  final lower = trimmed.toLowerCase();
+  const prefix = 'chain_network_';
+  if (lower.startsWith(prefix)) {
+    return lower.substring(prefix.length);
+  }
+  return lower;
+}
+
 InsufficientNetPolicy insufficientNetPolicyFromValue(String? value) {
  switch (value) {
    case 'block_posting':
--- a/frontend/pshared/lib/data/mapper/wallet/asset.dart
+++ b/frontend/pshared/lib/data/mapper/wallet/asset.dart
@@ -0,0 +1,20 @@
+import 'package:pshared/data/dto/wallet/asset.dart';
+import 'package:pshared/data/mapper/payment/enums.dart';
+import 'package:pshared/models/wallet/wallet.dart';
+
+
+extension WalletAssetDTOMapper on WalletAssetDTO {
+  WalletAsset toDomain() => WalletAsset(
+    chain: chainNetworkFromValue(chain),
+    tokenSymbol: tokenSymbol,
+    contractAddress: contractAddress,
+  );
+}
+
+extension WalletAssetMapper on WalletAsset {
+  WalletAssetDTO toDTO() => WalletAssetDTO(
+    chain: chainNetworkToValue(chain),
+    tokenSymbol: tokenSymbol,
+    contractAddress: contractAddress,
+  );
+}
--- a/frontend/pshared/lib/data/mapper/wallet/wallet.dart
+++ b/frontend/pshared/lib/data/mapper/wallet/wallet.dart
@@ -1,21 +1,17 @@
 import 'package:pshared/data/dto/wallet/balance.dart';
 import 'package:pshared/data/dto/wallet/wallet.dart';
+import 'package:pshared/data/mapper/wallet/asset.dart';
 import 'package:pshared/data/mapper/wallet/balance.dart';
 import 'package:pshared/data/mapper/wallet/money.dart';
 import 'package:pshared/models/describable.dart';
 import 'package:pshared/models/wallet/wallet.dart';

-
 extension WalletDTOMapper on WalletDTO {
  WalletModel toDomain({WalletBalanceDTO? balance}) => WalletModel(
    walletRef: walletRef,
    organizationRef: organizationRef,
    ownerRef: ownerRef,
-    asset: WalletAsset(
-      chain: asset.chain,
-      tokenSymbol: asset.tokenSymbol,
-      contractAddress: asset.contractAddress,
-    ),
+    asset: asset.toDomain(),
    depositAddress: depositAddress,
    status: status,
    metadata: metadata,
@@ -24,7 +20,7 @@ extension WalletDTOMapper on WalletDTO {
    balance: balance?.toDomain(),
    availableMoney: balance?.available?.toDomain(),
    describable: newDescribable(
-      name: name.isNotEmpty ? name : (metadata?['name'] ?? 'Crypto Wallet'),
+      name: name.isNotEmpty ? name : (metadata?['name']?.toString() ?? ''),
      description: (description != null && description!.isNotEmpty)
        ? description
        : metadata?['description'],
--- a/frontend/pshared/lib/models/wallet/wallet.dart
+++ b/frontend/pshared/lib/models/wallet/wallet.dart
@@ -1,10 +1,11 @@
+import 'package:pshared/models/describable.dart';
+import 'package:pshared/models/payment/chain_network.dart';
 import 'package:pshared/models/wallet/balance.dart';
 import 'package:pshared/models/wallet/money.dart';
-import 'package:pshared/models/describable.dart';


 class WalletAsset {
-  final String chain;
+  final ChainNetwork chain;
  final String tokenSymbol;
  final String contractAddress;

--- a/frontend/pweb/lib/data/mappers/wallet_ui.dart
+++ b/frontend/pweb/lib/data/mappers/wallet_ui.dart
@@ -1,9 +1,8 @@
+import 'package:pshared/models/currency.dart';
 import 'package:pshared/models/wallet/wallet.dart' as domain;

-import 'package:pshared/models/currency.dart';
 import 'package:pweb/models/wallet.dart';

-
 extension WalletUiMapper on domain.WalletModel {
  Wallet toUi() {
    final amountStr = availableMoney?.amount ?? balance?.available?.amount ?? '0';
--- a/frontend/pweb/lib/models/wallet.dart
+++ b/frontend/pweb/lib/models/wallet.dart
@@ -1,6 +1,6 @@
 import 'package:pshared/models/currency.dart';
 import 'package:pshared/models/describable.dart';
-
+import 'package:pshared/models/payment/chain_network.dart';

 class Wallet implements Describable {
  final String id;
@@ -10,7 +10,7 @@ class Wallet implements Describable {
  final bool isHidden;
  final DateTime calculatedAt;
  final String? depositAddress;
-  final String? network;
+  final ChainNetwork? network;
  final String? tokenSymbol;
  final String? contractAddress;
  final Describable describable;
@@ -42,7 +42,7 @@ class Wallet implements Describable {
    String? walletUserID,
    bool? isHidden,
    String? depositAddress,
-    String? network,
+    ChainNetwork? network,
    String? tokenSymbol,
    String? contractAddress,
    Describable? describable,
--- a/frontend/pweb/lib/pages/2fa/resend.dart
+++ b/frontend/pweb/lib/pages/2fa/resend.dart
@@ -2,9 +2,10 @@ import 'package:flutter/material.dart';

 import 'package:provider/provider.dart';

-import 'package:pweb/generated/i18n/app_localizations.dart';
 import 'package:pweb/providers/two_factor.dart';

+import 'package:pweb/generated/i18n/app_localizations.dart';
+

 class ResendCodeButton extends StatelessWidget {
  const ResendCodeButton({super.key});
--- a/frontend/pweb/lib/pages/address_book/form/view.dart
+++ b/frontend/pweb/lib/pages/address_book/form/view.dart
@@ -1,16 +1,16 @@
 import 'package:flutter/material.dart';
-import 'package:pshared/models/payment/methods/data.dart';

+import 'package:pshared/models/payment/methods/data.dart';
 import 'package:pshared/models/payment/type.dart';
 import 'package:pshared/models/recipient/status.dart';
 import 'package:pshared/models/recipient/type.dart';

-import 'package:pweb/utils/payment/label.dart';
 import 'package:pweb/pages/address_book/form/method_tile.dart';
 import 'package:pweb/pages/address_book/form/widgets/button.dart';
 import 'package:pweb/pages/address_book/form/widgets/email_field.dart';
 import 'package:pweb/pages/address_book/form/widgets/header.dart';
 import 'package:pweb/pages/address_book/form/widgets/name_field.dart';
+import 'package:pweb/utils/payment/label.dart';

 import 'package:pweb/generated/i18n/app_localizations.dart';

--- a/frontend/pweb/lib/pages/dashboard/buttons/balance/header.dart
+++ b/frontend/pweb/lib/pages/dashboard/buttons/balance/header.dart
@@ -1,8 +1,12 @@
 import 'package:flutter/material.dart';

+import 'package:pshared/models/payment/chain_network.dart';
+import 'package:pshared/utils/l10n/chain.dart';
+
+import 'package:pweb/generated/i18n/app_localizations.dart';

 class BalanceHeader extends StatelessWidget {
-  final String? walletNetwork;
+  final ChainNetwork? walletNetwork;
  final String? tokenSymbol;

  const BalanceHeader({
@@ -15,14 +19,33 @@ class BalanceHeader extends StatelessWidget {
  Widget build(BuildContext context) {
    final textTheme = Theme.of(context).textTheme;
    final colorScheme = Theme.of(context).colorScheme;
+    final loc = AppLocalizations.of(context)!;
    final symbol = tokenSymbol?.trim();
+    final networkLabel = (walletNetwork == null || walletNetwork == ChainNetwork.unspecified)
+        ? null
+        : walletNetwork!.localizedName(context);

    return Row(
      children: [
-        Text(
-          'Crypto Wallet',
-          style: textTheme.titleMedium?.copyWith(
-            color: colorScheme.onSurface,
+        Expanded(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                loc.paymentTypeCryptoWallet,
+                style: textTheme.titleMedium?.copyWith(
+                  color: colorScheme.onSurface,
+                ),
+              ),
+              if (networkLabel != null)
+                Text(
+                  networkLabel,
+                  style: textTheme.bodySmall?.copyWith(
+                    color: colorScheme.onSurfaceVariant,
+                    fontWeight: FontWeight.w500,
+                  ),
+                ),
+            ],
          ),
        ),
        if (symbol != null && symbol.isNotEmpty) ...[
--- a/frontend/pweb/lib/pages/payment_methods/add/method_selector.dart
+++ b/frontend/pweb/lib/pages/payment_methods/add/method_selector.dart
@@ -2,9 +2,10 @@ import 'package:flutter/material.dart';

 import 'package:pshared/models/payment/type.dart';

-import 'package:pweb/generated/i18n/app_localizations.dart';
 import 'package:pweb/utils/payment/label.dart';

+import 'package:pweb/generated/i18n/app_localizations.dart';
+

 class PaymentMethodTypeSelector extends StatelessWidget {
  final PaymentType? value;
--- a/frontend/pweb/lib/pages/payment_methods/add/russian_bank.dart
+++ b/frontend/pweb/lib/pages/payment_methods/add/russian_bank.dart
@@ -2,9 +2,10 @@ import 'package:flutter/material.dart';

 import 'package:pshared/models/payment/methods/russian_bank.dart';

-import 'package:pweb/generated/i18n/app_localizations.dart';
 import 'package:pweb/utils/text_field_styles.dart';

+import 'package:pweb/generated/i18n/app_localizations.dart';
+

 class RussianBankForm extends StatefulWidget {
  final void Function(RussianBankAccountPaymentMethod) onChanged;
--- a/frontend/pweb/lib/pages/payment_methods/add/wallet.dart
+++ b/frontend/pweb/lib/pages/payment_methods/add/wallet.dart
@@ -2,9 +2,10 @@ import 'package:flutter/material.dart';

 import 'package:pshared/models/payment/methods/wallet.dart';

-import 'package:pweb/generated/i18n/app_localizations.dart';
 import 'package:pweb/utils/text_field_styles.dart';

+import 'package:pweb/generated/i18n/app_localizations.dart';
+

 class WalletForm extends StatefulWidget {
  final void Function(WalletPaymentMethod) onChanged;
--- a/frontend/pweb/lib/pages/payment_methods/widgets/section_title.dart
+++ b/frontend/pweb/lib/pages/payment_methods/widgets/section_title.dart
@@ -7,12 +7,10 @@ class SectionTitle extends StatelessWidget {
  const SectionTitle(this.title, {super.key});

  @override
-  Widget build(BuildContext context) {
-    return Text(
-      title,
-      style: Theme.of(context).textTheme.titleMedium?.copyWith(
-            fontWeight: FontWeight.w600,
-          ),
-    );
-  }
+  Widget build(BuildContext context) => Text(
+    title,
+    style: Theme.of(context).textTheme.titleMedium?.copyWith(
+      fontWeight: FontWeight.w600,
+    ),
+  );
 }
--- a/frontend/pweb/lib/pages/payout_page/wallet/card.dart
+++ b/frontend/pweb/lib/pages/payout_page/wallet/card.dart
@@ -3,12 +3,13 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';

 import 'package:pshared/utils/currency.dart';
-import 'package:pweb/generated/i18n/app_localizations.dart';

 import 'package:pweb/models/wallet.dart';
 import 'package:pweb/pages/dashboard/buttons/balance/amount.dart';
 import 'package:pweb/providers/wallets.dart';

+import 'package:pweb/generated/i18n/app_localizations.dart';
+

 class WalletCard extends StatelessWidget {
  final Wallet wallet;
--- a/frontend/pweb/lib/pages/payout_page/wallet/edit/buttons/top_up.dart
+++ b/frontend/pweb/lib/pages/payout_page/wallet/edit/buttons/top_up.dart
@@ -5,6 +5,7 @@ import 'package:provider/provider.dart';
 import 'package:pweb/app/router/payout_routes.dart';
 import 'package:pweb/providers/wallets.dart';
 import 'package:pweb/widgets/sidebar/destinations.dart';
+
 import 'package:pweb/generated/i18n/app_localizations.dart';


--- a/frontend/pweb/lib/pages/payout_page/wallet/edit/header.dart
+++ b/frontend/pweb/lib/pages/payout_page/wallet/edit/header.dart
@@ -4,6 +4,8 @@ import 'package:provider/provider.dart';

 import 'package:pweb/providers/wallets.dart';

+import 'package:pweb/generated/i18n/app_localizations.dart';
+

 class WalletEditHeader extends StatelessWidget {
  const WalletEditHeader({super.key});
@@ -12,6 +14,7 @@ class WalletEditHeader extends StatelessWidget {
  Widget build(BuildContext context) {
    final provider = context.watch<WalletsProvider>();
    final wallet = provider.selectedWallet;
+    final loc = AppLocalizations.of(context)!;

    if (wallet == null) {
      return const SizedBox.shrink();
@@ -29,7 +32,7 @@ class WalletEditHeader extends StatelessWidget {
            spacing: 4,
            children: [
              Text(
-                'Crypto Wallet',
+                loc.paymentTypeCryptoWallet,
                style: theme.textTheme.headlineMedium!.copyWith(
                  fontWeight: FontWeight.bold,
                ),
--- a/frontend/pweb/lib/pages/payout_page/wallet/wigets.dart
+++ b/frontend/pweb/lib/pages/payout_page/wallet/wigets.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';

 import 'package:provider/provider.dart';
-import 'package:pweb/models/wallet.dart';

+import 'package:pweb/models/wallet.dart';
 import 'package:pweb/pages/payout_page/wallet/card.dart';
 import 'package:pweb/providers/wallets.dart';

--- a/frontend/pweb/lib/pages/settings/widgets/base.dart
+++ b/frontend/pweb/lib/pages/settings/widgets/base.dart
@@ -1,8 +1,9 @@
 import 'package:flutter/material.dart';

-import 'package:flutter_settings_ui/flutter_settings_ui.dart';
 import 'package:provider/provider.dart';

+import 'package:flutter_settings_ui/flutter_settings_ui.dart';
+
 import 'package:pweb/models/edit_state.dart';
 import 'package:pweb/utils/error/snackbar.dart';

--- a/frontend/pweb/lib/pages/settings/widgets/pick.dart
+++ b/frontend/pweb/lib/pages/settings/widgets/pick.dart
@@ -1,8 +1,9 @@
 import 'package:flutter/material.dart';

-import 'package:pweb/generated/i18n/app_localizations.dart';
 import 'package:pweb/pages/settings/widgets/base.dart';

+import 'package:pweb/generated/i18n/app_localizations.dart';
+

 const _kSearchThreshold = 12;

--- a/frontend/pweb/lib/pages/wallet_top_up/content.dart
+++ b/frontend/pweb/lib/pages/wallet_top_up/content.dart
@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';

+import 'package:pshared/models/payment/chain_network.dart';
 import 'package:pshared/utils/currency.dart';
+import 'package:pshared/utils/l10n/chain.dart';

 import 'package:pweb/models/wallet.dart';
 import 'package:pweb/pages/wallet_top_up/details.dart';
@@ -25,7 +27,10 @@ class WalletTopUpContent extends StatelessWidget {
    final theme = Theme.of(context);

    final address = _resolveAddress(wallet);
-    final network = wallet.network?.trim();
+    final network = wallet.network;
+    final networkLabel = (network == null || network == ChainNetwork.unspecified)
+      ? null
+      : network.localizedName(context);
    final assetLabel = wallet.tokenSymbol ?? currencyCodeToSymbol(wallet.currency);

    return Align(
@@ -51,7 +56,7 @@ class WalletTopUpContent extends StatelessWidget {
                    SizedBox(height: dimensions.paddingLarge),
                    WalletTopUpMeta(
                      assetLabel: assetLabel,
-                      network: network,
+                      network: networkLabel,
                      walletId: wallet.walletUserID,
                    ),
                    SizedBox(height: dimensions.paddingXLarge),
--- a/frontend/pweb/lib/pages/wallet_top_up/header.dart
+++ b/frontend/pweb/lib/pages/wallet_top_up/header.dart
@@ -20,7 +20,7 @@ class WalletTopUpHeader extends StatelessWidget {
    final symbol = tokenSymbol?.trim();

    final subtitle = [
-      'Crypto Wallet',
+      loc.paymentTypeCryptoWallet,
      if (symbol != null && symbol.isNotEmpty) symbol,
    ].join(' · ');