fix: #9 empty messages in execution

regen-network · May 2, 2023 · 2f9af22 · 2f9af22
1 parent 19d44ce
commit 2f9af22
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 10 deletions.
diff --git a/src/api/policy.messages.ts b/src/api/policy.messages.ts
@@ -51,7 +51,8 @@ export function encodeDecisionPolicy({
 }) {
   const windows = {
     minExecutionPeriod: secondsToDuration(1),
-    votingPeriod: daysToDuration(votingWindow),
+    // TODO: undo change before merging
+    votingPeriod: secondsToDuration(votingWindow), // daysToDuration(votingWindow),
   }
   if (policyType === 'percentage') {
     if (!percentage) throwError('Must provide percentage value')

diff --git a/src/api/proposal.utils.ts b/src/api/proposal.utils.ts
@@ -53,10 +53,13 @@ export function toUIProposal(sdkProposal: ProposalSDKType): UIProposal {
     groupPolicyVersion: sdkProposal.group_policy_version,
     groupVersion: sdkProposal.group_version,
     id: sdkProposal.id,
-    messages: sdkProposal.messages.map((msg) => ({
-      typeUrl: msg.type_url,
-      value: msg.value,
-    })),
+    messages: sdkProposal.messages.map(
+      (msg: any) =>
+        ({
+          typeUrl: msg['@type'],
+          value: msg,
+        } as Any),
+    ), // TODO
     metadata: getProposalMetadata(sdkProposal.metadata, {
       title: `Proposal #${sdkProposal.id}`,
     }),

diff --git a/src/components/organisms/proposal-review.tsx b/src/components/organisms/proposal-review.tsx
@@ -79,7 +79,7 @@ function renderAction(action: ProposalAction, groupPolicyAddress: string) {
   }
 }
 
-const SendReview = ({
+export const SendReview = ({
   groupPolicyAddress,
   values,
 }: {
@@ -90,7 +90,7 @@ const SendReview = ({
   return (
     <FormCard title="Send">
       <Stack spacing={SPACING.formStack}>
-        <ReviewItem label="Type">{values.sendType}</ReviewItem>
+        {'sendType' in values && <ReviewItem label="Type">{values.sendType}</ReviewItem>}
         <ReviewItem label="From Address">
           <Truncate
             clickToCopy
@@ -110,7 +110,7 @@ const SendReview = ({
   )
 }
 
-const StakeReview = ({
+export const StakeReview = ({
   groupPolicyAddress,
   values,
 }: {
@@ -121,7 +121,9 @@ const StakeReview = ({
   return (
     <FormCard title="Stake">
       <Stack spacing={SPACING.formStack}>
-        <ReviewItem label="Type">{values.stakeType}</ReviewItem>
+        {'stakeType' in values && (
+          <ReviewItem label="Type">{values.stakeType}</ReviewItem>
+        )}
         <ReviewItem label="Delegator">
           <Truncate
             clickToCopy

diff --git a/src/components/organisms/proposal-summary.tsx b/src/components/organisms/proposal-summary.tsx
@@ -1,4 +1,13 @@
-import type { UIGroup, UIProposal, Vote, VoteOptionType } from 'types'
+import { Any } from '@haveanicedavid/regen-ts/types/codegen/google/protobuf/any'
+
+import type {
+  ProposalSendFormValues,
+  ProposalStakeFormValues,
+  UIGroup,
+  UIProposal,
+  Vote,
+  VoteOptionType,
+} from 'types'
 import { formatDate } from 'util/date'
 import { VoteOption } from 'util/enums'
 
@@ -17,6 +26,7 @@ import {
   Text,
 } from '@/atoms'
 import { VoteButtons } from '@/molecules/vote-buttons'
+import { SendReview, StakeReview } from '@/organisms/proposal-review'
 
 import { VotesGraph } from './votes-graph'
 
@@ -52,6 +62,9 @@ export const ProposalSummary = ({
             </Stack>
             <Heading>{proposal.metadata.title}</Heading>
             <Text>{proposal.metadata.summary}</Text>
+            {proposal.messages.map((msg) =>
+              renderMessage(msg, proposal.groupPolicyAddress),
+            )}
           </Stack>
         </CardBody>
         <CardBody bg={cardBgDark} borderRightRadius="lg">
@@ -89,3 +102,28 @@ export const ProposalSummary = ({
     </Card>
   )
 }
+
+function renderMessage(msg: Any, groupPolicyAddress: string) {
+  if (!msg) return null
+  switch (msg.typeUrl) {
+    case '/cosmos.bank.v1beta1.MsgSend':
+      return (
+        <SendReview
+          groupPolicyAddress={groupPolicyAddress}
+          values={msg as unknown as ProposalSendFormValues}
+        />
+      )
+    case '/cosmos.staking.v1beta1.MsgDelegate':
+    case '/cosmos.staking.v1beta1.MsgBeginRedelegate':
+    case '/cosmos.staking.v1beta1.MsgUndelegate':
+    case '/cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward':
+      return (
+        <StakeReview
+          groupPolicyAddress={groupPolicyAddress}
+          values={msg as unknown as ProposalStakeFormValues}
+        />
+      )
+    default:
+      return null
+  }
+}