@@ -80,7 +74,7 @@ export default {
},
balance() {
- return this.data.balance || '0';
+ return this.data.mosaic?.amount || '0';
},
address() {
@@ -94,7 +88,16 @@ export default {
},
mosaicName() {
- return this.data.mosaicName || 'XYM';
+ const mosaicAlias = this.data.mosaic?.mosaicAliasNames[0];
+
+ if (mosaicAlias) {
+ const mosaicNamespaces = mosaicAlias.split('.');
+ const mosaicLastSubnamespace = mosaicNamespaces.pop();
+
+ return mosaicLastSubnamespace;
+ }
+
+ return this.data.mosaic?.mosaicId || 'Network Currency';
},
loading() {
@@ -164,11 +167,7 @@ export default {
justify-content: space-between;
.account-icon {
- border: 1px solid var(--clickable-text);
margin-right: 20px;
- background: var(--sub-card-bg);
- border-radius: 50%;
- padding: 10px;
}
.address {
@@ -182,6 +181,7 @@ export default {
.mosaic {
font-size: 1.5rem;
line-height: 2.25rem;
+ text-transform: uppercase;
}
.balance {
diff --git a/src/components/widgets/TransactionGraphicWidget.vue b/src/components/widgets/TransactionGraphicWidget.vue
index 591fb81b5..c83332217 100644
--- a/src/components/widgets/TransactionGraphicWidget.vue
+++ b/src/components/widgets/TransactionGraphicWidget.vue
@@ -77,6 +77,7 @@ export default {
TransactionType.SECRET_LOCK,
TransactionType.MOSAIC_DEFINITION,
TransactionType.MOSAIC_SUPPLY_CHANGE,
+ TransactionType.MOSAIC_SUPPLY_REVOCATION,
TransactionType.AGGREGATE_COMPLETE,
TransactionType.AGGREGATE_BONDED,
TransactionType.HASH_LOCK,
@@ -170,14 +171,14 @@ export default {
border-style: dashed;
border-radius: 10px;
border-color: var(--orange);
- border-width: 4px;
+ border-width: 2px;
.aggregate-title {
- font-size: 1.5rem;
+ font-size: 1rem;
line-height: 150%;
color: var(--orange);
font-weight: 700;
- margin: 20px 40px 0;
+ margin: 10px 15px 0;
}
.signers-section-wrapper {
@@ -188,13 +189,13 @@ export default {
flex: 1;
.signers-section {
- margin: 20px 40px 0;
+ margin: 10px 40px 0;
position: relative;
display: inline-block;
width: auto;
max-width: 700px;
background: var(--sub-card-bg);
- padding: 10px 20px;
+ padding: 0 20px 10px;
border-radius: 40px;
border: 1px solid var(--sub-card-border);
@@ -202,7 +203,7 @@ export default {
position: absolute;
height: 40px;
top: -10px;
- right: 0;
+ right: -5px;
}
}
}
@@ -213,9 +214,9 @@ export default {
.aggregate-inner-index {
position: absolute;
- top: 43%;
+ top: 35%;
left: 40px;
- font-size: 1.25rem;
+ font-size: 1rem;
font-weight: 700;
color: var(--orange);
}
diff --git a/src/config/constants.js b/src/config/constants.js
index 836c75f70..41f12e62b 100644
--- a/src/config/constants.js
+++ b/src/config/constants.js
@@ -43,6 +43,7 @@ class Constants {
[TransactionType.MOSAIC_ALIAS]: 'Mosaic Alias',
[TransactionType.MOSAIC_DEFINITION]: 'Mosaic Definition',
[TransactionType.MOSAIC_SUPPLY_CHANGE]: 'Mosaic Supply Change',
+ [TransactionType.MOSAIC_SUPPLY_REVOCATION]: 'Reclaim',
[TransactionType.MULTISIG_ACCOUNT_MODIFICATION]: 'Multisig Account Modification',
[TransactionType.AGGREGATE_COMPLETE]: 'Aggregate Complete',
[TransactionType.AGGREGATE_BONDED]: 'Aggregate Bonded',
@@ -202,6 +203,12 @@ class Constants {
[BlockType.NemesisBlock]: 'Nemesis Block',
[BlockType.NormalBlock]: 'Normal Block'
}
+
+ static EpochStatus = {
+ CURRENT: 'Current',
+ FUTURE: 'Future',
+ EXPIRED: 'Expired'
+ }
}
export default Constants;
diff --git a/src/config/default.json b/src/config/default.json
index 954f92c9c..721c03379 100644
--- a/src/config/default.json
+++ b/src/config/default.json
@@ -2,11 +2,11 @@
"apiNodePort": 3001,
"endpoints": {
"marketData": "https://min-api.cryptocompare.com/",
- "statisticsService": "https://testnet.symbol.services"
+ "statisticsService": "https://symbol.services"
},
"networkConfig": {
"namespaceName": "symbol.xym",
- "mosaicId": "2CF403E85507F39E",
+ "mosaicId": "6BED913FA20223F8",
"namespaceId": "E74B99BA41F4AFEE",
"divisibility": "6",
"networkIdentifier": 0
@@ -20,9 +20,14 @@
},
{
"href": "https://discord.com/invite/xymcity",
- "text": "Join Discord",
+ "text": "Discord",
"icon": "IconDiscord"
},
+ {
+ "href": "https://twitter.com/NEMofficial",
+ "text": "Twitter",
+ "icon": "IconTwitter"
+ },
{
"href": "https://testnet.symbol.tools/",
"text": "Faucet",
diff --git a/src/config/filters.js b/src/config/filters.js
index 8e3a7f541..b972cc8d1 100644
--- a/src/config/filters.js
+++ b/src/config/filters.js
@@ -127,6 +127,7 @@ export const transaction = [
TransactionType.MOSAIC_ALIAS,
TransactionType.MOSAIC_DEFINITION,
TransactionType.MOSAIC_SUPPLY_CHANGE,
+ TransactionType.MOSAIC_SUPPLY_REVOCATION,
TransactionType.ACCOUNT_MOSAIC_RESTRICTION,
TransactionType.MOSAIC_ADDRESS_RESTRICTION,
TransactionType.MOSAIC_GLOBAL_RESTRICTION,
@@ -429,39 +430,3 @@ export const blockTransactionReceipt = [
}
}
];
-
-export const enrollmentStatus = [
- {
- label: 'All',
- icon: 'mdi-note-text-outline',
- value: {}
- },
- {
- label: 'Invalid',
- icon: 'mdi-alert-outline',
- value: {
- status: 'Invalid'
- }
- },
- {
- label: 'To Process',
- icon: 'mdi-update',
- value: {
- status: 'ToProcess'
- }
- },
- {
- label: 'Processing',
- icon: 'mdi-autorenew',
- value: {
- status: 'Processing'
- }
- },
- {
- label: 'Completed',
- icon: 'mdi-check',
- value: {
- status: 'Completed'
- }
- }
-];
diff --git a/src/config/i18n/en-us.json b/src/config/i18n/en-us.json
index ba2d34190..111ed6742 100644
--- a/src/config/i18n/en-us.json
+++ b/src/config/i18n/en-us.json
@@ -6,10 +6,10 @@
"aliasAction": "Alias Action",
"linkAction": "Link Action",
"amount": "Amount",
- "relativeAmount": "Supply",
+ "relativeAmount": "Value",
"height": "Height",
"fee": "Fee",
- "maxFee": "Max Fee",
+ "maxFee": "Fee",
"totalFee": "Total Fee",
"date": "Date",
"deadline": "Deadline",
@@ -26,16 +26,16 @@
"namespace": "Namespace",
"namespaceName": "Name",
"transaction": "Transaction",
- "transactionHash": "Transaction Hash",
- "totalTransactions": "Total Transactions",
- "transactionType": "Transaction Type",
+ "transactionHash": "Hash",
+ "totalTransactions": "Total Txn",
+ "transactionType": "Type",
"addressHeight": "Address height",
"publicKey": "Public key",
"publicKeyHeight": "PublicKey height",
"importance": "Importance",
"importanceHeight": "Importance height",
"accountType": "Account type",
- "accountAliasNames": "Alias Namespace",
+ "accountAliasNames": "Namespace",
"lastActivity": "Last Activity",
"accounts": "Accounts",
"blocks": "Blocks",
@@ -48,8 +48,8 @@
"mosaicId": "Mosaic ID",
"blockHeight": "Block Height",
"blockHash": "Block Hash",
- "signer": "Signer",
- "recipient": "Recipient",
+ "signer": "From",
+ "recipient": "To",
"registrationType": "Registration Type",
"parentId": "Parent ID",
"duration": "Duration",
@@ -63,6 +63,7 @@
"supplyMutable": "Supply Mutable",
"transferable": "Transferable",
"restrictable": "Restrictable",
+ "revokable": "Revokable",
"active": "Active",
"alias": "Alias",
"aliasType": "Alias Type",
@@ -216,6 +217,7 @@
"transactionDescriptor_17230": "Mosaic alias",
"transactionDescriptor_16717": "Mosaic definition",
"transactionDescriptor_16973": "Mosaic supply change",
+ "transactionDescriptor_17229": "Reclaim",
"transactionDescriptor_16725": "Multisig account modification",
"transactionDescriptor_16705": "Aggregate complete",
"transactionDescriptor_16961": "Aggregate bonded",
@@ -244,6 +246,7 @@
"nodesTitle": "Nodes",
"supplementalKeysTitle": "Supplemental Keys",
+ "votingKeysTitle": "Voting Keys",
"accountTransactionsTitle": "Transactions",
"resolutionStatementTitle": "Resolution Statement",
"mosaicRestrictionTitle": "Mosaic Restriction",
@@ -397,6 +400,14 @@
"nodeAddress": "Node",
"vrfAddress": "VRF",
"exportCSV": "Export CSV",
+ "future": "Future",
+ "expired": "Expired",
"isHttpsEnabled": "Https",
- "epoch": "Epoch"
+ "epoch": "Epoch",
+ "epochInfo": "Epoch Info",
+ "current": "Current",
+ "reclaimed": "Reclaimed",
+ "first": "First",
+ "last": "Last",
+ "mosaicFlags": "Flags"
}
diff --git a/src/config/i18n/es.json b/src/config/i18n/es.json
index fcac5d1c4..11c3eaa64 100644
--- a/src/config/i18n/es.json
+++ b/src/config/i18n/es.json
@@ -35,7 +35,7 @@
"importance": "Valor",
"importanceHeight": "Valor Altura",
"accountType": "Cuentas Tipo",
- "accountAliasNames": "Alias Namespace",
+ "accountAliasNames": "Namespace",
"lastActivity": "Última actividad",
"accounts": "Cuentas",
"blocks": "Bloques",
@@ -48,7 +48,7 @@
"mosaicId": "Mosaicos ID",
"blockHeight": "Bloques Altura",
"blockHash": "Bloques Hash",
- "signer": "Signer",
+ "signer": "From",
"recipient": "recipiente",
"registrationType": "Tipo de registro",
"parentId": "Parent ID",
@@ -63,6 +63,7 @@
"supplyMutable": "Supply Mutable",
"transferable": "Transferible",
"restrictable": "Restringible",
+ "revokable": "Revokable",
"active": "Activo",
"alias": "Alias",
"aliasType": "Alias Type",
@@ -216,6 +217,7 @@
"transactionDescriptor_17230": "Mosaic alias",
"transactionDescriptor_16717": "Mosaic definition",
"transactionDescriptor_16973": "Mosaic supply change",
+ "transactionDescriptor_17229": "Reclaim",
"transactionDescriptor_16725": "Multisig account modification",
"transactionDescriptor_16705": "Aggregate complete",
"transactionDescriptor_16961": "Aggregate bonded",
@@ -244,6 +246,7 @@
"nodesTitle": "Nodes",
"supplementalKeysTitle": "Supplemental Keys",
+ "votingKeysTitle": "Voting Keys",
"accountTransactionsTitle": "Transactions",
"resolutionStatementTitle": "Resolution Statement",
"mosaicRestrictionTitle": "Mosaic Restriction",
@@ -393,6 +396,14 @@
"nodeAddress": "Node",
"vrfAddress": "VRF",
"exportCSV": "Export CSV",
+ "future": "Future",
+ "expired": "Expired",
"isHttpsEnabled": "Https",
- "epoch": "Epoch"
+ "epoch": "Epoch",
+ "epochInfo": "Epoch Info",
+ "current": "actualidad",
+ "reclaimed": "Reclaimed",
+ "first": "First",
+ "last": "Last",
+ "mosaicFlags": "Flags"
}
diff --git a/src/config/i18n/ja.json b/src/config/i18n/ja.json
index 1620cd967..4009e3693 100644
--- a/src/config/i18n/ja.json
+++ b/src/config/i18n/ja.json
@@ -1,7 +1,7 @@
{
"langName": "ja",
- "errorNisAddressNotAllowed": "You entered a NEM NIS1 address in the Symbol Explorer. Please use NEM Explorer instead.",
- "errorNothingFound": "Nothing found.",
+ "errorNisAddressNotAllowed": "Symbol エクスプローラに NEM NIS1 アドレスを入力したようです。NEM エクスプローラを使用してください。",
+ "errorNothingFound": "何も見つかりませんでした",
"age": "作成",
"aliasAction": "エイリアスアクション",
"linkAction": "リンクアクション",
@@ -63,6 +63,7 @@
"supplyMutable": "供給可変",
"transferable": "転送可能",
"restrictable": "制限可能",
+ "revokable": "取消可能",
"active": "アクティブ",
"alias": "エイリアス",
"aliasType": "エイリアスの種類",
@@ -71,7 +72,7 @@
"linkedNamespace": "リンク済みネームスペース",
"minApproval": "最小承認",
"minRemoval": "最小削除",
- "nothingToShow": "情報がありません",
+ "nothingToShow": "情報はありません",
"transactionBody": "トランザクション詳細",
"name": "名前",
"message": "メッセージ",
@@ -144,7 +145,7 @@
"friendlyName": "Friendly Name",
"approximateExpired": "概算期限切れ",
"expiredInBlock": "ブロック以内に期限切れ",
- "index": "No.",
+ "index": "いいえ",
"networkFees": "推奨手数料乗数",
"networkRentalFees": "実行レンタル手数料(XYM)",
"highestFeeMultiplier": "最高",
@@ -174,14 +175,14 @@
"previousRestrictionType": "前制限タイプ",
"previousRestrictionValue": "前制限値",
"newRestrictionType": "新制限タイプ",
- "newRestrictionValue": "新制限値",
- "mosaicRestrictionType.EQ": "等号",
- "mosaicRestrictionType.GE": "以上",
- "mosaicRestrictionType.GT": "超",
- "mosaicRestrictionType.LE": "以下",
- "mosaicRestrictionType.LT": "未満",
- "mosaicRestrictionType.NE": "不等号",
- "mosaicRestrictionType.NONE": "制限無し",
+ "newRestrictionValue": "新制限値",
+ "mosaicRestrictionType.EQ": "等号",
+ "mosaicRestrictionType.GE": "以上",
+ "mosaicRestrictionType.GT": "超",
+ "mosaicRestrictionType.LE": "以下",
+ "mosaicRestrictionType.LT": "未満",
+ "mosaicRestrictionType.NE": "不等号",
+ "mosaicRestrictionType.NONE": "制限無し",
"proof": "証明",
"minApprovalDelta": "最小承認増減値",
"minRemovalDelta": "最小削除増減値",
@@ -216,6 +217,7 @@
"transactionDescriptor_17230": "モザイクエイリアス",
"transactionDescriptor_16717": "モザイク定義",
"transactionDescriptor_16973": "モザイク供給変更",
+ "transactionDescriptor_17229": "回収",
"transactionDescriptor_16725": "マルチシグアカウント変更",
"transactionDescriptor_16705": "アグリゲートコンプリート",
"transactionDescriptor_16961": "アグリゲートボンデッド",
@@ -244,6 +246,7 @@
"nodesTitle": "ノード",
"supplementalKeysTitle": "Supplementalキー",
+ "votingKeysTitle": "投票キー",
"accountTransactionsTitle": "トランザクション",
"resolutionStatementTitle": "解決ステートメント",
"mosaicRestrictionTitle": "モザイク制限",
@@ -285,11 +288,11 @@
"hashLockError": "ハッシュロックは有効ではありません",
"mosaicAddressRestrictionError": "モザイクアドレス制限は有効ではありません",
"aggregateInnerTransactionsError": "アグリゲート内部トランザクションが有効ではありません",
- "aggregateCosignaturesError": "連署者が有効ではありません",
- "accountBalanceTitle": "アカウント残高",
- "noAlias": "エイリアスなし",
- "addressBeenCopied": "アドレスはクリップボードへコピーされました",
- "failedToCopy": "コピーに失敗しました",
+ "aggregateCosignaturesError": "連署者が有効ではありません",
+ "accountBalanceTitle": "アカウント残高",
+ "noAlias": "エイリアスなし",
+ "addressBeenCopied": "アドレスはクリップボードへコピーされました",
+ "failedToCopy": "コピーに失敗しました",
"beneficiaryAddress": "受益者アドレス",
"linked": "リンク済み",
@@ -375,28 +378,36 @@
"harvestingEligibleAccountsCount": "総ハーベスト適格アカウント",
"votingEligibleAccountsCount": "総投票適格アカウント",
"previousImportanceBlockHash": "前インポータンスブロックハッシュ",
- "nodeStatsTitle": "Node Statistics",
- "allNodes": "Total count",
- "nodeCountByRoles": "Count By Roles",
- "chainInfo": "Chain Info",
- "nodeHeightStatsTitle": "Count of nodes by chain height",
+ "nodeStatsTitle": "ノード情報",
+ "allNodes": "合計数",
+ "nodeCountByRoles": "ロールごとの数",
+ "chainInfo": "チェーン情報",
+ "nodeHeightStatsTitle": "Count of nodes by chain height",
"nodeFinalizedHeightStatsTitle": "Count of nodes by finalized height",
- "viewMoreStatistics": "View More Stats",
+ "viewMoreStatistics": "詳細を表示",
"nodeCountChartTitle": "Node count over time",
- "timestamp": "Timestamp",
- "symbolTime": "Symbol Time",
- "restVersion": "Rest Version",
- "softwareVersion": "Version",
+ "timestamp": "タイムスタンプ",
+ "symbolTime": "Symbol 時間",
+ "restVersion": "Rest バージョン",
+ "softwareVersion": "バージョン",
"id": "ID",
- "signerPublicKey": "Signer Public Key",
+ "signerPublicKey": "署名者公開鍵",
- "remote": "Remote",
- "main": "Main",
- "linkedAddress": "Linked",
- "nodeAddress": "Node",
+ "remote": "リモート",
+ "main": "メイン",
+ "linkedAddress": "リンク済み",
+ "nodeAddress": "ノード",
"vrfAddress": "VRF",
- "exportCSV": "Export CSV",
+ "exportCSV": "CSV出力",
+ "future": "Future",
+ "expired": "期限切れ",
"isHttpsEnabled": "Https",
- "epoch": "Epoch"
+ "epoch": "Epoch",
+ "epochInfo": "Epoch 情報",
+ "current": "現在",
+ "reclaimed": "回収",
+ "first": "最初",
+ "last": "最後",
+ "mosaicFlags": "フラグ"
}
diff --git a/src/config/i18n/pt.json b/src/config/i18n/pt.json
index 1e4911ee1..a79ed0d8c 100644
--- a/src/config/i18n/pt.json
+++ b/src/config/i18n/pt.json
@@ -9,7 +9,7 @@
"relativeAmount": "Quantidade relativa",
"height": "Altura",
"fee": "Taxas",
- "maxFee": "Max Fee",
+ "maxFee": "Fee",
"totalFee": "Total Fee",
"date": "Date",
"deadline": "Deadline",
@@ -35,7 +35,7 @@
"importance": "Valor",
"importanceHeight": "Valor height",
"accountType": "Account type",
- "accountAliasNames": "Alias Namespace",
+ "accountAliasNames": "Namespace",
"lastActivity": "ultima atividade",
"accounts": "Accounts",
"blocks": "Blocos",
@@ -49,7 +49,7 @@
"blockHeight": "Block Height",
"blockHash": "Block Hash",
"signer": "Assinador",
- "recipient": "Recipient",
+ "recipient": "To",
"registrationType": "Registration Type",
"parentId": "Parent ID",
"duration": "Duração",
@@ -63,6 +63,7 @@
"supplyMutable": "Mutável de fornecimento",
"transferable": "Transferível",
"restrictable": "Restringível",
+ "revokable": "Revokable",
"active": "Ativo",
"alias": "Alias",
"aliasType": "Alias Type",
@@ -79,7 +80,7 @@
"beneficiaryCount": "Contagem de Beneficiários",
"importanceScore": "Pontuação de importância",
"recalculationBlock": "Bloco de recálculo #",
- "mosaicAliasNames": "Alias Namespace",
+ "mosaicAliasNames": "Namespace",
"aliasMosaic": "Alias",
"aliasAddress": "Alias",
"metadataId": "Metadata Id",
@@ -217,6 +218,7 @@
"transactionDescriptor_17230": "Mosaic alias",
"transactionDescriptor_16717": "Mosaic definition",
"transactionDescriptor_16973": "Mosaic supply change",
+ "transactionDescriptor_17229": "Reclaim",
"transactionDescriptor_16725": "Multisig account modification",
"transactionDescriptor_16705": "Aggregate complete",
"transactionDescriptor_16961": "Aggregate bonded",
@@ -245,6 +247,7 @@
"nodesTitle": "Nodes",
"supplementalKeysTitle": "Supplemental Keys",
+ "votingKeysTitle": "Voting Keys",
"accountTransactionsTitle": "Transactions",
"resolutionStatementTitle": "Resolution Statement",
"mosaicRestrictionTitle": "Mosaic Restriction",
@@ -393,6 +396,14 @@
"nodeAddress": "Node",
"vrfAddress": "VRF",
"exportCSV": "Export CSV",
+ "future": "Future",
+ "expired": "Expired",
"isHttpsEnabled": "Https",
- "epoch": "Epoch"
+ "epoch": "Epoch",
+ "epochInfo": "Epoch Info",
+ "current": "Current",
+ "reclaimed": "Reclaimed",
+ "first": "First",
+ "last": "Last",
+ "mosaicFlags": "Flags"
}
diff --git a/src/config/i18n/ru.json b/src/config/i18n/ru.json
index 77ee22f7c..05f68f822 100644
--- a/src/config/i18n/ru.json
+++ b/src/config/i18n/ru.json
@@ -63,6 +63,7 @@
"supplyMutable": "Изменчивая Поставка",
"transferable": "Переносимый",
"restrictable": "Ограничение",
+ "revokable": "Подлежит отмене",
"active": "Активный",
"alias": "Псевдоним",
"aliasType": "Тип псевдонима",
@@ -141,7 +142,7 @@
"network": "Сеть",
"host": "IP / Имя хоста",
"port": "Порт",
- "friendlyName": "Дружественное имя",
+ "friendlyName": "Имя",
"approximateExpired": "Приблизительный Срок Окончания",
"expiredInBlock": "Истечение Срока в Блоке",
"index": "Нет.",
@@ -216,6 +217,7 @@
"transactionDescriptor_17230": "Мозаика псевдоним",
"transactionDescriptor_16717": "Определение мозаики",
"transactionDescriptor_16973": "Изменение поставки мозаики",
+ "transactionDescriptor_17229": "Возвращаемая",
"transactionDescriptor_16725": "Модификация мультисиг аккаунта",
"transactionDescriptor_16705": "Агрегат завершен",
"transactionDescriptor_16961": "Агрегат в сборе",
@@ -242,12 +244,15 @@
"namespacesTitle": "Пространства имён",
"mosaicsTitle": "Мозаики",
"nodesTitle": "Ноды",
+
"supplementalKeysTitle": "Дополнительные ключи",
+ "votingKeysTitle": "Ключи Голосования",
"accountTransactionsTitle": "Транзакции",
"resolutionStatementTitle": "Отчет Резолюции",
"mosaicRestrictionTitle": "Mosaic Restriction",
"mosaicRestrictionListTitle": "Mosaic Restriction List",
"harvestedBlockTitle": "Harvested Blocks",
+
"accountDetailError": "Этот адрес еще не известен сети Symbol.",
"multisigCosignatoriesError": "Адрес не является мультисиг аккаунтом.",
"ownedMosaicsError": "Мозаики, принадлежащие аккаунту, недоступны.",
@@ -258,6 +263,7 @@
"metadataEntriesError": "Метаданные недоступны.",
"importanceHistoryError": "История важности аккаунта недоступна.",
"accountRestrictionError": "Ограничения по аккаунту недоступны.",
+
"blockDetailError": "Блок не существует.",
"blockTransactionsError": "Блок транзакции недоступны.",
"balanceChangeReceiptError": "Баланс блока о внесении изменений квитанций отсутствует",
@@ -265,15 +271,19 @@
"inflationReceiptError": "Инфляционные квитанции блока недоступны.",
"artifactExpiryReceiptError": "Истечение срока действия артефакта блока недоступно.",
"resolutionStatementError": "Отчет о разрешении блока недоступен.",
+
"mosaicDetailError": "Мозаика не существует.",
"mosaicRestrictionError": "Глобальные ограничения мозаики недоступны.",
"mosaicRestrictionListError": "Глобальные ограничения мозаики недоступны.",
+
"namespaceDetailError": "Пространство имен не существует.",
"namespaceLevelError": "Уровни пространства имен недоступны.",
+
"transactionInfoError": "Транзакция не существует.",
"transactionDetailError": "Детали транзакции не существуют.",
"transactionMosaicsError": "Мозаика транзакции не существует.",
"transactionHashLockError": "Хеш-блокировка транзакции не существует.",
+
"secretLockError": "Секретные замки (Secret locks) недоступны.",
"hashLockError": "Хеш-блокировки недоступен.",
"mosaicAddressRestrictionError": "Ограничения по адресам мозаики недоступны.",
@@ -283,6 +293,7 @@
"noAlias": "No alias",
"addressBeenCopied": "The address was copied to the clipboard",
"failedToCopy": "Failed to copy",
+
"beneficiaryAddress": "Адрес Получателя",
"linked": "СВЯЗАННЫЕ",
"node": "НОДА",
@@ -352,7 +363,7 @@
"mosaicArtifactId": "Идентификатор артефакта",
"namespaceArtifactId": "Идентификатор артефакта",
"receiptTitle": "Квитанция",
- "created": "Созданный",
+ "created": "Созданный блок",
"ago": "тому назад",
"messageTypeDescriptor_-1": "RAW сообщение",
"messageTypeDescriptor_0": "Обычное сообщение",
@@ -379,14 +390,24 @@
"symbolTime": "Время Symbol",
"restVersion": "Версия Rest",
"softwareVersion": "Версия",
+
"id": "ID",
"signerPublicKey": "Публичный ключ подписывающей стороны",
+
"remote": "Удаленный",
"main": "Главная Страница",
"linkedAddress": "Связанные",
"nodeAddress": "Нода",
"vrfAddress": "VRF",
"exportCSV": "Экспорт CSV",
+ "future": "Будущие",
+ "expired": "Просроченные",
"isHttpsEnabled": "Https",
- "epoch": "Epoch"
-}
\ No newline at end of file
+ "epoch": "Эпоха",
+ "epochInfo": "Информация об эпохе",
+ "current": "В данный момент",
+ "reclaimed": "Возвращенная",
+ "first": "Первая",
+ "last": "Последняя",
+ "mosaicFlags": "Флаги"
+}
diff --git a/src/config/i18n/ua.json b/src/config/i18n/ua.json
index 849505eca..1dbbe4ccb 100644
--- a/src/config/i18n/ua.json
+++ b/src/config/i18n/ua.json
@@ -9,7 +9,7 @@
"relativeAmount": "Відносна сума",
"height": "Висота",
"fee": "Плата",
- "maxFee": "Max Fee",
+ "maxFee": "Fee",
"totalFee": "Total Fee",
"date": "Дата",
"deadline": "Кінцевий термін",
@@ -35,7 +35,7 @@
"importance": "Важливість",
"importanceHeight": "Висота важливісті",
"accountType": "Тип рахунку",
- "accountAliasNames": "Alias Namespace",
+ "accountAliasNames": "Namespace",
"lastActivity": "Остання активність",
"accounts": "Рахунки",
"blocks": "Блоки",
@@ -63,6 +63,7 @@
"supplyMutable": "Supply Mutable",
"transferable": "Переносимий",
"restrictable": "Обмежений",
+ "revokable": "Revokable",
"active": "Активний",
"alias": "Псевдонім",
"aliasType": "Тип псевдоніма",
@@ -216,6 +217,7 @@
"transactionDescriptor_17230": "Mosaic alias",
"transactionDescriptor_16717": "Mosaic definition",
"transactionDescriptor_16973": "Mosaic supply change",
+ "transactionDescriptor_17229": "Reclaim",
"transactionDescriptor_16725": "Multisig account modification",
"transactionDescriptor_16705": "Aggregate complete",
"transactionDescriptor_16961": "Aggregate bonded",
@@ -244,6 +246,7 @@
"nodesTitle": "Nodes",
"supplementalKeysTitle": "Supplemental Keys",
+ "votingKeysTitle": "Voting Keys",
"accountTransactionsTitle": "Transactions",
"resolutionStatementTitle": "Resolution Statement",
"mosaicRestrictionTitle": "Mosaic Restriction",
@@ -393,6 +396,14 @@
"nodeAddress": "Node",
"vrfAddress": "VRF",
"exportCSV": "Export CSV",
+ "future": "Future",
+ "expired": "Expired",
"isHttpsEnabled": "Https",
- "epoch": "Epoch"
+ "epoch": "Epoch",
+ "epochInfo": "Epoch Info",
+ "current": "Current",
+ "reclaimed": "Reclaimed",
+ "first": "First",
+ "last": "Last",
+ "mosaicFlags": "Flags"
}
diff --git a/src/config/i18n/zh.json b/src/config/i18n/zh.json
index 58f6a07da..56180124b 100644
--- a/src/config/i18n/zh.json
+++ b/src/config/i18n/zh.json
@@ -9,7 +9,7 @@
"relativeAmount": "相对金额",
"height": "高度",
"fee": "费用",
- "maxFee": "Max Fee",
+ "maxFee": "Fee",
"totalFee": "Total Fee",
"date": "日期",
"deadline": "截止时间",
@@ -35,7 +35,7 @@
"importance": "重要性",
"importanceHeight": "重要性的高度",
"accountType": "账户类型",
- "accountAliasNames": "Alias Namespace",
+ "accountAliasNames": "Namespace",
"lastActivity": "最后活动",
"accounts": "账户",
"blocks": "块",
@@ -63,6 +63,7 @@
"supplyMutable": "可变供应量",
"transferable": "可传输",
"restrictable": "限制性",
+ "revokable": "撤销",
"active": "活跃",
"alias": "别名",
"aliasType": "别名类型",
@@ -216,6 +217,7 @@
"transactionDescriptor_17230": "Mosaic alias",
"transactionDescriptor_16717": "Mosaic definition",
"transactionDescriptor_16973": "Mosaic supply change",
+ "transactionDescriptor_17229": "Reclaim",
"transactionDescriptor_16725": "Multisig account modification",
"transactionDescriptor_16705": "Aggregate complete",
"transactionDescriptor_16961": "Aggregate bonded",
@@ -244,6 +246,7 @@
"nodesTitle": "Nodes",
"supplementalKeysTitle": "Supplemental Keys",
+ "votingKeysTitle": "Voting Keys",
"accountTransactionsTitle": "Transactions",
"resolutionStatementTitle": "Resolution Statement",
"mosaicRestrictionTitle": "Mosaic Restriction",
@@ -393,6 +396,14 @@
"nodeAddress": "Node",
"vrfAddress": "VRF",
"exportCSV": "Export CSV",
+ "future": "Future",
+ "expired": "Expired",
"isHttpsEnabled": "Https",
- "epoch": "Epoch"
+ "epoch": "Epoch",
+ "epochInfo": "Epoch Info",
+ "current": "Current",
+ "reclaimed": "Reclaimed",
+ "first": "First",
+ "last": "Last",
+ "mosaicFlags": "Flags"
}
diff --git a/src/config/key-redirects.json b/src/config/key-redirects.json
index b11a10577..93fce9993 100644
--- a/src/config/key-redirects.json
+++ b/src/config/key-redirects.json
@@ -63,7 +63,5 @@
"namespaceArtifactId": "namespaces",
"node": "nodes",
- "nodePublicKey": "nodes",
-
- "enrollmentId": "enrollments"
+ "nodePublicKey": "nodes"
}
\ No newline at end of file
diff --git a/src/config/pages/account-detail.json b/src/config/pages/account-detail.json
index 122e42ba4..5fe3bce2a 100644
--- a/src/config/pages/account-detail.json
+++ b/src/config/pages/account-detail.json
@@ -123,8 +123,24 @@
"fields": [
"linkedAddress",
"nodeAddress",
- "vrfAddress",
- "voting"
+ "vrfAddress"
+ ]
+ },
+ {
+ "layoutOptions": "full-width",
+ "type": "CardTable",
+ "title": "votingKeysTitle",
+ "managerGetter": "account/info",
+ "dataGetter": "account/getVotingKeyList",
+ "pagination": "client",
+ "pageSize": 5,
+ "hideEmptyData": true,
+ "hideOnError": true,
+ "hideDependOnGetter": "account/info",
+ "fields": [
+ "address",
+ "publicKey",
+ "epochInfo"
]
},
{
diff --git a/src/config/pages/account-list.json b/src/config/pages/account-list.json
index 0de1ede9e..e79e93cc9 100644
--- a/src/config/pages/account-list.json
+++ b/src/config/pages/account-list.json
@@ -19,15 +19,12 @@
"pagination": "server",
"hasFilter": true,
"fields": [
- "index",
"address",
"balance",
- "lastActivity",
"importance",
"accountAliasNames"
],
"mobileFields": [
- "index",
"address",
"importance",
"info"
diff --git a/src/config/pages/block-detail.json b/src/config/pages/block-detail.json
index 2b2c50f2b..935d4d6b6 100644
--- a/src/config/pages/block-detail.json
+++ b/src/config/pages/block-detail.json
@@ -21,7 +21,8 @@
"nextPageAction": "block/nextBlock",
"previousPageAction": "block/previousBlock",
"canFetchPrevious": true,
- "canFetchNext": true
+ "canFetchNext": true,
+ "advance": false
},
"fields": [
"version",
diff --git a/src/config/pages/mosaic-detail.json b/src/config/pages/mosaic-detail.json
index 3e8a8f4d2..96eed655b 100644
--- a/src/config/pages/mosaic-detail.json
+++ b/src/config/pages/mosaic-detail.json
@@ -29,7 +29,8 @@
"expirationDuration",
"supplyMutable",
"transferable",
- "restrictable"
+ "restrictable",
+ "revokable"
]
},
{
@@ -95,4 +96,4 @@
}
]
}
-}
\ No newline at end of file
+}
diff --git a/src/config/pages/mosaic-list.json b/src/config/pages/mosaic-list.json
index b3c340fbc..47bc0f658 100644
--- a/src/config/pages/mosaic-list.json
+++ b/src/config/pages/mosaic-list.json
@@ -17,19 +17,17 @@
"errorMessage": "Failed to fetch mosaic list",
"pagination": "server",
"fields": [
- "index",
"mosaicId",
"mosaicAliasNames",
"ownerAddress",
"relativeAmount",
- "divisibility",
- "startHeight"
+ "mosaicFlags"
],
"mobileFields": [
- "index",
"mosaicId",
"mosaicAliasNames",
- "ownerAddress"
+ "ownerAddress",
+ "mosaicFlags"
]
}
]
diff --git a/src/config/pages/namespace-list.json b/src/config/pages/namespace-list.json
index ee67db239..65b7a2e77 100644
--- a/src/config/pages/namespace-list.json
+++ b/src/config/pages/namespace-list.json
@@ -18,15 +18,12 @@
"pagination": "server",
"hasFilter": true,
"fields": [
- "index",
- "namespaceName",
"namespaceId",
+ "namespaceName",
"ownerAddress",
- "expirationDuration",
"approximateExpired"
],
"mobileFields": [
- "index",
"namespaceName",
"ownerAddress",
"duration"
diff --git a/src/config/pages/node-list.json b/src/config/pages/node-list.json
index f1c29faa3..6b081076a 100644
--- a/src/config/pages/node-list.json
+++ b/src/config/pages/node-list.json
@@ -38,7 +38,6 @@
"pageSize": 1000,
"hasFilter": true,
"fields": [
- "index",
"host",
"friendlyName",
"roles",
diff --git a/src/config/pages/transaction-detail.json b/src/config/pages/transaction-detail.json
index 785f9a526..17e62a613 100644
--- a/src/config/pages/transaction-detail.json
+++ b/src/config/pages/transaction-detail.json
@@ -23,17 +23,17 @@
"errorMessage": "transactionInfoError",
"pagination": "none",
"fields": [
- "version",
- "blockHeight",
- "payloadSize",
"transactionHash",
+ "status",
+ "confirm",
+ "blockHeight",
"timestamp",
"deadline",
+ "signer",
+ "payloadSize",
"effectiveFee",
"signature",
- "signer",
- "status",
- "confirm"
+ "version"
]
},
{
diff --git a/src/config/pages/transaction-list.json b/src/config/pages/transaction-list.json
index 1c0bc61d4..f46efb8ea 100644
--- a/src/config/pages/transaction-list.json
+++ b/src/config/pages/transaction-list.json
@@ -18,17 +18,18 @@
"pagination": "server",
"hasFilter": true,
"fields": [
- "height",
- "timestamp",
- "deadline",
"transactionHash",
"transactionType",
+ "height",
+ "age",
"signer",
"recipient",
- "extendGraphicValue"
+ "extendGraphicValue",
+ "maxFee"
],
"mobileFields": [
"height",
+ "age",
"transactionType",
"transactionHash",
"signer"
diff --git a/src/helper.js b/src/helper.js
index 609f43cd7..2b6869beb 100644
--- a/src/helper.js
+++ b/src/helper.js
@@ -347,10 +347,10 @@ class helper {
/**
* convert second to Date
* @param second
- * @returns YYYY-MM-DD HH:mm:ss
+ * @returns YYYY.MM.DD HH:mm UTC
*/
static convertSecondToDate = second => moment.utc().add(second, 's')
- .format('YYYY-MM-DD HH:mm:ss')
+ .format('YYYY.MM.DD @ HH:mm UTC')
/**
* Convert block deadline to date
@@ -359,6 +359,48 @@ class helper {
*/
static convertDeadlinetoDate = deadline => this.convertToUTCDate(this.networkTimestamp(deadline))
+ /**
+ * Converts an HSL color value to RGB. Conversion formula
+ * adapted from http://en.wikipedia.org/wiki/HSL_color_space.
+ * Assumes h, s, and l are contained in the set [0, 1] and
+ * returns r, g, and b in the set [0, 255].
+ *
+ * @param {number} h The hue
+ * @param {number} s The saturation
+ * @param {number} l The lightness
+ * @returns object { R: Number, G: Number, B: Number }
+ */
+ static hslToRgb(h, s, l) {
+ let r, g, b;
+
+ if (s === 0)
+ r = g = b = l; // achromatic
+ else {
+ let hue2rgb = function hue2rgb(p, q, t) {
+ if (t < 0) t += 1;
+ if (t > 1) t -= 1;
+ if (t < 1 / 6) return p + (q - p) * 6 * t;
+ if (t < 1 / 2) return q;
+ if (t < 2 / 3) return p + (q - p) * (2 / 3 - t) * 6;
+ return p;
+ };
+
+ let q = l < 0.5 ? l * (1 + s) : l + s - l * s;
+
+ let p = 2 * l - q;
+
+ r = hue2rgb(p, q, h + 1 / 3);
+ g = hue2rgb(p, q, h);
+ b = hue2rgb(p, q, h - 1 / 3);
+ }
+
+ return {
+ R: Math.round(r * 255),
+ G: Math.round(g * 255),
+ B: Math.round(b * 255)
+ };
+ }
+
/**
* Get RGB color from hash
* @param hash - hash to be converted
@@ -370,6 +412,11 @@ class helper {
G: 0,
B: 0
};
+ const spread = 100;
+ const saturation = 0.9;
+ const lightness = 0.8;
+
+ let totalValue = 0;
if (typeof hash !== 'string') {
console.error('Failed to convert hash to color. Hash is not a String');
@@ -380,38 +427,22 @@ class helper {
return color;
}
- const hexToRGB = (hexString) => {
- let totalHex = 0;
-
- for (const hex of hexString)
- totalHex += parseInt(hex, 16);
-
- return Math.trunc(totalHex * 255 / (15 * hexString.length));
- };
-
- const charsetToRGB = (string) => {
+ if (isHex) {
+ for (const hex of hash)
+ totalValue += parseInt(hex, 16);
+ }
+ else {
const charset = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'];
- let totalHex = 0;
-
- for (const char of string)
- totalHex += charset.indexOf(char.toLowerCase());
-
- return Math.trunc(totalHex * 255 / ((charset.length - 1) * string.length));
+ for (const char of hash)
+ totalValue += charset.indexOf(char.toLowerCase());
};
- const hashLength = hash.length;
- const colorStrLength = Math.trunc(hashLength / 3);
-
- const strRed = hash.substring(0, colorStrLength);
- const strGreen = hash.substring(colorStrLength, colorStrLength * 2);
- const strBlue = hash.substring(colorStrLength * 2, colorStrLength * 3);
-
- color.R = isHex ? hexToRGB(strRed) : charsetToRGB(strRed.substring(2, 3));
- color.G = isHex ? hexToRGB(strGreen) : charsetToRGB(strGreen);
- color.B = isHex ? hexToRGB(strBlue) : charsetToRGB(strBlue);
+ const k = Math.trunc(totalValue / spread);
+ const offsetValue = totalValue - spread * k;
+ const hue = offsetValue / 100;
- return color;
+ return this.hslToRgb(hue, saturation, lightness);
}
static truncString(str, strLen = 4) {
@@ -431,7 +462,14 @@ class helper {
* @returns plain address - example : SB3KUBHATFCPV7UZQLWAQ2EUR6SIHBSBEOEDDDF3
*/
static resolvedAddress = async (unResolvedAddress, blockHeight) => {
- if (!blockHeight) throw new Error('It required Block height.');
+ // Handle partial txs without block height
+ if (!blockHeight) {
+ if (unResolvedAddress instanceof NamespaceId)
+ return unResolvedAddress.id.toHex();
+
+ return unResolvedAddress.address;
+ }
+
if (!(unResolvedAddress instanceof NamespaceId)) return unResolvedAddress.address;
const searchCriteria = {
diff --git a/src/infrastructure/AccountService.js b/src/infrastructure/AccountService.js
index 9281c48a0..489d0f003 100644
--- a/src/infrastructure/AccountService.js
+++ b/src/infrastructure/AccountService.js
@@ -22,6 +22,7 @@ import http from './http';
import { Constants } from '../config';
import { NamespaceService, TransactionService, ChainService, MetadataService, LockService, ReceiptService, MosaicService, BlockService } from '../infrastructure';
import helper from '../helper';
+import NodeService from './NodeService';
class AccountService {
/**
@@ -89,13 +90,14 @@ class AccountService {
const accountNames = await NamespaceService.getAccountsNames(addresses);
+ const { numAccounts } = await NodeService.getStorageInfo();
+
return {
...accountInfos,
- data: accountInfos.data.map((account, index) => ({
+ totalRecords: numAccounts,
+ data: accountInfos.data.map((account) => ({
...account,
- index: index + 1 + helper.getStartListIndex(pageNumber, pageSize),
- balance: helper.getNetworkCurrencyBalance(account.mosaics),
- lastActivity: helper.getLastActivityHeight(account.activityBucket),
+ balance: helper.getNetworkCurrencyBalance(account.mosaics) !== Constants.Message.UNAVAILABLE ? helper.getNetworkCurrencyBalance(account.mosaics) : helper.toNetworkCurrency(0),
accountAliasNames: this.extractAccountNamespace(account, accountNames)
}))
};
@@ -107,8 +109,26 @@ class AccountService {
* @returns Custom AccountInfo
*/
static getAccountInfo = async address => {
- const { supplementalPublicKeys, ...accountInfo } = await this.getAccount(address);
- const accountNames = await NamespaceService.getAccountsNames([Address.createFromRawAddress(address)]);
+ const [ { supplementalPublicKeys, ...accountInfo }, accountNames, { latestFinalizedBlock } ] = await Promise.all([
+ this.getAccount(address),
+ NamespaceService.getAccountsNames([Address.createFromRawAddress(address)]),
+ ChainService.getChainInfo()
+ ]);
+
+ const getVotingEpochStatus = (startEpoch, endEpoch) => {
+ let votingStatus = '';
+
+ if (latestFinalizedBlock.finalizationEpoch >= startEpoch && latestFinalizedBlock.finalizationEpoch <= endEpoch)
+ votingStatus = Constants.EpochStatus.CURRENT;
+
+ else if (latestFinalizedBlock.finalizationEpoch < startEpoch)
+ votingStatus = Constants.EpochStatus.FUTURE;
+
+ else if (latestFinalizedBlock.finalizationEpoch > endEpoch)
+ votingStatus = Constants.EpochStatus.EXPIRED;
+
+ return votingStatus;
+ };
return {
...accountInfo,
@@ -122,9 +142,28 @@ class AccountService {
...supplementalPublicKeys,
linkedAddress: supplementalPublicKeys.linked === Constants.Message.UNAVAILABLE ? supplementalPublicKeys.linked : helper.publicKeyToAddress(supplementalPublicKeys.linked),
nodeAddress: supplementalPublicKeys.node === Constants.Message.UNAVAILABLE ? supplementalPublicKeys.node : helper.publicKeyToAddress(supplementalPublicKeys.node),
- vrfAddress: supplementalPublicKeys.vrf === Constants.Message.UNAVAILABLE ? supplementalPublicKeys.vrf : helper.publicKeyToAddress(supplementalPublicKeys.vrf),
- voting: supplementalPublicKeys.voting.length > 0 ? supplementalPublicKeys.voting.map(voting => helper.publicKeyToAddress(voting.publicKey)) : []
+ vrfAddress: supplementalPublicKeys.vrf === Constants.Message.UNAVAILABLE ? supplementalPublicKeys.vrf : helper.publicKeyToAddress(supplementalPublicKeys.vrf)
},
+ votingList:
+ supplementalPublicKeys.voting.length > 0 ? supplementalPublicKeys.voting.map(voting => ({
+ ...voting,
+ epochInfo: {
+ epochStart: voting.startEpoch,
+ epochEnd: voting.endEpoch,
+ epochStatus: getVotingEpochStatus(voting.startEpoch, voting.endEpoch)
+ },
+ address: helper.publicKeyToAddress(voting.publicKey),
+ publicKey: voting.publicKey
+
+ })).sort((a, b) => {
+ const orderStatus = {
+ [Constants.EpochStatus.CURRENT]: 1,
+ [Constants.EpochStatus.FUTURE]: 2,
+ [Constants.EpochStatus.EXPIRED]: 3
+ };
+
+ return orderStatus[a.epochInfo.epochStatus] - orderStatus[b.epochInfo.epochStatus];
+ }) : [],
accountAliasNames: this.extractAccountNamespace(accountInfo, accountNames)
};
}
diff --git a/src/infrastructure/BlockService.js b/src/infrastructure/BlockService.js
index c6f0d05c5..8d97d7c11 100644
--- a/src/infrastructure/BlockService.js
+++ b/src/infrastructure/BlockService.js
@@ -24,6 +24,7 @@ import { Constants } from '../config';
import { take, toArray } from 'rxjs/operators';
import { MerkleTree } from 'merkletreejs';
import { sha3_256 as sha3256 } from 'js-sha3';
+import NodeService from './NodeService';
class BlockService {
/**
@@ -133,8 +134,11 @@ class BlockService {
const accountInfos = await AccountService.getAccounts(signerAddress);
+ const { numBlocks } = await NodeService.getStorageInfo();
+
return {
...blocks,
+ totalRecords: numBlocks,
data: blocks.data.map(block => {
const { supplementalPublicKeys } = accountInfos.find(account => account.address === block.signer);
diff --git a/src/infrastructure/CreateTransaction.js b/src/infrastructure/CreateTransaction.js
index 01626b932..f74daa4c5 100644
--- a/src/infrastructure/CreateTransaction.js
+++ b/src/infrastructure/CreateTransaction.js
@@ -102,7 +102,8 @@ class CreateTransaction {
nonce: transactionObj.nonce.toHex(),
supplyMutable: transactionObj.flags.supplyMutable,
transferable: transactionObj.flags.transferable,
- restrictable: transactionObj.flags.restrictable
+ restrictable: transactionObj.flags.restrictable,
+ revokable: transactionObj.flags.revokable
}
};
};
@@ -121,6 +122,22 @@ class CreateTransaction {
};
};
+ static mosaicSupplyRevocation = async (transactionObj) => {
+ const resolvedMosaic = await helper.resolveMosaicId(transactionObj.mosaic);
+ const mosaic = new Mosaic(new MosaicId(resolvedMosaic.toHex()), transactionObj.mosaic.amount);
+
+ const mosaicsFieldObject = await helper.mosaicsFieldObjectBuilder([mosaic]);
+
+ return {
+ ...transactionObj,
+ transactionBody: {
+ transactionType: transactionObj.type,
+ address: transactionObj.sourceAddress.address,
+ mosaics: mosaicsFieldObject
+ }
+ };
+ };
+
static multisigAccountModification = async (transactionObj) => {
const { transactionInfo } = transactionObj;
const [addressAdditions, addressDeletions] = await Promise.all([
diff --git a/src/infrastructure/MosaicService.js b/src/infrastructure/MosaicService.js
index dcbf2f9c0..046a8dfb6 100644
--- a/src/infrastructure/MosaicService.js
+++ b/src/infrastructure/MosaicService.js
@@ -120,11 +120,16 @@ class MosaicService {
return {
...mosaicInfos,
- data: mosaicInfos.data.map((mosaic, index) => ({
+ data: mosaicInfos.data.map((mosaic) => ({
...mosaic,
- index: index + 1 + helper.getStartListIndex(pageNumber, pageSize),
ownerAddress: mosaic.address,
- mosaicAliasNames: this.extractMosaicNamespace(mosaic, mosaicNames)
+ mosaicAliasNames: this.extractMosaicNamespace(mosaic, mosaicNames),
+ mosaicFlags: {
+ supplyMutable: mosaic.supplyMutable,
+ transferable: mosaic.transferable,
+ restrictable: mosaic.restrictable,
+ revokable: mosaic.revokable
+ }
}))
};
}
@@ -257,7 +262,8 @@ class MosaicService {
duration: Number(mosaicInfo.duration.toString()),
supplyMutable: mosaicInfo.flags.supplyMutable,
transferable: mosaicInfo.flags.transferable,
- restrictable: mosaicInfo.flags.restrictable
+ restrictable: mosaicInfo.flags.restrictable,
+ revokable: mosaicInfo.flags.revokable
})
/**
diff --git a/src/infrastructure/NamespaceService.js b/src/infrastructure/NamespaceService.js
index 2bfa18ebc..0f932e584 100644
--- a/src/infrastructure/NamespaceService.js
+++ b/src/infrastructure/NamespaceService.js
@@ -203,13 +203,11 @@ class NamespaceService {
return {
...namespaceInfos,
- data: namespaceInfos.data.map((namespace, index) => {
+ data: namespaceInfos.data.map((namespace) => {
const { isExpired, expiredInSecond, expiredInBlock } = helper.calculateNamespaceExpiration(currentHeight, namespace.endHeight);
return {
...namespace,
- index: index + 1 + helper.getStartListIndex(pageNumber, pageSize),
- expirationDuration: helper.isNativeNamespace(namespace.namespaceName) ? Constants.Message.INFINITY : helper.convertTimeFromNowInSec(expiredInSecond),
isExpired: isExpired,
approximateExpired: helper.isNativeNamespace(namespace.namespaceName) ? Constants.Message.INFINITY : helper.convertSecondToDate(expiredInSecond),
expiredInBlock: expiredInBlock
diff --git a/src/infrastructure/NodeService.js b/src/infrastructure/NodeService.js
index 8577ebea7..90ca8fb67 100644
--- a/src/infrastructure/NodeService.js
+++ b/src/infrastructure/NodeService.js
@@ -19,10 +19,8 @@
import http from './http';
import Constants from '../config/constants';
import * as symbol from 'symbol-sdk';
-import Axios from 'axios';
import moment from 'moment';
import helper from '../helper';
-import globalConfig from '../config/globalConfig';
class NodeService {
/**
@@ -61,15 +59,10 @@ class NodeService {
let nodePeers = [];
try {
- if (globalConfig.endpoints.statisticsService && globalConfig.endpoints.statisticsService.length)
- nodePeers = (await Axios.get(globalConfig.endpoints.statisticsService + '/nodes')).data;
- else
- throw Error('Statistics service endpoint is not provided');
+ nodePeers = await http.statisticServiceRestClient().getNodes();
}
catch (e) {
- nodePeers = await http.createRepositoryFactory.createNodeRepository()
- .getNodePeers()
- .toPromise();
+ console.error('Statistics service getNodes error: ', e);
}
const formattedNodePeers = nodePeers.map(nodeInfo => this.formatNodeInfo(nodeInfo)).sort((a, b) => a.friendlyName.localeCompare(b.friendlyName));
@@ -129,9 +122,8 @@ class NodeService {
data:
nodePeers
.filter(el => !filter.rolesRaw || el.rolesRaw === filter.rolesRaw)
- .map((el, index) => {
+ .map((el) => {
let node = {
- index: index + 1,
...el
};
@@ -165,26 +157,14 @@ class NodeService {
};
}
- static getNodeStats = async () => {
- if (globalConfig.endpoints.statisticsService && globalConfig.endpoints.statisticsService.length)
- return (await Axios.get(globalConfig.endpoints.statisticsService + '/nodestats/')).data;
- else
- throw Error('Statistics service endpoint is not provided');
- }
-
static getNodeInfo = async (publicKey) => {
let node = {};
try {
- if (globalConfig.endpoints.statisticsService && globalConfig.endpoints.statisticsService.length)
- node = (await Axios.get(globalConfig.endpoints.statisticsService + '/nodes/' + publicKey)).data;
- else
- throw Error('Statistics service endpoint is not provided');
+ node = await http.statisticServiceRestClient().getNode(publicKey);
}
catch (e) {
- const nodes = (await Axios.get(http.nodeUrl + '/node/peers')).data;
-
- node = nodes.find(n => n.publicKey === publicKey);
+ throw Error('Statistics service getNode error: ', e);
}
const formattedNode = this.formatNodeInfo(node);
@@ -202,7 +182,7 @@ class NodeService {
apiNodeStatus: nodeStatus?.apiNode === 'up' || Constants.Message.UNAVAILABLE,
isHttpsEnabled,
restVersion,
- lastStatusCheck: moment(moment.utc(lastStatusCheck).format(), 'YYYY-MM-DD HH:mm:ss')
+ lastStatusCheck: moment.utc(lastStatusCheck).format('YYYY-MM-DD HH:mm:ss')
};
if (finalization && chainHeight) {
@@ -213,7 +193,7 @@ class NodeService {
finalizationEpoch: finalization?.epoch,
finalizationPoint: finalization?.point,
finalizedHash: finalization?.hash,
- lastStatusCheck: moment(moment.utc(lastStatusCheck).format(), 'YYYY-MM-DD HH:mm:ss')
+ lastStatusCheck: moment.utc(lastStatusCheck).format('YYYY-MM-DD HH:mm:ss')
};
}
else
@@ -224,61 +204,18 @@ class NodeService {
return formattedNode;
}
- static getApiNodeStatus = async (nodeUrl) => {
- const status = {
- connectionStatus: false,
- databaseStatus: Constants.Message.UNAVAILABLE,
- apiNodeStatus: Constants.Message.UNAVAILABLE,
- lastStatusCheck: moment().format('YYYY-MM-DD HH:mm:ss')
- };
-
- try {
- const nodeStatus = (await Axios.get(nodeUrl + '/node/health', { timeout: 3000 })).data.status;
-
- status.connectionStatus = true;
- status.apiNodeStatus = nodeStatus.apiNode === 'up';
- status.databaseStatus = nodeStatus.db === 'up';
- status.lastStatusCheck = moment().format('YYYY-MM-DD HH:mm:ss');
- }
- catch (e) {
- console.error('Failed to get node status', e);
- };
-
- return status;
- }
-
- static getNodeChainInfo = async (nodeUrl) => {
- let chainInfo = {};
-
- try {
- chainInfo = {};
- const nodeChainInfo = (await Axios.get(nodeUrl + '/chain/info', { timeout: 3000 })).data;
-
- chainInfo.height = nodeChainInfo.height;
- chainInfo.scoreHigh = nodeChainInfo.scoreHigh;
- chainInfo.scoreLow = nodeChainInfo.scoreLow;
- chainInfo.finalizationEpoch = nodeChainInfo.latestFinalizedBlock.finalizationEpoch;
- chainInfo.finalizationPoint = nodeChainInfo.latestFinalizedBlock.finalizationPoint;
- chainInfo.finalizedHeight = nodeChainInfo.latestFinalizedBlock.height;
- chainInfo.finalizedHash = nodeChainInfo.latestFinalizedBlock.hash;
- }
- catch (e) {
- console.error('Failed to get node chain info', e);
- };
-
- return chainInfo;
- }
-
static getNodeStats = async () => {
- if (globalConfig.endpoints.statisticsService && globalConfig.endpoints.statisticsService.length)
- return (await Axios.get(globalConfig.endpoints.statisticsService + '/nodeStats')).data;
- else
- throw Error('Statistics service endpoint is not provided');
+ try {
+ return await http.statisticServiceRestClient().getNodeStats();
+ }
+ catch (e) {
+ throw Error('Statistics service getNodeStats error: ', e);
+ }
}
static getNodeHeightStats = async () => {
- if (globalConfig.endpoints.statisticsService && globalConfig.endpoints.statisticsService.length) {
- const data = (await Axios.get(globalConfig.endpoints.statisticsService + '/nodeHeightStats')).data;
+ try {
+ const data = await http.statisticServiceRestClient().getNodeHeightStats();
return [
{
@@ -291,15 +228,16 @@ class NodeService {
}
];
}
- else
- throw Error('Statistics service endpoint is not provided');
+ catch (e) {
+ throw Error('Statistics service getNodeHeightStats error: ', e);
+ }
}
static getNodeListCSV = async (filter) => {
const nodes = await this.getNodePeerList(filter);
- const formattedData = nodes.data.map(node => ({
- no: node.index,
+ const formattedData = nodes.data.map((node, index) => ({
+ no: index + 1,
host: node.host,
country: node.country,
friendlyName: node.friendlyName.replace(/,/g, '_'), // prevent friendly name break in CSV
@@ -323,26 +261,12 @@ class NodeService {
* @returns nodes
*/
static getNodeList = async (filter, limit, ssl) => {
- let nodes = [];
-
try {
- if (globalConfig.endpoints.statisticsService && globalConfig.endpoints.statisticsService.length) {
- nodes = (await Axios.get(globalConfig.endpoints.statisticsService + `/nodes`, {
- params: {
- filter,
- limit,
- ssl
- }
- })).data;
- }
- else
- throw Error('Statistics service endpoint is not provided');
+ return await http.statisticServiceRestClient().getNodes(filter, limit, ssl);
}
catch (e) {
- throw Error('Statistics service endpoint is not provided', e);
- }
-
- return nodes;
+ throw Error('Statistics service getNodeHeightStats error: ', e);
+ }
}
/**
diff --git a/src/infrastructure/TransactionService.js b/src/infrastructure/TransactionService.js
index be3a5369a..3d06a7017 100644
--- a/src/infrastructure/TransactionService.js
+++ b/src/infrastructure/TransactionService.js
@@ -130,21 +130,7 @@ class TransactionService {
static getTransactionInfo = async (hash) => {
const transactionStatus = await this.getTransactionStatus(hash);
const transactionGroup = transactionStatus.message;
- const transaction = await this.getTransaction(hash, transactionGroup)
- .catch((error) => {
- if (error)
- return false;
- });
-
- if (!transaction) {
- const transactionErrorInfo = {
- transactionHash: transactionStatus.detail.hash,
- status: transactionStatus.detail.code,
- confirm: transactionStatus.message
- };
-
- return transactionErrorInfo;
- }
+ const transaction = await this.getTransaction(hash, transactionGroup);
const [{ timestamp }, effectiveFee] = await Promise.all([
BlockService.getBlockInfo(UInt64.fromUint(transaction.transactionInfo.height))
@@ -237,11 +223,15 @@ class TransactionService {
blocksHeight.map(height => BlockService.getBlockInfo(height))
);
+ // Cap data in 50 pages
+ const totalRecords = 50 * pageSize;
+
return {
...transactions,
+ totalRecords,
data: transactions.data.map(({ deadline, ...transaction }) => ({
...transaction,
- timestamp: blockInfos.find(block => block.height === transaction.transactionInfo.height).timestamp,
+ age: helper.convertToUTCDate(blockInfos.find(block => block.height === transaction.transactionInfo.height).timestamp),
height: transaction.transactionInfo.height,
transactionHash: transaction.transactionInfo.hash,
transactionType: transaction.type,
@@ -327,7 +317,8 @@ class TransactionService {
nonce: transactionBody.nonce.toHex(),
supplyMutable: transactionBody.flags.supplyMutable,
transferable: transactionBody.flags.transferable,
- restrictable: transactionBody.flags.restrictable
+ restrictable: transactionBody.flags.restrictable,
+ revokable: transactionBody.flags.revokable
};
case TransactionType.MOSAIC_SUPPLY_CHANGE:
@@ -337,6 +328,15 @@ class TransactionService {
action: Constants.MosaicSupplyChangeAction[transactionBody.action],
delta: transactionBody.delta.compact()
};
+ case TransactionType.MOSAIC_SUPPLY_REVOCATION:
+ return {
+ transactionType: transactionBody.type,
+ address: transactionBody.sourceAddress.address,
+ mosaics: [{
+ id: transactionBody.mosaic.id.toHex(),
+ amount: transactionBody.mosaic.amount.compact().toString()
+ }]
+ };
case TransactionType.MULTISIG_ACCOUNT_MODIFICATION:
return {
@@ -561,6 +561,10 @@ class TransactionService {
return [
{ action: transactionBody.action }
];
+ case TransactionType.MOSAIC_SUPPLY_REVOCATION:
+ return {
+ mosaics: transactionBody.mosaics
+ };
case TransactionType.MULTISIG_ACCOUNT_MODIFICATION:
return [
{ minApprovalDelta: transactionBody.minApprovalDelta },
@@ -647,6 +651,8 @@ class TransactionService {
return CreateTransaction.mosaicDefinition(transactionObj);
case TransactionType.MOSAIC_SUPPLY_CHANGE:
return CreateTransaction.mosaicSupplyChange(transactionObj);
+ case TransactionType.MOSAIC_SUPPLY_REVOCATION:
+ return CreateTransaction.mosaicSupplyRevocation(transactionObj);
case TransactionType.MULTISIG_ACCOUNT_MODIFICATION:
return CreateTransaction.multisigAccountModification(transactionObj);
case TransactionType.HASH_LOCK:
diff --git a/src/infrastructure/http.js b/src/infrastructure/http.js
index f725c0898..0bf495648 100644
--- a/src/infrastructure/http.js
+++ b/src/infrastructure/http.js
@@ -19,6 +19,7 @@
import * as symbol from 'symbol-sdk';
import { NamespaceService } from '../infrastructure';
import globalConfig from '../config/globalConfig';
+import { Configuration, NodeApi } from 'symbol-statistics-service-typescript-fetch-client';
let NODE_URL;
@@ -146,4 +147,24 @@ export default class http {
static get transactionPaginationStreamer() {
return new symbol.TransactionPaginationStreamer(this.createRepositoryFactory.createTransactionRepository());
}
+
+ static statisticServiceRestClient() {
+ try {
+ const statisticsServiceUrl = globalConfig.endpoints.statisticsService;
+
+ if (statisticsServiceUrl && statisticsServiceUrl.length) {
+ return new NodeApi(
+ new Configuration({
+ fetchApi: fetch,
+ basePath: statisticsServiceUrl
+ })
+ );
+ }
+ else
+ throw Error('Statistics service endpoint is not provided');
+ }
+ catch (error) {
+ console.error(error);
+ }
+ }
}
diff --git a/src/router.js b/src/router.js
index 4e5cae93e..2bedb863a 100644
--- a/src/router.js
+++ b/src/router.js
@@ -54,26 +54,26 @@ const routerConfig = {
component: () =>
import('./views/Statistics.vue')
},
- {
- path: '/terms',
- name: 'terms',
- meta: {
- group: 'page',
- keepAliveGoTo: []
- },
- component: () =>
- import('./views/Terms.vue')
- },
- {
- path: '/privacy',
- name: 'privacy',
- meta: {
- group: 'page',
- keepAliveGoTo: []
- },
- component: () =>
- import('./views/Privacy.vue')
- },
+ // {
+ // path: '/terms',
+ // name: 'terms',
+ // meta: {
+ // group: 'page',
+ // keepAliveGoTo: []
+ // },
+ // component: () =>
+ // import('./views/Terms.vue')
+ // },
+ // {
+ // path: '/privacy',
+ // name: 'privacy',
+ // meta: {
+ // group: 'page',
+ // keepAliveGoTo: []
+ // },
+ // component: () =>
+ // import('./views/Privacy.vue')
+ // },
{
path: '*',
name: '404',
diff --git a/src/store/account.js b/src/store/account.js
index 03d789dd1..0f52225f3 100644
--- a/src/store/account.js
+++ b/src/store/account.js
@@ -136,12 +136,13 @@ export default {
getInitialized: state => state.initialized,
getActivityBucketList: state => state.info?.data.activityBucket || [],
getSupplementalPublicKeys: state => state.info?.data.supplementalPublicKeys || {},
+ getVotingKeyList: state => state.info?.data.votingList || [],
getCurrentAccountAddress: state => state.currentAccountAddress,
balanceWidget: (state, getters) => ({
address: Address
.createFromRawAddress(state.currentAccountAddress)
.pretty(),
- balance: getters.OwnedMosaic?.data[0]?.amount || 0,
+ mosaic: getters.OwnedMosaic?.data[0],
alias: getters.info?.data?.accountAliasNames /* || Constants.Message.UNAVAILABLE */
})
},
diff --git a/src/store/api.js b/src/store/api.js
index fc4a70e6d..a7d1bd25d 100644
--- a/src/store/api.js
+++ b/src/store/api.js
@@ -89,6 +89,11 @@ export default {
await http.init(nodeUrl, marketDataUrl);
commit('networkType', http.networkType);
+
+ // Add data attribute for testnet
+ if (http.networkType === sdk.NetworkType.TEST_NET)
+ document.documentElement.setAttribute('data-network', 'testnet');
+
dispatch('chain/getChainInfo', null, { root: true });
};
diff --git a/src/store/enrollment.js b/src/store/enrollment.js
deleted file mode 100644
index a50f65636..000000000
--- a/src/store/enrollment.js
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- *
- * Copyright (c) 2019-present for NEM
- *
- * Licensed under the Apache License, Version 2.0 (the "License ");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import Lock from './lock';
-import { NodeService } from '../infrastructure';
-import { filters, Constants } from '../config';
-import {
- Pagination,
- DataSet,
- getStateFromManagers,
- getGettersFromManagers,
- getMutationsFromManagers,
- getActionsFromManagers
-} from './manager';
-
-const managers = [
- new Pagination({
- name: 'timeline',
- fetchFunction: (pageInfo, filterValue) => NodeService.getEnrollmentList(pageInfo, filterValue),
- filter: filters.enrollmentStatus,
- pageInfo: {
- pageSize: Constants.PageSize
- }
- }),
- new DataSet(
- 'info',
- (id) => NodeService.getEnrollmentInfo(id)
- )
-];
-
-const LOCK = Lock.create();
-
-export default {
- namespaced: true,
- state: {
- initialized: false,
- ...getStateFromManagers(managers)
- },
- getters: {
- getInitialized: state => state.initialized,
- ...getGettersFromManagers(managers)
- },
- mutations: {
- setInitialized: (state, initialized) => {
- state.initialized = initialized;
- },
- ...getMutationsFromManagers(managers)
- },
- actions: {
- ...getActionsFromManagers(managers),
-
- // Initialize the enrollment model.
- async initialize({ commit, dispatch, getters }) {
- const callback = async () => dispatch('initializePage');
-
- await LOCK.initialize(callback, commit, dispatch, getters);
- },
-
- // Uninitialize the enrollment model.
- async uninitialize({ commit, dispatch, getters }) {
- const callback = async () => getters.timeline?.uninitialize();
-
- await LOCK.uninitialize(callback, commit, dispatch, getters);
- },
-
- // initialize the page.
- async initializePage(context) {
- await context.getters.timeline.setStore(context).initialFetch();
- },
-
- // Fetch data from the SDK.
- async fetchInfo(context, payload) {
- context.dispatch('uninitializeDetail');
- context.getters.info.setStore(context).initialFetch(Object.values(payload)[0]);
- },
-
- uninitializeDetail(context) {
- context.getters.info.setStore(context).uninitialize();
- }
- }
-};
diff --git a/src/store/index.js b/src/store/index.js
index 3f5afd03e..52c82064b 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -19,7 +19,6 @@ import account from './account';
import api from './api';
import block from './block';
import chain from './chain';
-import enrollment from './enrollment';
import mosaic from './mosaic';
import namespace from './namespace';
import node from './node';
@@ -40,7 +39,6 @@ export default new Vuex.Store({
api,
block,
chain,
- enrollment,
transaction,
ui,
account,
@@ -88,7 +86,6 @@ export default new Vuex.Store({
dispatch('account/uninitialize'),
dispatch('block/uninitialize'),
dispatch('chain/uninitialize'),
- dispatch('enrollment/uninitialize'),
dispatch('mosaic/uninitialize'),
dispatch('namespace/uninitialize'),
dispatch('transaction/uninitialize'),
diff --git a/src/store/manager/Pagination.js b/src/store/manager/Pagination.js
index 6bde1f3a6..d99061356 100644
--- a/src/store/manager/Pagination.js
+++ b/src/store/manager/Pagination.js
@@ -31,6 +31,7 @@ export default class Pagination {
this.pageInfo = {
pageNumber: pageInfo.pageNumber || 1,
pageSize: pageInfo.pageSize || Constants.pageSize,
+ totalRecords: undefined,
data: []
};
this.capturePageInfo();
@@ -79,6 +80,10 @@ export default class Pagination {
return this.pageInfo.pageSize;
}
+ get totalRecords() {
+ return this.pageInfo.totalRecords || undefined;
+ }
+
get filterOptions() {
return Array.isArray(this.options) ? this.options : [];
}
@@ -141,6 +146,14 @@ export default class Pagination {
try {
const newPageInfo = await this.fetchFunction(this.pageInfo, this.filterValue, this.store);
+ // set isLastPage to true
+ // if pageNumber is match with custom data length
+ if (newPageInfo.totalRecords) {
+ const lastPageNumber = Math.ceil(newPageInfo.totalRecords / newPageInfo.pageSize);
+
+ newPageInfo.isLastPage = newPageInfo.pageNumber === lastPageNumber;
+ }
+
this.pageInfo = newPageInfo?.data.length
? newPageInfo
: {
@@ -201,10 +214,11 @@ export default class Pagination {
typeof pageInfo !== 'undefined'
) {
this.store.dispatch(this.name, this);
- if (this.pageInfo === null || typeof this.pageInfo !== 'object') {
+ if (this.pageInfo === null || typeof this.pageInfo === 'object') {
for (const key in pageInfo)
this.pageInfo[key] = pageInfo[key];
}
+
await this.fetch();
}
else
diff --git a/src/store/ui.js b/src/store/ui.js
index bb7f1604c..ad8523652 100644
--- a/src/store/ui.js
+++ b/src/store/ui.js
@@ -199,8 +199,9 @@ export default {
else throw Error('Cannot change language. language is not supported: ' + language);
},
- changeTheme: ({ commit }, theme) => {
+ changeTheme: ({ commit, rootGetters }, theme) => {
commit('setTheme', theme);
+ document.documentElement.setAttribute('data-theme', theme);
}
}
};
diff --git a/src/styles/img/account.png b/src/styles/img/account.png
new file mode 100644
index 000000000..86809e444
Binary files /dev/null and b/src/styles/img/account.png differ
diff --git a/src/styles/img/block.png b/src/styles/img/block.png
new file mode 100644
index 000000000..6770f338d
Binary files /dev/null and b/src/styles/img/block.png differ
diff --git a/src/styles/img/footer.png b/src/styles/img/footer.png
deleted file mode 100644
index bbcbc0c8a..000000000
Binary files a/src/styles/img/footer.png and /dev/null differ
diff --git a/src/styles/img/header.png b/src/styles/img/header.png
deleted file mode 100644
index e714f5561..000000000
Binary files a/src/styles/img/header.png and /dev/null differ
diff --git a/src/styles/img/home.png b/src/styles/img/home.png
new file mode 100644
index 000000000..65d7b1518
Binary files /dev/null and b/src/styles/img/home.png differ
diff --git a/src/styles/img/logo-wordmark-dark-BG.png b/src/styles/img/logo-wordmark-dark-BG.png
new file mode 100644
index 000000000..4eda22bd8
Binary files /dev/null and b/src/styles/img/logo-wordmark-dark-BG.png differ
diff --git a/src/styles/img/mainnet-footer.png b/src/styles/img/mainnet-footer.png
new file mode 100644
index 000000000..6857766b8
Binary files /dev/null and b/src/styles/img/mainnet-footer.png differ
diff --git a/src/styles/img/mainnet-header.png b/src/styles/img/mainnet-header.png
new file mode 100644
index 000000000..c28bb1aff
Binary files /dev/null and b/src/styles/img/mainnet-header.png differ
diff --git a/src/styles/img/moon.png b/src/styles/img/moon.png
index e3fa3e93f..d6330db1d 100644
Binary files a/src/styles/img/moon.png and b/src/styles/img/moon.png differ
diff --git a/src/styles/img/nodes.png b/src/styles/img/nodes.png
new file mode 100644
index 000000000..8b04b66c8
Binary files /dev/null and b/src/styles/img/nodes.png differ
diff --git a/src/styles/img/restrictable.png b/src/styles/img/restrictable.png
new file mode 100644
index 000000000..f9f547ae4
Binary files /dev/null and b/src/styles/img/restrictable.png differ
diff --git a/src/styles/img/revoke.png b/src/styles/img/revoke.png
new file mode 100644
index 000000000..a772440f5
Binary files /dev/null and b/src/styles/img/revoke.png differ
diff --git a/src/styles/img/supply-mutable.png b/src/styles/img/supply-mutable.png
new file mode 100644
index 000000000..e6f8dd965
Binary files /dev/null and b/src/styles/img/supply-mutable.png differ
diff --git a/src/styles/img/testnet-footer.png b/src/styles/img/testnet-footer.png
new file mode 100644
index 000000000..dece1c318
Binary files /dev/null and b/src/styles/img/testnet-footer.png differ
diff --git a/src/styles/img/testnet-header.png b/src/styles/img/testnet-header.png
new file mode 100644
index 000000000..f0d97e44b
Binary files /dev/null and b/src/styles/img/testnet-header.png differ
diff --git a/src/styles/img/transaction.png b/src/styles/img/transaction.png
new file mode 100644
index 000000000..3287c5401
Binary files /dev/null and b/src/styles/img/transaction.png differ
diff --git a/src/styles/main.scss b/src/styles/main.scss
index 5c45e7b3b..3859fc43f 100644
--- a/src/styles/main.scss
+++ b/src/styles/main.scss
@@ -57,6 +57,9 @@ $theme-colors: map-merge(
);
:root {
+ --testnet-badge-title: #{$dark-mode-text-title-color};
+ --header-bg-img: url(../styles/img/mainnet-header.png);
+ --footer-bg-img: url(../styles/img/mainnet-footer.png);
--main-bg-color: #{$white-color};
--main-grid-bg: #{$white-color};
--navigation-bg: #{$black-color};
@@ -78,10 +81,10 @@ $theme-colors: map-merge(
// Variables for dark mode
[data-theme="darkMode"] {
+ --header-bg-img: url(../styles/img/mainnet-header.png);
+ --footer-bg-img: url(../styles/img/mainnet-footer.png);
--main-bg-color: #{$dark-mode-main-bg};
--main-grid-bg: #{$dark-mode-grid-bg};
- --navigation-bg: #{$black-color};
- --theme-switch-bg: #{$dark-mode-card-bg-color};
--text-color: #{$dark-mode-text-color};
--clickable-text: #{$dark-mode-button-text-color};
--card-bg: #{$dark-mode-card-bg-color};
@@ -97,6 +100,31 @@ $theme-colors: map-merge(
--icon-invert: invert(0);
}
+// Variables for light mode Testnet
+[data-network="testnet"] {
+ --header-bg-img: url(../styles/img/testnet-header.png);
+ --footer-bg-img: url(../styles/img/testnet-footer.png);
+}
+
+// Variables for dark mode Testnet
+[data-theme="darkMode"][data-network="testnet"] {
+ --main-bg-color: #{$testnet-dark-mode-main-bg};
+ --main-grid-bg: #{$testnet-dark-mode-grid-bg};
+ --text-color: #{$dark-mode-text-color};
+ --clickable-text: #{$dark-mode-button-text-color};
+ --card-bg: #{$black-color};
+ --card-border: #{$transparent};
+ --sub-card-border: #{$light-white-grey};
+ --sub-card-bg: #{$black-color};
+ --card-title-text: #{$dark-mode-text-title-color};
+ --table-content-text: #{$violet-color};
+ --balance-green-text: #{$dark-mode-green-text-color};
+ --balance-widget-bg: #{$black-color};
+ --mosaic-filed-bg: #{$violet-color};
+ --loading-bg: #{$dark-grey-color};
+ --icon-invert: invert(0);
+}
+
@import '../../node_modules/bootstrap/scss/bootstrap';
@import '../../node_modules/bootstrap-vue/src/index.scss';
@import './marker-cluster.scss';
@@ -124,3 +152,14 @@ a {
color: var(--clickable-text);
}
}
+
+.popover {
+ background-color: var(--main-bg-color);
+ border-color: var(--sub-card-border);
+}
+
+.popover-header {
+ background-color: var(--sub-card-bg);
+ color: var(--text-color);
+ border-color: var(--sub-card-border);
+}
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index 59a337103..33de224ed 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -6,22 +6,26 @@ $red-color: red;
$pink-color: #f0f;
$accent-color: #f0f;
$blue-color: #00c8ff;
-$green-color: #33dd50;
-$orange-color: #ff9600;
+$green-color: #287326;
+$orange-color: #F4A900;
$violet-color: #9875ff;
$black-color: #000000;
$white-color: #ffffff;
$grey-color: #555;
$dark-grey-color: #000000de;
$transparent: #00000000;
+$light-white-grey: #707070;
+$testnet-dark-mode-main-bg: #272727;
+$testnet-dark-mode-grid-bg: #303030;
+
$light-mode-card-bg-color: #fcfcfc;
$dark-white-color: #f3f4f8;
$dark-mode-button-text-color: #26C3F2;
$dark-mode-text-title-color: #b429fa;
-$dark-mode-text-color: #FFFFFF;
-$dark-mode-green-text-color: #B3E6B3;
+$dark-mode-text-color: #CCC;
+$dark-mode-green-text-color: #287326;
$dark-mode-card-bg-color: #0B0118;
$dark-mode-main-bg: #221c31;
$dark-mode-grid-bg: #2b263a66;
+ 
