[APP-789] Auto reward bug fixed

cosmostation · Jul 13, 2023 · 5e70913 · 5e70913
1 parent 71f09de
commit 5e70913
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/app/src/main/java/wannabit/io/cosmostaion/utils/WDp.java b/app/src/main/java/wannabit/io/cosmostaion/utils/WDp.java
@@ -1273,7 +1273,7 @@ public static Coin onParseFee(ChainConfig chainConfig, ServiceOuterClass.GetTxRe
         }
     }
 
-    public static ArrayList<Coin> onParseAutoReward(ServiceOuterClass.GetTxResponse response, String Addr, int position) {
+    public static ArrayList<Coin> onParseAutoReward(ServiceOuterClass.GetTxResponse response, String Addr, int position, String msgAmount) {
         ArrayList<Coin> result = new ArrayList<>();
         if (response.getTxResponse().getLogsCount() > 0 && response.getTxResponse().getLogs(position) != null) {
             for (Abci.StringEvent event : response.getTxResponse().getLogs(position).getEventsList()) {
@@ -1289,7 +1289,9 @@ public static ArrayList<Coin> onParseAutoReward(ServiceOuterClass.GetTxResponse
                                         if (m.find()) {
                                             String amount = m.group();
                                             String denom = rawCoin.substring(m.end());
-                                            result.add(new Coin(denom, amount));
+                                            if (!msgAmount.equals(amount)) {
+                                                result.add(new Coin(denom, amount));
+                                            }
                                         }
                                     }
                                 }

diff --git a/app/src/main/java/wannabit/io/cosmostaion/widget/txDetail/TxDelegateHolder.java b/app/src/main/java/wannabit/io/cosmostaion/widget/txDetail/TxDelegateHolder.java
@@ -60,7 +60,7 @@ public void onBindMsg(Context c, BaseData baseData, ChainConfig chainConfig, Ser
             itemMoniker.setText( "(" + baseData.getValidatorInfo(msg.getValidatorAddress()).getDescription().getMoniker() + ")");
             WDp.setDpCoin(c, baseData, chainConfig, msg.getAmount().getDenom(), msg.getAmount().getAmount(), itemDelegateAmountDenom, itemDelegateAmount);
 
-            ArrayList<Coin> commissionCoins = WDp.onParseAutoReward(response, address, position);
+            ArrayList<Coin> commissionCoins = WDp.onParseAutoReward(response, address, position, msg.getAmount().getAmount());
             if (commissionCoins.size() > 0) {
                 commission0Layer.setVisibility(View.VISIBLE);
                 WDp.setDpCoin(c, baseData, chainConfig, commissionCoins.get(0), itemCommissionDenom0, itemCommissionAmount0);

diff --git a/app/src/main/java/wannabit/io/cosmostaion/widget/txDetail/TxReDelegateHolder.java b/app/src/main/java/wannabit/io/cosmostaion/widget/txDetail/TxReDelegateHolder.java
@@ -64,7 +64,7 @@ public void onBindMsg(Context c, BaseData baseData, ChainConfig chainConfig, Ser
             itemToMoniker.setText( "(" + baseData.getValidatorInfo(msg.getValidatorDstAddress()).getDescription().getMoniker() + ")");
             WDp.setDpCoin(c, baseData, chainConfig, msg.getAmount().getDenom(), msg.getAmount().getAmount(), itemReDelegateAmountDenom, itemRedelegateAmount);
 
-            ArrayList<Coin> commissionCoins = WDp.onParseAutoReward(response, address, position);
+            ArrayList<Coin> commissionCoins = WDp.onParseAutoReward(response, address, position, msg.getAmount().getAmount());
             if (commissionCoins.size() > 0) {
                 commission0Layer.setVisibility(View.VISIBLE);
                 WDp.setDpCoin(c, baseData, chainConfig, commissionCoins.get(0), itemCommissionDenom0, itemCommissionAmount0);

diff --git a/app/src/main/java/wannabit/io/cosmostaion/widget/txDetail/TxUnDelegateHolder.java b/app/src/main/java/wannabit/io/cosmostaion/widget/txDetail/TxUnDelegateHolder.java
@@ -60,7 +60,7 @@ public void onBindMsg(Context c, BaseData baseData, ChainConfig chainConfig, Ser
             itemMoniker.setText( "(" + baseData.getValidatorInfo(msg.getValidatorAddress()).getDescription().getMoniker() + ")");
             WDp.setDpCoin(c, baseData, chainConfig, msg.getAmount().getDenom(), msg.getAmount().getAmount(), itemUnDelegateAmountDenom, itemUndelegateAmount);
 
-            ArrayList<Coin> commissionCoins = WDp.onParseAutoReward(response, address, position);
+            ArrayList<Coin> commissionCoins = WDp.onParseAutoReward(response, address, position, msg.getAmount().getAmount());
             if (commissionCoins.size() > 0) {
                 commission0Layer.setVisibility(View.VISIBLE);
                 WDp.setDpCoin(c, baseData, chainConfig, commissionCoins.get(0), itemCommissionDenom0, itemCommissionAmount0);