Merge pull request #35 from leapwallet/main

Fixed vote message and unknown transaction type UI
leapwallet · Aug 28, 2023 · fdbf2b7 · fdbf2b7
2 parents 80d8327 + d88c549
commit fdbf2b7
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 10 deletions.
diff --git a/packages/cosmos-snap-provider/package.json b/packages/cosmos-snap-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@leapwallet/cosmos-snap-provider",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "repository": {
     "url": "[email protected]:leapwallet/cosmos-metamask-snap.git"
   },

diff --git a/packages/snap/package.json b/packages/snap/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@leapwallet/metamask-cosmos-snap",
-  "version": "0.1.13",
-  "description": "Leapwallet cosmos snap for metamask",
+  "version": "0.1.14",
+  "description": "Securely manage keys, connect to Cosmos dapps, and sign transactions.",
   "repository": {
     "type": "git",
     "url": "https://github.com/leapwallet/cosmos-metamask-snap.git"

diff --git a/packages/snap/snap.manifest.json b/packages/snap/snap.manifest.json
@@ -1,13 +1,13 @@
 {
-  "version": "0.1.9",
-  "description": "Leap wallet sample snap",
-  "proposedName": "Leap Wallet",
+  "version": "0.1.13",
+  "description": "Securely manage keys, connect to Cosmos dapps, and sign transactions.",
+  "proposedName": "Leap Cosmos Wallet",
   "repository": {
     "type": "git",
     "url": "https://github.com/leapwallet/cosmos-metamask-snap.git"
   },
   "source": {
-    "shasum": "7qf7sR/MdDhBsxskH0ugQJ7QUOCt1jp1Z7fLv8xcSo8=",
+    "shasum": "GS2ctQz5+vyTkeLbo78/qycmuYesidCeNNYqPdZkbGo=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

diff --git a/packages/snap/src/helpers/parser.ts b/packages/snap/src/helpers/parser.ts
@@ -5,7 +5,9 @@ import {
   ParsedMessage,
   ParsedMessageType,
   Token,
+  CosmosGovVoteOption,
 } from '@leapwallet/parser-parfait';
+
 import {
   convertObjectCasingFromCamelToSnake,
   DirectSignDocDecoder,
@@ -17,6 +19,44 @@ import DENOMS from '../constants/denoms';
 
 const messageParser = new MessageParser();
 
+export const convertVoteOptionToString = (
+  voteOption: CosmosGovVoteOption | number | null,
+): string => {
+  switch (voteOption) {
+    case 1:
+      return 'Yes';
+    case 2:
+      return 'Abstain';
+    case 3:
+      return 'No';
+    case 4:
+      return 'No with Veto';
+    case CosmosGovVoteOption.YES:
+      return 'Yes';
+    case CosmosGovVoteOption.ABSTAIN:
+      return 'Abstain';
+    case CosmosGovVoteOption.NO:
+      return 'No';
+    case CosmosGovVoteOption.NO_WITH_VETO:
+      return 'No with Veto';
+    case CosmosGovVoteOption.UNSPECIFIED:
+      return 'Unspecified';
+    default:
+      return 'Unspecified';
+  }
+};
+
+export const getProposalId = (proposalId: any) => {
+  if (typeof proposalId === 'string') {
+    return proposalId;
+  }
+
+  if (typeof proposalId === 'object') {
+    return proposalId.low;
+  }
+  return proposalId;
+};
+
 export const formatBigNumber = (n: BigNumber) => {
   if (isNaN(n?.toNumber())) {
     return '-';
@@ -83,7 +123,7 @@ export const getSimpleType = (type: string | undefined) => {
   return parts[parts.length - 1] ?? '';
 };
 
-export const getMessageDetails = (message: ParsedMessage): string => {
+export const getMessageDetails = (message: ParsedMessage, raw: any): string => {
   switch (message.__type) {
     case ParsedMessageType.AuthzExec:
       return `${sliceAddress(
@@ -169,7 +209,9 @@ export const getMessageDetails = (message: ParsedMessage): string => {
         message.initialDeposit,
       )}`;
     case ParsedMessageType.GovVote:
-      return `Vote ${message.option} on proposal ${message.proposalId}`;
+      return `Vote ${convertVoteOptionToString(
+        message.option || raw?.option,
+      )} on proposal ${getProposalId(message?.proposalId)}`;
     case ParsedMessageType.GovDeposit:
       return `Deposit ${tokensToString(message?.amount ?? [])} on proposal ${
         message.proposalId
@@ -320,8 +362,12 @@ const parser = {
         copyable(`${origin}`),
         heading(''),
       ];
+
       parsedMessages.forEach((msg) => {
-        return panels.push(heading(`${getMessageDetails(msg.parsed)}`));
+        const panelMsg = getMessageDetails(msg.parsed, msg.raw);
+        if (panelMsg !== 'Unknown Transaction Type') {
+          panels.push(heading(`${getMessageDetails(msg.parsed, msg.raw)}`));
+        }
       });
 
       if (parsedMessages) {