Cw-58: Show subaddress label on the transaction details page (#333)

* CW-58: Show subaddress label on the transaction details page * add translations * Fix interface
2024-12-22 19:49:22 +00:00 · 2022-04-12 17:38:47 +02:00 · 2022-04-12 17:38:47 +02:00 · 135ede6a78
commit 135ede6a78
parent 04db28e276
23 changed files with 69 additions and 13 deletions
--- a/cw_monero/ios/Classes/monero_api.cpp
+++ b/cw_monero/ios/Classes/monero_api.cpp
@ -766,6 +766,11 @@ extern "C"
        return strdup(m_wallet->getTxKey(std::string(txId)).c_str());
    }

+    char *get_subaddress_label(uint32_t accountIndex, uint32_t addressIndex)
+    {
+        return strdup(get_current_wallet()->getSubaddressLabel(accountIndex, addressIndex).c_str());
+    }
+
 #ifdef __cplusplus
 }
 #endif
--- a/cw_monero/lib/api/signatures.dart
+++ b/cw_monero/lib/api/signatures.dart
@ -120,3 +120,7 @@ typedef close_current_wallet = Void Function();
 typedef on_startup = Void Function();

 typedef rescan_blockchain = Void Function();
+
+typedef get_subaddress_label = Pointer<Utf8> Function(
+    Int32 accountIndex,
+    Int32 addressIndex);
--- a/cw_monero/lib/api/types.dart
+++ b/cw_monero/lib/api/types.dart
@ -118,3 +118,7 @@ typedef CloseCurrentWallet = void Function();
 typedef OnStartup = void Function();

 typedef RescanBlockchainAsync = void Function();
+
+typedef GetSubaddressLabel = Pointer<Utf8> Function(
+    int accountIndex,
+    int addressIndex);
--- a/cw_monero/lib/api/wallet.dart
+++ b/cw_monero/lib/api/wallet.dart
@ -112,6 +112,10 @@ final rescanBlockchainAsyncNative = moneroApi
    .lookup<NativeFunction<rescan_blockchain>>('rescan_blockchain')
    .asFunction<RescanBlockchainAsync>();

+final getSubaddressLabelNative = moneroApi
+    .lookup<NativeFunction<get_subaddress_label>>('get_subaddress_label')
+    .asFunction<GetSubaddressLabel>();
+
 int getSyncingHeight() => getSyncingHeightNative();

 bool isNeededToRefresh() => isNeededToRefreshNative() != 0;
@ -327,3 +331,7 @@ Future<bool> isConnected() => compute(_isConnected, 0);
 Future<int> getNodeHeight() => compute(_getNodeHeight, 0);

 void rescanBlockchainAsync() => rescanBlockchainAsyncNative();
+
+String getSubaddressLabel(int accountIndex, int addressIndex) {
+  return convertUTF8ToString(pointer: getSubaddressLabelNative(accountIndex, addressIndex));
+}
--- a/cw_monero/lib/monero_wallet.dart
+++ b/cw_monero/lib/monero_wallet.dart
@ -314,6 +314,10 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
    }
  }

+  String getSubaddressLabel(int accountIndex, int addressIndex) {
+    return monero_wallet.getSubaddressLabel(accountIndex, addressIndex);
+  }
+
  List<MoneroTransactionInfo> _getAllTransactions(dynamic _) =>
      monero_transaction_history
          .getAllTransations()
--- a/lib/monero/cw_monero.dart
+++ b/lib/monero/cw_monero.dart
@ -294,4 +294,9 @@ class CWMonero extends Monero {
 		final moneroWallet = wallet as MoneroWallet;
 		return moneroWallet.getTransactionAddress(accountIndex, addressIndex);
 	}
+
+	String getSubaddressLabel(Object wallet, int accountIndex, int addressIndex) {
+		final moneroWallet = wallet as MoneroWallet;
+		return moneroWallet.getSubaddressLabel(accountIndex, addressIndex);
+	}
 }
--- a/lib/view_model/transaction_details_view_model.dart
+++ b/lib/view_model/transaction_details_view_model.dart
@ -60,6 +60,7 @@ abstract class TransactionDetailsViewModelBase with Store {
          addressIndex != null) {
        try {
          final address = monero.getTransactionAddress(wallet, accountIndex, addressIndex);
+          final label = monero.getSubaddressLabel(wallet, accountIndex, addressIndex);

          if (address?.isNotEmpty ?? false) {
            isRecipientAddressShown = true;
@ -68,6 +69,14 @@ abstract class TransactionDetailsViewModelBase with Store {
                    title: S.current.transaction_details_recipient_address,
                    value: address));
          }
+
+          if (label?.isNotEmpty ?? false) {
+            _items.add(
+                StandartListItem(
+                  title: S.current.address_label,
+                  value: label)
+            );
+          }
        } catch (e) {
          print(e.toString());
        }
--- a/res/values/strings_de.arb
+++ b/res/values/strings_de.arb
@ -268,6 +268,7 @@
  "new_subaddress_label_name" : "Bezeichnung",
  "new_subaddress_create" : "Erstellen",

+  "address_label" : "Address label",

  "subaddress_title" : "Unteradressenliste",

--- a/res/values/strings_en.arb
+++ b/res/values/strings_en.arb
@ -268,6 +268,7 @@
  "new_subaddress_label_name" : "Label name",
  "new_subaddress_create" : "Create",

+  "address_label" : "Address label",

  "subaddress_title" : "Subaddress list",

--- a/res/values/strings_es.arb
+++ b/res/values/strings_es.arb
@ -268,6 +268,7 @@
  "new_subaddress_label_name" : "Nombre de etiqueta",
  "new_subaddress_create" : "Crear",

+  "address_label" : "Address label",

  "subaddress_title" : "Lista de subdirecciones",

--- a/res/values/strings_fr.arb
+++ b/res/values/strings_fr.arb
@ -266,6 +266,7 @@
  "new_subaddress_label_name" : "Nom",
  "new_subaddress_create" : "Créer",

+  "address_label" : "Address label",

  "subaddress_title" : "Liste des sous-adresses",

--- a/res/values/strings_hi.arb
+++ b/res/values/strings_hi.arb
@ -268,6 +268,7 @@
  "new_subaddress_label_name" : "लेबल का नाम",
  "new_subaddress_create" : "सर्जन करना",

+  "address_label" : "Address label",

  "subaddress_title" : "उपखंड सूची",

--- a/res/values/strings_hr.arb
+++ b/res/values/strings_hr.arb
@ -268,6 +268,7 @@
  "new_subaddress_label_name" : "Oznaka",
  "new_subaddress_create" : "Izradi",

+  "address_label" : "Address label",

  "subaddress_title" : "Lista podadresa",

--- a/res/values/strings_it.arb
+++ b/res/values/strings_it.arb
@ -268,6 +268,7 @@
  "new_subaddress_label_name" : "Nome etichetta",
  "new_subaddress_create" : "Crea",

+  "address_label" : "Address label",

  "subaddress_title" : "Lista sottoindirizzi",

--- a/res/values/strings_ja.arb
+++ b/res/values/strings_ja.arb
@ -268,6 +268,7 @@
  "new_subaddress_label_name" : "ラベル名",
  "new_subaddress_create" : "作成する",

+  "address_label" : "Address label",

  "subaddress_title" : "サブアドレス一覧",

--- a/res/values/strings_ko.arb
+++ b/res/values/strings_ko.arb
@ -268,6 +268,7 @@
  "new_subaddress_label_name" : "라벨 이름",
  "new_subaddress_create" : "몹시 떠들어 대다",

+  "address_label" : "Address label",

  "subaddress_title" : "하위 주소 목록",

--- a/res/values/strings_nl.arb
+++ b/res/values/strings_nl.arb
@ -268,6 +268,7 @@
  "new_subaddress_label_name" : "Label naam",
  "new_subaddress_create" : "Creëren",

+  "address_label" : "Address label",

  "subaddress_title" : "Subadreslijst",

--- a/res/values/strings_pl.arb
+++ b/res/values/strings_pl.arb
@ -271,6 +271,7 @@
  "new_subaddress_label_name" : "Nazwa etykiety",
  "new_subaddress_create" : "Stwórz",

+  "address_label" : "Address label",

  "subaddress_title" : "Lista podadresów",

--- a/res/values/strings_pt.arb
+++ b/res/values/strings_pt.arb
@ -268,6 +268,7 @@
  "new_subaddress_label_name" : "Nome",
  "new_subaddress_create" : "Criar",

+  "address_label" : "Address label",

  "subaddress_title" : "Sub-endereços",

--- a/res/values/strings_ru.arb
+++ b/res/values/strings_ru.arb
@ -268,6 +268,7 @@
  "new_subaddress_label_name" : "Имя",
  "new_subaddress_create" : "Создать",

+  "address_label" : "Address label",

  "subaddress_title" : "Список субадресов",

--- a/res/values/strings_uk.arb
+++ b/res/values/strings_uk.arb
@ -267,6 +267,7 @@
  "new_subaddress_label_name" : "Ім'я",
  "new_subaddress_create" : "Створити",

+  "address_label" : "Address label",

  "subaddress_title" : "Список Субадрес",

--- a/res/values/strings_zh.arb
+++ b/res/values/strings_zh.arb
@ -268,6 +268,7 @@
  "new_subaddress_label_name" : "标签名称",
  "new_subaddress_create" : "创建",

+  "address_label" : "Address label",

  "subaddress_title" : "子地址列表",

--- a/tool/configure.dart
+++ b/tool/configure.dart
@ -209,6 +209,8 @@ abstract class Monero {

  String getTransactionAddress(Object wallet, int accountIndex, int addressIndex);

+  String getSubaddressLabel(Object wallet, int accountIndex, int addressIndex);
+
  int getHeigthByDate({DateTime date});
  TransactionPriority getDefaultTransactionPriority();
  TransactionPriority deserializeMoneroTransactionPriority({int raw});