Merge branch 'main' into message-component

symbol · Nov 24, 2020 · 1324f27 · 1324f27
2 parents bb7cb9a + 7548acd
commit 1324f27
Show file tree

Hide file tree

Showing 18 changed files with 49 additions and 41 deletions.
diff --git a/src/components/tables/TableView.vue b/src/components/tables/TableView.vue
@@ -35,8 +35,8 @@ export default {
 				'namespace',
 				'namespaceName',
 				'linkedNamespace',
-				'mosaicAliasName',
-				'accountAliasName',
+				'mosaicAliasNames_',
+				'accountAliasNames_',
 				'aliasAddress',
 				'aliasMosaic',
 				'transaction',
@@ -113,7 +113,9 @@ export default {
 				'voting',
 				'addressResolutionEntries',
 				'mosaicResolutionEntries',
-				'stateHashSubCacheMerkleRoots'
+				'stateHashSubCacheMerkleRoots',
+				'accountAliasNames',
+				'mosaicAliasNames'
 			],
 			valuesToTranslate: [
 				'newRestrictionType',

diff --git a/src/components/widgets/AccountBalanceWidget.vue b/src/components/widgets/AccountBalanceWidget.vue
@@ -89,8 +89,8 @@ export default {
 		},
 
 		alias() {
-			return Constants.Message.UNAVAILABLE !== this.data.alias
-				? this.data.alias
+			return Constants.Message.UNAVAILABLE !== this.data.alias[0]
+				? this.data.alias[0]
 				: this.getNameByKey('noAlias');
 		},
 

diff --git a/src/config/i18n/en-us.json b/src/config/i18n/en-us.json
@@ -33,7 +33,7 @@
     "importance": "Importance",
     "importanceHeight": "Importance height",
     "accountType": "Account type",
-    "accountAliasName": "Alias Namespace",
+    "accountAliasNames": "Alias Namespace",
     "lastActivity": "Last Activity",
     "accounts": "Accounts",
     "blocks": "Blocks",
@@ -77,7 +77,7 @@
     "beneficiaryCount": "Beneficiary Count",
     "importanceScore": "Importance Score",
     "recalculationBlock": "Recalculation Block #",
-    "mosaicAliasName": "Alias",
+    "mosaicAliasNames": "Alias",
     "aliasMosaic": "Alias",
     "aliasAddress": "Alias",
     "metadataId": "Metadata Id",

diff --git a/src/config/i18n/es.json b/src/config/i18n/es.json
@@ -33,7 +33,7 @@
     "importance": "Valor",
     "importanceHeight": "Valor Altura",
     "accountType": "Cuentas Tipo",
-    "accountAliasName": "Alias Namespace",
+    "accountAliasNames": "Alias Namespace",
     "lastActivity": "Última actividad",
     "accounts": "Cuentas",
     "blocks": "Bloques",
@@ -77,7 +77,7 @@
     "beneficiaryCount": "Recuento de beneficiarios",
     "importanceScore": "Puntuación de importancia",
     "recalculationBlock": "Bloque de recálculo #",
-    "mosaicAliasName": "Espacio de nombres de alias",
+    "mosaicAliasNames": "Espacio de nombres de alias",
     "aliasMosaic": "Alias",
     "aliasAddress": "Alias",
     "metadataId": "Metadata Id",

diff --git a/src/config/i18n/ja.json b/src/config/i18n/ja.json
@@ -33,7 +33,7 @@
     "importance": "インポータンス",
     "importanceHeight": "インポータンスのブロック高",
     "accountType": "アカウントタイプ",
-    "accountAliasName": "エイリアス名",
+    "accountAliasNames": "エイリアス名",
     "lastActivity": "最新の活動",
     "accounts": "アカウント",
     "blocks": "ブロック",
@@ -77,7 +77,7 @@
     "beneficiaryCount": "受益数",
     "importanceScore": "重要度スコア",
     "recalculationBlock": "再計算ブロック #",
-    "mosaicAliasName": "エイリアスネームスペース",
+    "mosaicAliasNames": "エイリアスネームスペース",
     "aliasMosaic": "エイリアスモザイク",
     "aliasAddress": "エイリアスアドレス",
     "metadataId": "メタデータID",

diff --git a/src/config/i18n/pt.json b/src/config/i18n/pt.json
@@ -33,7 +33,7 @@
     "importance": "Valor",
     "importanceHeight": "Valor height",
     "accountType": "Account type",
-    "accountAliasName": "Alias Namespace",
+    "accountAliasNames": "Alias Namespace",
     "lastActivity": "ultima atividade",
     "accounts": "Accounts",
     "blocks": "Blocos",
@@ -77,7 +77,7 @@
     "beneficiaryCount": "Contagem de Beneficiários",
     "importanceScore": "Pontuação de importância",
     "recalculationBlock": "Bloco de recálculo #",
-    "mosaicAliasName": "Alias Namespace",
+    "mosaicAliasNames": "Alias Namespace",
     "aliasMosaic": "Alias",
     "aliasAddress": "Alias",
     "metadataId": "Metadata Id",

diff --git a/src/config/i18n/ru.json b/src/config/i18n/ru.json
@@ -33,7 +33,7 @@
     "importance": "Важность",
     "importanceHeight": "Высота важности",
     "accountType": "Тип аккаунта",
-    "accountAliasName": "Пространство Имен Псевдонимов",
+    "accountAliasNames": "Пространство Имен Псевдонимов",
     "lastActivity": "Последняя Активность",
     "accounts": "Аккаунты",
     "blocks": "Блоки",
@@ -77,7 +77,7 @@
     "beneficiaryCount": "Количество Бенефициаров",
     "importanceScore": "Оценка важности",
     "recalculationBlock": "Блок Пересчета #",
-    "mosaicAliasName": "Псевдоним пространства имен",
+    "mosaicAliasNames": "Псевдоним пространства имен",
     "aliasMosaic": "Псевдоним",
     "aliasAddress": "Псевдоним",
     "metadataId": "Идентификатор метаданных",

diff --git a/src/config/i18n/ua.json b/src/config/i18n/ua.json
@@ -33,7 +33,7 @@
     "importance": "Важливість",
     "importanceHeight": "Висота важливісті",
     "accountType": "Тип рахунку",
-    "accountAliasName": "Alias Namespace",
+    "accountAliasNames": "Alias Namespace",
     "lastActivity": "Остання активність",
     "accounts": "Рахунки",
     "blocks": "Блоки",
@@ -77,7 +77,7 @@
     "beneficiaryCount": "Кількість бенефіціарів",
     "importanceScore": "Оцінка важливості",
     "recalculationBlock": "Блок перерахунку №",
-    "mosaicAliasName": "Псевдонім пространства імен",
+    "mosaicAliasNames": "Псевдонім пространства імен",
     "aliasMosaic": "Псевдонім",
     "aliasAddress": "Псевдонім",
     "metadataId": "Id метаданих",

diff --git a/src/config/i18n/zh.json b/src/config/i18n/zh.json
@@ -33,7 +33,7 @@
     "importance": "重要性",
     "importanceHeight": "重要性的高度",
     "accountType": "账户类型",
-    "accountAliasName": "Alias Namespace",
+    "accountAliasNames": "Alias Namespace",
     "lastActivity": "最后活动",
     "accounts": "账户",
     "blocks": "块",
@@ -77,7 +77,7 @@
     "beneficiaryCount": "受益人计数",
     "importanceScore": "重要性分数",
     "recalculationBlock": "重新计算块 #",
-    "mosaicAliasName": "别名命名空间",
+    "mosaicAliasNames": "别名命名空间",
     "aliasMosaic": "别名",
     "aliasAddress": "别名",
     "metadataId": "元数据Id",

diff --git a/src/config/key-redirects.json b/src/config/key-redirects.json
@@ -50,8 +50,8 @@
     "namespaceId": "namespaces",
     "parentId": "namespaces",
     "linkedNamespace": "namespaces",
-    "mosaicAliasName": "namespaces",
-    "accountAliasName": "namespaces",
+    "mosaicAliasNames_": "namespaces",
+    "accountAliasNames_": "namespaces",
     "targetNamespaceId": "namespaces",
     "unresolved": "namespaces",
     "namespaceArtifactId": "namespaces",

diff --git a/src/config/pages/account-detail.json b/src/config/pages/account-detail.json
@@ -21,7 +21,7 @@
 				"pagination": "none",
 				"fields": [
 					"address",
-					"accountAliasName",
+					"accountAliasNames",
 					"addressHeight",
 					"publicKey",
 					"importance",
@@ -66,7 +66,7 @@
 				"fields": [
 					"mosaicId",
 					"amount",
-					"mosaicAliasName"
+					"mosaicAliasNames"
 				]
 			},
 			{

diff --git a/src/config/pages/account-list.json b/src/config/pages/account-list.json
@@ -24,7 +24,7 @@
                     "balance",
                     "lastActivity",
                     "importance",
-                    "accountAliasName"
+                    "accountAliasNames"
                 ],
                 "mobileFields": [
                     "address",
@@ -35,4 +35,4 @@
         ]
     }
 }
-        
+
diff --git a/src/config/pages/mosaic-detail.json b/src/config/pages/mosaic-detail.json
@@ -19,7 +19,7 @@
                 "pagination": "none",
                 "fields": [
                     "mosaicId",
-                    "mosaicAliasName",
+                    "mosaicAliasNames",
                     "divisibility",
                     "address",
                     "supply",

diff --git a/src/config/pages/mosaic-list.json b/src/config/pages/mosaic-list.json
@@ -19,15 +19,15 @@
 				"onRowClickKey": "mosaicId",
                 "fields": [
                     "mosaicId",
-                    "mosaicAliasName",
+                    "mosaicAliasNames",
                     "ownerAddress",
                     "relativeAmount",
                     "divisibility",
                     "startHeight"
                 ],
                 "mobileFields": [
                     "mosaicId",
-                    "mosaicAliasName",
+                    "mosaicAliasNames",
                     "ownerAddress"
                 ]
             }

diff --git a/src/infrastructure/AccountService.js b/src/infrastructure/AccountService.js
@@ -94,7 +94,7 @@ class AccountService {
   			...account,
   			balance: helper.getNetworkCurrencyBalance(account.mosaics),
   			lastActivity: helper.getLastActivityHeight(account.activityBucket),
-  			accountAliasName: this.extractAccountNamespace(account, accountNames)
+  			accountAliasNames: this.extractAccountNamespace(account, accountNames)
   		}))
   	};
   }
@@ -120,7 +120,7 @@ class AccountService {
   			...accountInfo.supplementalPublicKeys,
   			voting: Array.isArray(accountInfo.supplementalPublicKeys.voting) ? accountInfo.supplementalPublicKeys.voting.map(voting => voting.publicKey) : accountInfo.supplementalPublicKeys.voting
   		},
-  		accountAliasName: this.extractAccountNamespace(accountInfo, accountNames)
+  		accountAliasNames: this.extractAccountNamespace(accountInfo, accountNames)
   	};
   }
 
@@ -416,9 +416,12 @@ class AccountService {
    */
   static extractAccountNamespace = (accountInfo, accountNames) => {
   	let accountName = accountNames.find((name) => name.address === accountInfo.address);
-  	const name = accountName.names.length > 0 ? accountName.names[0].name : Constants.Message.UNAVAILABLE;
 
-  	return name;
+	  const aliasNames = accountName.names.map(names => names.name);
+
+	const names = aliasNames.length > 0 ? aliasNames : [Constants.Message.UNAVAILABLE];
+
+	return names;
   }
 
 	/**

diff --git a/src/infrastructure/MosaicService.js b/src/infrastructure/MosaicService.js
@@ -94,7 +94,7 @@ class MosaicService {
 
    	return {
    		...mosaicInfo,
-   		mosaicAliasName: this.extractMosaicNamespace(mosaicInfo, mosaicNames),
+   		mosaicAliasNames: this.extractMosaicNamespace(mosaicInfo, mosaicNames),
    		expiredInBlock: expiredInBlock === mosaicInfo.startHeight ? Constants.Message.INFINITY : expiredInBlock
    	};
    }
@@ -123,7 +123,7 @@ class MosaicService {
    		data: mosaicInfos.data.map(mosaic => ({
    			...mosaic,
    			ownerAddress: mosaic.address,
-   			mosaicAliasName: this.extractMosaicNamespace(mosaic, mosaicNames)
+   			mosaicAliasNames: this.extractMosaicNamespace(mosaic, mosaicNames)
    		}))
    	};
    }
@@ -141,7 +141,7 @@ class MosaicService {
 
    	return mosaicAmountViewInfos.map(mosaicAmountViewInfo => ({
    		...mosaicAmountViewInfo,
-   		mosaicAliasName: this.extractMosaicNamespace(mosaicAmountViewInfo, mosaicNames)
+   		mosaicAliasNames: this.extractMosaicNamespace(mosaicAmountViewInfo, mosaicNames)
    	}));
    }
 
@@ -270,13 +270,16 @@ class MosaicService {
     * Extract Name for Mosaic
     * @param mosaicInfo - mosaicInfo DTO
     * @param mosaicNames - MosaicNames[]
-    * @returns mosaicName
+    * @returns mosaicNames
     */
    static extractMosaicNamespace = (mosaicInfo, mosaicNames) => {
-   	let mosaicName = mosaicNames.find((name) => name.mosaicId === mosaicInfo.mosaicId);
-   	const name = mosaicName.names.length > 0 ? mosaicName.names[0].name : Constants.Message.UNAVAILABLE;
+   	const mosaicName = mosaicNames.find((name) => name.mosaicId === mosaicInfo.mosaicId);
 
-   	return name;
+   	const aliasNames = mosaicName.names.map(names => names.name);
+
+   	const names = aliasNames.length > 0 ? aliasNames : [Constants.Message.UNAVAILABLE];
+
+   	return names;
    }
 }
 

diff --git a/src/infrastructure/http.js b/src/infrastructure/http.js
@@ -51,7 +51,7 @@ export default class http {
   }
 
   static get networkCurrency() {
-  	const networkNamespace = NETWORK_CURRECY?.mosaicAliasName.toLowerCase() || globalConfig.networkConfig.namespaceName.toLowerCase();
+  	const networkNamespace = NETWORK_CURRECY?.mosaicAliasNames[0].toUpperCase() || globalConfig.networkConfig.namespaceName.toUpperCase();
 
   	return {
   		namespaceName: networkNamespace,

diff --git a/src/store/account.js b/src/store/account.js
@@ -140,7 +140,7 @@ export default {
 		balanceWidget: (state, getters) => ({
 			address: new Address(state.currentAccountAddress).pretty(),
 			balance: getters.OwnedMosaic?.data[0]?.amount || 0,
-			alias: getters.info?.data?.accountAliasName /* || Constants.Message.UNAVAILABLE */
+			alias: getters.info?.data?.accountAliasNames /* || Constants.Message.UNAVAILABLE */
 		})
 	},
 	mutations: {