Merge pull request #77 from AstraProtocol/feat/add-msg-grant

feat: add msg grant
AstraProtocol · Mar 2, 2023 · b211d6d · b211d6d
2 parents 934d31c + e6ecf44
commit b211d6d
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 14 deletions.
diff --git a/components/Card/CardInfo/Components/CardTabs.tsx b/components/Card/CardInfo/Components/CardTabs.tsx
@@ -106,7 +106,7 @@ export default function CardTabs({ tabTitles, tabContent }: CardTabsProps) {
 				<Tabs
 					tabs={_title}
 					contents={_content}
-					classes="padding-top-xs aaa"
+					classes="padding-top-xs"
 					headerBorder={false}
 					headerPadding="padding-left-sm flex-wrap"
 				/>

diff --git a/components/Card/CardInfo/style.module.scss b/components/Card/CardInfo/style.module.scss
@@ -2,6 +2,15 @@
 	.leftColumn {
 	}
 	.rightColumn {
+		table {
+			display: table;
+			text-align: left;
+			td,
+			th {
+				padding-left: 10px !important;
+				width: 2%;
+			}
+		}
 	}
 }
 .smallCard {

diff --git a/types/transactions.d.ts b/types/transactions.d.ts
@@ -275,6 +275,8 @@ interface CosmosTxMessage {
 	funderAddress?: string
 	accountAddress?: string
 	destAddress?: string
+
+	granter?: string
 }
 
 interface TransactionDetail {

diff --git a/utils/enum.ts b/utils/enum.ts
@@ -124,7 +124,10 @@ export enum CardInfoLabels {
 
 	funderAddress = 'Funder Address:',
 	accountAddress = 'Account Address: ',
-	destAddress = 'Dest Address:'
+	destAddress = 'Dest Address:',
+
+	grant = 'Grant: ',
+	granter = 'Granter: '
 }
 
 export enum ErcTypeEnum {

diff --git a/views/transactions/cosmosMessage.ts b/views/transactions/cosmosMessage.ts
@@ -28,9 +28,9 @@ export const handleCosmosMsg = (messages: TransactionMessage[]) => {
 			case TransactionTypeEnum.MsgExec:
 				messageData.push(_mapMsgExec(msg, messages))
 				break
-			// case TransactionTypeEnum.MsgGrant:
-			// 	messageData.push(_mapMsgGrant(msg))
-			// 	break
+			case TransactionTypeEnum.MsgGrant:
+				messageData.push(_mapMsgGrant(msg))
+				break
 			case TransactionTypeEnum.MsgWithdrawDelegatorReward:
 				messageData.push(_mapMsgWithdrawDelegatorReward(msg))
 				break
@@ -207,15 +207,17 @@ const _mapMsgExec = (msg: TransactionMessage, messages: TransactionMessage[]): C
 		}
 	}
 }
-// const _mapMsgGrant = (msg: TransactionMessage): CosmosTxMessage => {
-// 	const content = msg.content as unknown as MsgExecContent
-// 	if (msg && content) {
-// 		return {
-// 			type: msg.type,
-// 			grantee: content.params.grantee
-// 		}
-// 	}
-// }
+const _mapMsgGrant = (msg: TransactionMessage): CosmosTxMessage => {
+	const content = msg.content as unknown as MsgGrantContent
+	if (msg && content) {
+		return {
+			type: msg.type,
+			granter: content.params.maybeGenericGrant.granter,
+			grantee: content.params.maybeGenericGrant.grantee,
+			dynamicRender: [{ grant: content.params.maybeGenericGrant.grant }]
+		}
+	}
+}
 
 const _mapMsgWithdrawDelegatorReward = (msg: TransactionMessage): CosmosTxMessage => {
 	const content = msg.content as unknown as MsgWithdrawDelegatorRewardContent

diff --git a/views/transactions/hook/convertDataConstants.ts b/views/transactions/hook/convertDataConstants.ts
@@ -46,7 +46,9 @@ export const COSMOS_MESSAGE_SORT_FIELD = [
 	CardInfoLabels.validatorSrcAddress,
 	CardInfoLabels.validatorDstAddress,
 	//MsgExec
+	CardInfoLabels.granter,
 	CardInfoLabels.grantee,
+	CardInfoLabels.grant,
 	//MsgCreateValidator
 	CardInfoLabels.validatorDescription,
 	CardInfoLabels.commissionRates,

diff --git a/views/transactions/hook/utils.tsx b/views/transactions/hook/utils.tsx
@@ -213,6 +213,7 @@ export const _cardData = (data: TransactionDetail, astraPrice: string) => {
 			case 'delegatorAddress':
 			case 'recipientAddress':
 			case 'grantee':
+			case 'granter':
 				if (!isEmpty(data[key])) {
 					const evmAddress = key === 'grantee' ? data[key] : astraToEth(data[key])
 					items.push({