fix: Fix Wallet Main Currency Name - MEED-2307 - Meeds-io/meeds#1010 (#…

…392) Prior to this change, the display of Matic amounts was made in ehter instead of Matic. This change will fix it by introducing two labels, one for name and another for symbol.
Meeds-io · Jul 21, 2023 · f2ef7b0 · f2ef7b0
1 parent 36a2d56
commit f2ef7b0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/wallet-services/src/main/resources/locale/addon/Wallet_en.properties b/wallet-services/src/main/resources/locale/addon/Wallet_en.properties
@@ -474,3 +474,6 @@ exoplatform.wallet.label.metamask.buttonTitle=Connect with metamask Wallet
 exoplatform.wallet.metamask.error.transactionFailed=Transaction failed
 exoplatform.wallet.metamask.message.transactionSent=Transaction sent
 exoplatform.wallet.message.followTransaction={0} link to follow your transaction
+
+wallet.mainCurrency=Matic
+wallet.mainCurrencySymbol=Matic
diff --git a/...s/src/main/webapp/vue-app/wallet-admin/components/admin/wallets/WalletAdminWalletsTab.vue b/...s/src/main/webapp/vue-app/wallet-admin/components/admin/wallets/WalletAdminWalletsTab.vue
@@ -377,9 +377,9 @@ export default {
     },
     etherAccountDetails() {
       return {
-        title: 'ether',
+        title: this.$t('wallet.mainCurrency'),
         icon: 'ether',
-        symbol: 'ether',
+        symbol: this.$t('wallet.mainCurrencySymbol'),
         isContract: false,
         balance: 10, //  Fake balance to not display unsufficient funds
         address: this.walletAddress,
@@ -532,9 +532,9 @@ export default {
       this.selectedWalletAddress = wallet.address;
       this.selectedWallet = wallet;
       this.selectedWalletDetails = {
-        title: 'ether',
+        title: this.$t('wallet.mainCurrency'),
         icon: 'fab fa-ethereum',
-        symbol: 'ether',
+        symbol: this.$t('wallet.mainCurrencySymbol'),
         address: this.selectedWalletAddress,
         balance: wallet.etherBalance,
         balanceFiat: wallet.fiatBalance,

diff --git a/...webapp/vue-app/wallet-admin/components/admin/wallets/modals/WalletAdminSendEtherModal.vue b/...webapp/vue-app/wallet-admin/components/admin/wallets/modals/WalletAdminSendEtherModal.vue
@@ -130,7 +130,7 @@ export default {
       }
       this.wallet = wallet;
       this.etherAmount = etherAmount;
-      this.transactionLabel = `Send ether for wallet of ${this.wallet.type} ${this.wallet.name}`;
+      this.transactionLabel = `Send ${this.$t('wallet.mainCurrency')} for wallet of ${this.wallet.type} ${this.wallet.name}`;
       this.transactionMessage = initialFundsMessage;
 
       this.error = null;
@@ -156,7 +156,7 @@ export default {
         if (resp && resp.ok) {
           return resp.text();
         } else {
-          throw new Error(`Error sending ether to wallet ${this.wallet.address}`);
+          throw new Error(`Error sending ${this.$t('wallet.mainCurrency')} to wallet ${this.wallet.address}`);
         }
       }).then((hash) => {
         this.$emit('sent', hash);

diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-common/components/TransactionsList.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-common/components/TransactionsList.vue
@@ -247,7 +247,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                 <v-list-item-content v-if="item.type === 'ether' && item.value && Number(item.value)" class="transactionDetailActions">
                   <v-list-item-title :class="item.adminIcon ? '' : (item.pending || item.succeeded) ? 'primary--text' : 'red--text'">
                     <span>
-                      {{ toFixed(item.value) }} ether
+                      {{ toFixed(item.value) }} {{ $t('wallet.mainCurrency') }}
                     </span>
                   </v-list-item-title>
                   <v-list-item-subtitle v-if="item.amountFiat">
@@ -269,7 +269,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                     v-else-if="item.value && Number(item.value)"
                     :class="(item.pending || item.succeeded) ? 'primary--text' : 'red--text'">
                     <span>
-                      {{ toFixed(item.value) }} ether
+                      {{ toFixed(item.value) }} {{ $t('wallet.mainCurrency') }}
                     </span>
                   </v-list-item-title>
                   <v-list-item-subtitle
@@ -393,7 +393,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                   </v-list-item-content>
                   <v-list-item-content class="align-end text-end">
                     <div class="no-wrap">
-                      {{ toFixed(item.value) }} ether
+                      {{ toFixed(item.value) }} {{ $t('wallet.mainCurrency') }}
                     </div>
                   </v-list-item-content>
                 </v-list-item>
@@ -469,8 +469,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                     {{ toFixed(item.feeFiat) }} {{ fiatSymbol }}
                     <v-icon
                       v-if="item.noContractFunds"
-                      color="orange"
-                      title="You financed transaction fee with ether instead of Token.">
+                      color="orange">
                       warning
                     </v-icon>
                   </div>