From b1df2285db1c41db0110c49c9fc0a7127923a582 Mon Sep 17 00:00:00 2001
From: chudasamajd <jagdish@assetmantle.one>
Date: Wed, 13 Sep 2023 14:07:13 +0530
Subject: [PATCH] fix: validators list in wallet reward

---
 .../accountDelegationsDelegated.scala.html    | 10 ++++++----
 .../account/accountWalletRewards.scala.html   | 16 ++++++++++++----
 public/stylesheets/css/class.css              | 19 ++++++++++++++++++-
 3 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/app/views/component/blockchain/account/accountDelegationsDelegated.scala.html b/app/views/component/blockchain/account/accountDelegationsDelegated.scala.html
index d6ef5362d..62fe0634f 100644
--- a/app/views/component/blockchain/account/accountDelegationsDelegated.scala.html
+++ b/app/views/component/blockchain/account/accountDelegationsDelegated.scala.html
@@ -3,6 +3,7 @@
 @import scala.collection.immutable.ListMap
 @import utilities.MicroNumber
 @import views.html.base.cards._
+@import views.html.base.infos.commonHtmlToHtmlInfo
 
 @(delegations: ListMap[String, MicroNumber], validatorsMoniker: Map[String, String])(implicit requestHeader: RequestHeader, messagesProvider: MessagesProvider)
 <div class="pieChartContainer tableCard">
@@ -11,16 +12,17 @@
             <div class="delegationInfo">
                 @commonTable(id = "accountDelegationsDetail", tableType = "cmuk-table-divider") {
                 } {
-                    @delegations.map { case (validatorAddress, amount) =>
                     <tr>
                         <td>
                             <div class="tableField">
-                                <div class="tableFieldTitle">@commonJavascriptLink(validatorsMoniker.getOrElse(validatorAddress, validatorAddress), JavaScript(s"""componentResource('explorerContent', jsRoutes.controllers.ComponentViewController.validator('${validatorAddress}'))"""))</div>
-                                <div class="tableFieldValue">@Html(utilities.NumericOperation.formatNumber(amount))</div>
+                                <div class="tableFieldValue">
+                                @delegations.map { case (validatorAddress, amount) =>
+                                    @commonHtmlToHtmlInfo(key = commonJavascriptLink(validatorsMoniker.getOrElse(validatorAddress, validatorAddress), JavaScript(s"""componentResource('explorerContent', jsRoutes.controllers.ComponentViewController.validator('${validatorAddress}'))""")), value = Html(utilities.NumericOperation.formatNumber(amount)))
+                                }
+                                </div>
                             </div>
                         </td>
                     </tr>
-                    }
                 }
             </div>
             @commonPieChart("accountDelegationsDelegatedChart", ListMap(delegations.map{case (operator, amount) => validatorsMoniker.getOrElse(operator, operator) -> amount.toDouble}.toList: _*), showLegend = true)
diff --git a/app/views/component/blockchain/account/accountWalletRewards.scala.html b/app/views/component/blockchain/account/accountWalletRewards.scala.html
index 84ac72160..3e61e0b36 100644
--- a/app/views/component/blockchain/account/accountWalletRewards.scala.html
+++ b/app/views/component/blockchain/account/accountWalletRewards.scala.html
@@ -25,10 +25,18 @@
                 </div>
             </td>
         </tr>
+        <tr>
+            <td>
+                <div class="tableField">
+                    <div class="tableFieldTitle">@Messages(constants.View.VALIDATORS)</div>
+                    <div class="tableFieldValue">
+                        @validatorRewards.map { case (validatorAddress, amount) =>
+                            @commonHtmlToHtmlInfo(key = commonJavascriptLink(validatorsMap.getOrElse(validatorAddress, validatorAddress), JavaScript(s"""componentResource('explorerContent', jsRoutes.controllers.ComponentViewController.validator('${validatorAddress}'))""")), value = Html(amount.getAmountWithNormalizedDenom()))
+                        }
+                    </div>
+                </div>
+            </td>
+        </tr>
     }
-        <div class="cmuk-text-left title">@Messages(constants.View.VALIDATORS)</div>
-        @validatorRewards.map { case (validatorAddress, amount) =>
-            @commonHtmlToHtmlInfo(key = commonJavascriptLink(validatorsMap.getOrElse(validatorAddress, validatorAddress), JavaScript(s"""componentResource('explorerContent', jsRoutes.controllers.ComponentViewController.validator('${validatorAddress}'))""")), value = Html(amount.getAmountWithNormalizedDenom()))
-        }
     </div>
 </div>
\ No newline at end of file
diff --git a/public/stylesheets/css/class.css b/public/stylesheets/css/class.css
index 06fa187fd..c78a164ff 100644
--- a/public/stylesheets/css/class.css
+++ b/public/stylesheets/css/class.css
@@ -5121,7 +5121,6 @@ figure .block:hover {
 #accountWallet .allTokensContainer,
 #accountDelegations .delegationsDelegatedContainer {
     display: flex;
-    align-items: center;
 }
 
 #accountWallet .allTokensContainer .ibcDenom,
@@ -5272,4 +5271,22 @@ figure .block:hover {
 
 .navigationBarLogo{
     width: 160px !important;
+}
+
+#accountWalletRewardsDetail .tableFieldValue,
+#accountDelegationsDetail .tableFieldValue,
+#validatorDetail .tableFieldValue
+{
+    text-transform: none;
+}
+
+#accountWalletRewardsDetail .tableFieldValue .infoRowLabel,
+#accountDelegationsDetail .tableFieldValue .infoRowLabel
+{
+    padding-left: 0px;
+    text-transform: none;
+}
+
+#accountDelegationsDetail .tableFieldValue .infoRowValue{
+    white-space: nowrap;
 }
\ No newline at end of file