diff --git a/src/popup/locales/en.json b/src/popup/locales/en.json index b69148cf61..6b59c9a811 100644 --- a/src/popup/locales/en.json +++ b/src/popup/locales/en.json @@ -187,9 +187,6 @@ "recentTransactions": { "recentActivity": "Recent Activity", "viewAll": "View all", - "pendingStatus": "Pending", - "sentStatus": "Sent", - "receivedStatus": "Received", "noTransactionsFound": "No transactions found!" }, "addFungibleToken": { @@ -707,7 +704,10 @@ "nameUpdate": "name update tx", "createTx": "create tx", "clear": "Clear filter", - "apply": "Apply filter" + "apply": "Apply filter", + "sent": "Sent", + "received": "Received", + "pending": "Pending" }, "utilities": { "heading": "Utilities", diff --git a/src/popup/router/components/PendingTxs.vue b/src/popup/router/components/PendingTxs.vue index a66ca7fe83..a58031d0d1 100644 --- a/src/popup/router/components/PendingTxs.vue +++ b/src/popup/router/components/PendingTxs.vue @@ -1,46 +1,34 @@ - - - - {{ tr.amount }} {{ $t('pages.appVUE.aeid') }} - ( {{ tr.amountCurrency }} {{ currentCurrency }} ) - - {{ - $t('pages.recentTransactions.pendingStatus') - }} - {{ tr.time | formatDate }} - - - {{ tr.domain }} - - - + - - diff --git a/src/popup/router/components/RecentTransactions.vue b/src/popup/router/components/RecentTransactions.vue index 37b208d2d6..6d31900816 100644 --- a/src/popup/router/components/RecentTransactions.vue +++ b/src/popup/router/components/RecentTransactions.vue @@ -14,7 +14,7 @@ :dark="true" v-for="transaction in transactions.latest" :key="transaction.id" - :transactionData="transaction" + :transaction="transaction" > diff --git a/src/popup/router/components/TransactionItem.vue b/src/popup/router/components/TransactionItem.vue index 71d7889807..62a7033ec9 100644 --- a/src/popup/router/components/TransactionItem.vue +++ b/src/popup/router/components/TransactionItem.vue @@ -1,85 +1,84 @@ - + {{ txAmount }} {{ $t('pages.appVUE.aeid') }} - ( {{ txAmountToCurrency }} {{ current.currency.toUpperCase() }} ) + + ( {{ txAmountToCurrency }} {{ current.currency.toUpperCase() }} ) + - {{ - txType == 'Sent' - ? $t('pages.recentTransactions.sentStatus') - : $t('pages.recentTransactions.receivedStatus') - }} - {{ transactionDate }} + {{ status }} + {{ transaction.time | formatDate }} {{ tipUrl }} - + - + -