Ana/send claim rewards amount to extension

changes/ana_send-claim-rewards-amount-to-extension

@@ -0,0 +1 @@
+[Changed] [#3736](https://github.com/cosmos/lunie/pull/3736) Now ModalWithdrawRewards returns the claimed rewards amount in transactionData and sends it to the extension @Bitcoinera

src/ActionModal/components/ActionModal.vue

@@ -737,6 +737,11 @@ export default {
         submitType: this.selectedSignMethod,
         password: this.password
       }
+      const txMetadata = {
+        ...feeProperties,
+        displayedProperties:
+          this.title === "Claim Rewards" ? properties.amounts : null
+      }
 
       try {
         await this.$apollo.queries.overview.refetch()
@@ -753,7 +758,7 @@ export default {
           type,
           memo,
           properties,
-          feeProperties
+          txMetadata
         )
 
         const { hash } = hashResult

src/ActionModal/components/ModalWithdrawRewards.vue

@@ -60,8 +60,15 @@ export default {
   computed: {
     ...mapGetters([`address`, `network`, `stakingDenom`]),
     transactionData() {
+      if (!this.claimedReward) return {}
       return {
-        type: transaction.WITHDRAW
+        type: transaction.WITHDRAW,
+        amounts: [
+          {
+            amount: this.claimedReward.amount,
+            denom: this.claimedReward.denom
+          }
+        ]
       }
     },
     totalRewards() {
@@ -88,14 +95,15 @@ export default {
       }
     },
     claimedReward() {
-      if (this.denom && this.rewards && this.rewards.length > 0) {
+      if (this.rewards && this.rewards.length > 0) {
         // we return the staking denom reward if it has any. Otherwise, we return the first reward from the other tokens
         const rewardsGreaterThanZero = this.rewards.filter(
           reward => reward.amount > 0
         )
         return (
-          rewardsGreaterThanZero.find(reward => reward.denom === this.denom) ||
-          rewardsGreaterThanZero[0]
+          rewardsGreaterThanZero.find(
+            reward => reward.denom === this.stakingDenom
+          ) || rewardsGreaterThanZero[0]
         )
       } else {
         return ""
@@ -108,15 +116,15 @@ export default {
       if (this.balances && this.balances.length > 0) {
         const nonZeroBalances = this.balances.filter(({ amount }) => amount > 0)
         const stakingDenomBalance = nonZeroBalances.find(
-          ({ denom }) => denom === this.denom
+          ({ denom }) => denom === this.stakingDenom
         )
         return stakingDenomBalance
           ? stakingDenomBalance.denom
           : nonZeroBalances.length > 0
           ? nonZeroBalances[0].denom
-          : this.denom
+          : this.stakingDenom
       } else {
-        return this.denom
+        return this.stakingDenom
       }
     }
   },

src/ActionModal/utils/ActionManager.js

@@ -78,12 +78,19 @@ export default class ActionManager {
     transactionProperties,
     txMetaData
   ) {
-    const { gasEstimate, gasPrice, submitType, password } = txMetaData
+    const {
+      gasEstimate,
+      gasPrice,
+      submitType,
+      password,
+      displayedProperties
+    } = txMetaData
     const signer = await getSigner(config, submitType, {
       address: userAddress,
       password,
       network: networkId,
-      networkType
+      networkType,
+      displayedProperties
     })
 
     const messageMetadata = {

src/ActionModal/utils/signer.js

@@ -18,7 +18,7 @@ export async function signQueue(submitType = "") {
 export async function getSigner(
   config,
   signingType = "",
-  { address, password, network, networkType }
+  { address, password, network, networkType, displayedProperties }
 ) {
   if (signingType === `local`) {
     const { getStoredWallet } = await import("@lunie/cosmos-keys")
@@ -35,7 +35,12 @@ export async function getSigner(
     }
   } else if (signingType === `extension`) {
     return signMessage => {
-      return signWithExtension(signMessage, address, network)
+      return signWithExtension(
+        signMessage,
+        address,
+        network,
+        displayedProperties
+      )
     }
   }
 

src/scripts/extension-utils.js

@@ -102,14 +102,16 @@ export const getSignQueue = async () => {
 export const signWithExtension = async (
   signMessage,
   senderAddress,
-  network
+  network,
+  displayedProperties
 ) => {
   const { signature, publicKey } = await sendAsyncMessageToContentScript({
     type: "LUNIE_SIGN_REQUEST",
     payload: {
       signMessage,
       senderAddress,
-      network
+      network,
+      displayedProperties
     }
   })
 

tests/unit/specs/components/ActionModal/components/ModalWithdrawRewards.spec.js

@@ -104,7 +104,13 @@ describe(`ModalWithdrawRewards`, () => {
   describe("Submission Data for Delegating", () => {
     it("should return correct transaction data for delegating", () => {
       expect(wrapper.vm.transactionData).toEqual({
-        type: "MsgWithdrawDelegationReward"
+        type: "MsgWithdrawDelegationReward",
+        amounts: [
+          {
+            amount: 1,
+            denom: "STAKE"
+          }
+        ]
       })
     })
 

tests/unit/specs/components/ActionModal/components/__snapshots__/ModalWithdrawRewards.spec.js.snap

@@ -9,7 +9,7 @@ exports[`ModalWithdrawRewards should show the withdraw rewards modal 1`] = `
   id="modal-withdraw-rewards"
   notifymessage="[object Object]"
   rewards="[object Object],[object Object]"
-  selecteddenom=""
+  selecteddenom="STAKE"
   submissionerrorprefix="Withdrawal failed"
   title="Claim Rewards"
   transactiondata="[object Object]"