From b5c90c8ddfc5d9b274a0027ad106b9b2f13b4ab9 Mon Sep 17 00:00:00 2001 From: SpaghettiOverload Date: Thu, 5 Jan 2023 16:35:40 +0200 Subject: [PATCH 1/4] CUDOS-2035-proposal-change-details --- .../components/ProposalInformation/index.tsx | 37 ++++++++++++++++++- src/store/proposalDetails.ts | 2 + 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/src/containers/Proposals/ProposalDetails/components/ProposalInformation/index.tsx b/src/containers/Proposals/ProposalDetails/components/ProposalInformation/index.tsx index c813601..34d9f62 100644 --- a/src/containers/Proposals/ProposalDetails/components/ProposalInformation/index.tsx +++ b/src/containers/Proposals/ProposalDetails/components/ProposalInformation/index.tsx @@ -15,6 +15,13 @@ import { CHAIN_DETAILS } from 'utils/constants' import { COLORS_DARK_THEME } from 'theme/colors' import Markdown from 'components/Markdown' import { styles } from '../../../styles' +import { Fragment } from 'react' + +interface Change { + key: string; + value: string; + subspace: string; +} const ProposalInformation = () => { const { overview } = useSelector((state: RootState) => state.proposalDetails) @@ -29,7 +36,6 @@ const ProposalInformation = () => { ) } - console.log(overview.description) return ( @@ -190,6 +196,35 @@ const ProposalInformation = () => { + + + Changes + + + Subspace + + + Key + + + Value + + {overview.content.changes.map((item: Change, idx: number) => { + return ( + + + {item.subspace} + + + {item.key} + + + {item.value} + + + ) + })} + Date: Thu, 19 Jan 2023 16:42:14 +0200 Subject: [PATCH 2/4] CUDOS-2076-Implement-missing-TxMsgType-parsing --- .env.example | 13 ++++++ src/ledgers/utils.ts | 87 ++++++++++++++++++++++++++++++++++++++++- src/utils/constants.tsx | 15 +++++++ 3 files changed, 113 insertions(+), 2 deletions(-) diff --git a/.env.example b/.env.example index 2e98b3f..e772014 100644 --- a/.env.example +++ b/.env.example @@ -11,6 +11,19 @@ VITE_APP_LOCAL_STAKING_URL='' VITE_APP_LOCAL_CHAIN_NAME='' VITE_APP_LOCAL_CHAIN_ID='' +# DEV +VITE_APP_DEV_CAPTCHA_SITE_KEY='' +VITE_APP_DEV_FAUCET_ADDRESS='' +VITE_APP_DEV_BRIDGE_URL='' +VITE_APP_DEV_GRAPHQL_URL='' +VITE_APP_DEV_GRAPHQL_WS='' +VITE_APP_DEV_RPC='' +VITE_APP_DEV_API='' +VITE_APP_DEV_EXPLORER_URL='' +VITE_APP_DEV_STAKING_URL='' +VITE_APP_DEV_CHAIN_NAME='' +VITE_APP_DEV_CHAIN_ID='' + # PRIVATE VITE_APP_PRIVATE_CAPTCHA_SITE_KEY='' VITE_APP_PRIVATE_FAUCET_ADDRESS='' diff --git a/src/ledgers/utils.ts b/src/ledgers/utils.ts index 66217a9..800ebd4 100644 --- a/src/ledgers/utils.ts +++ b/src/ledgers/utils.ts @@ -31,7 +31,9 @@ const colors = { cosmwasm: '#212c6f', gravity: '#469990', cudosNft: '#ff1493', - cudosAdmin: '#535da8' + cudosAdmin: '#535da8', + marketplace: '#BA0086', + addressbook: '#FF720C' } export const defaultMessages = { @@ -440,7 +442,88 @@ export const defaultMessages = { typeUrl: 'gravity.v1.MsgValsetUpdatedClaim', color: colors.gravity, displayName: 'Valset Updated Claim' - } + }, + // ======================== + // marketplace + // ======================== + '/cudoventures.cudosnode.marketplace.MsgRemoveAdmin': { + typeUrl: 'cudoventures.cudosnode.marketplace.MsgRemoveAdmin', + color: colors.marketplace, + displayName: 'Remove Marketplace Admin' + }, + '/cudoventures.cudosnode.marketplace.MsgBuyNft': { + typeUrl: 'cudoventures.cudosnode.marketplace.MsgBuyNft', + color: colors.marketplace, + displayName: 'Buy NFT' + }, + '/cudoventures.cudosnode.marketplace.MsgUpdateRoyalties': { + typeUrl: 'cudoventures.cudosnode.marketplace.MsgUpdateRoyalties', + color: colors.marketplace, + displayName: 'Update NFT Royalties' + }, + '/cudoventures.cudosnode.marketplace.MsgUpdatePrice': { + typeUrl: 'cudoventures.cudosnode.marketplace.MsgUpdatePrice', + color: colors.marketplace, + displayName: 'Update NFT Price' + }, + '/cudoventures.cudosnode.marketplace.MsgRemoveNft': { + typeUrl: 'cudoventures.cudosnode.marketplace.MsgRemoveNft', + color: colors.marketplace, + displayName: 'Remove NFT from Sale' + }, + '/cudoventures.cudosnode.marketplace.MsgPublishNft': { + typeUrl: 'cudoventures.cudosnode.marketplace.MsgPublishNft', + color: colors.marketplace, + displayName: 'Publish NFT for Sale' + }, + '/cudoventures.cudosnode.marketplace.MsgMintNft': { + typeUrl: 'cudoventures.cudosnode.marketplace.MsgMintNft', + color: colors.marketplace, + displayName: 'Mint NFT' + }, + '/cudoventures.cudosnode.marketplace.MsgAddAdmin': { + typeUrl: 'cudoventures.cudosnode.marketplace.MsgAddAdmin', + color: colors.marketplace, + displayName: 'Add Marketplace Admin' + }, + '/cudoventures.cudosnode.marketplace.MsgUnverifyCollection': { + typeUrl: 'cudoventures.cudosnode.marketplace.MsgUnverifyCollection', + color: colors.marketplace, + displayName: 'Unverify NFT Collection' + }, + '/cudoventures.cudosnode.marketplace.MsgVerifyCollection': { + typeUrl: 'cudoventures.cudosnode.marketplace.MsgVerifyCollection', + color: colors.marketplace, + displayName: 'Verify NFT Collection' + }, + '/cudoventures.cudosnode.marketplace.MsgPublishCollection': { + typeUrl: 'cudoventures.cudosnode.marketplace.MsgPublishCollection', + color: colors.marketplace, + displayName: 'Publish NFT Collection' + }, + '/cudoventures.cudosnode.marketplace.MsgCreateCollection': { + typeUrl: 'cudoventures.cudosnode.marketplace.MsgCreateCollection', + color: colors.marketplace, + displayName: 'Create NFT Collection' + }, + // ======================== + // addressbook + // ======================== + '/cudoventures.cudosnode.addressbook.MsgDeleteAddress': { + typeUrl: 'cudoventures.cudosnode.addressbook.MsgDeleteAddress', + color: colors.addressbook, + displayName: 'Delete address' + }, + '/cudoventures.cudosnode.addressbook.MsgUpdateAddress': { + typeUrl: 'cudoventures.cudosnode.addressbook.MsgUpdateAddress', + color: colors.addressbook, + displayName: 'Update address' + }, + '/cudoventures.cudosnode.addressbook.MsgCreateAddress': { + typeUrl: 'cudoventures.cudosnode.addressbook.MsgCreateAddress', + color: colors.addressbook, + displayName: 'Create address' + }, } export const unknownMessage = { diff --git a/src/utils/constants.tsx b/src/utils/constants.tsx index 54bd60d..11b6123 100644 --- a/src/utils/constants.tsx +++ b/src/utils/constants.tsx @@ -4,66 +4,77 @@ export const CHAIN_DETAILS = { DEFAULT_NETWORK: import.meta.env.VITE_APP_DEFAULT_NETWORK || process.env.VITE_APP_DEFAULT_NETWORK || "", CAPTCHA_SITE_KEY: { LOCAL: import.meta.env.VITE_APP_LOCAL_CAPTCHA_SITE_KEY || process.env.VITE_APP_LOCAL_CAPTCHA_SITE_KEY || "", + DEV: import.meta.env.VITE_APP_DEV_CAPTCHA_SITE_KEY || process.env.VITE_APP_DEV_CAPTCHA_SITE_KEY || "", PRIVATE: import.meta.env.VITE_APP_PRIVATE_CAPTCHA_SITE_KEY || process.env.VITE_APP_PRIVATE_CAPTCHA_SITE_KEY || "", PUBLIC: import.meta.env.VITE_APP_PUBLIC_CAPTCHA_SITE_KEY || process.env.VITE_APP_PUBLIC_CAPTCHA_SITE_KEY || "", MAINNET: '' }, FAUCET_ADDRESS: { LOCAL: import.meta.env.VITE_APP_LOCAL_FAUCET_ADDRESS || process.env.VITE_APP_LOCAL_FAUCET_ADDRESS || "", + DEV: import.meta.env.VITE_APP_DEV_FAUCET_ADDRESS || process.env.VITE_APP_DEV_FAUCET_ADDRESS || "", PRIVATE: import.meta.env.VITE_APP_PRIVATE_FAUCET_ADDRESS || process.env.VITE_APP_PRIVATE_FAUCET_ADDRESS || "", PUBLIC: import.meta.env.VITE_APP_PUBLIC_FAUCET_ADDRESS || process.env.VITE_APP_PUBLIC_FAUCET_ADDRESS || "", MAINNET: '' }, BRIDGE_URL: { LOCAL: import.meta.env.VITE_APP_LOCAL_BRIDGE_URL || process.env.VITE_APP_LOCAL_BRIDGE_URL || "", + DEV: import.meta.env.VITE_APP_DEV_BRIDGE_URL || process.env.VITE_APP_DEV_BRIDGE_URL || "", PRIVATE: import.meta.env.VITE_APP_PRIVATE_BRIDGE_URL || process.env.VITE_APP_PRIVATE_BRIDGE_URL || "", PUBLIC: import.meta.env.VITE_APP_PUBLIC_BRIDGE_URL || process.env.VITE_APP_PUBLIC_BRIDGE_URL || "", MAINNET: import.meta.env.VITE_APP_MAINNET_BRIDGE_URL || process.env.VITE_APP_MAINNET_BRIDGE_URL || "", }, GRAPHQL_URL: { LOCAL: import.meta.env.VITE_APP_LOCAL_GRAPHQL_URL || process.env.VITE_APP_LOCAL_GRAPHQL_URL || "", + DEV: import.meta.env.VITE_APP_DEV_GRAPHQL_URL || process.env.VITE_APP_DEV_GRAPHQL_URL || "", PRIVATE: import.meta.env.VITE_APP_PRIVATE_GRAPHQL_URL || process.env.VITE_APP_PRIVATE_GRAPHQL_URL || "", PUBLIC: import.meta.env.VITE_APP_PUBLIC_GRAPHQL_URL || process.env.VITE_APP_PUBLIC_GRAPHQL_URL || "", MAINNET: import.meta.env.VITE_APP_MAINNET_GRAPHQL_URL || process.env.VITE_APP_MAINNET_GRAPHQL_URL || "" }, GRAPHQL_WS: { LOCAL: import.meta.env.VITE_APP_LOCAL_GRAPHQL_WS || process.env.VITE_APP_LOCAL_GRAPHQL_WS || "", + DEV: import.meta.env.VITE_APP_DEV_GRAPHQL_WS || process.env.VITE_APP_DEV_GRAPHQL_WS || "", PRIVATE: import.meta.env.VITE_APP_PRIVATE_GRAPHQL_WS || process.env.VITE_APP_PRIVATE_GRAPHQL_WS || "", PUBLIC: import.meta.env.VITE_APP_PUBLIC_GRAPHQL_WS || process.env.VITE_APP_PUBLIC_GRAPHQL_WS || "", MAINNET: import.meta.env.VITE_APP_MAINNET_GRAPHQL_WS || process.env.VITE_APP_MAINNET_GRAPHQL_WS || "" }, RPC_ADDRESS: { LOCAL: import.meta.env.VITE_APP_LOCAL_RPC || process.env.VITE_APP_LOCAL_RPC || "", + DEV: import.meta.env.VITE_APP_DEV_RPC || process.env.VITE_APP_DEV_RPC || "", PRIVATE: import.meta.env.VITE_APP_PRIVATE_RPC || process.env.VITE_APP_PRIVATE_RPC || "", PUBLIC: import.meta.env.VITE_APP_PUBLIC_RPC || process.env.VITE_APP_PUBLIC_RPC || "", MAINNET: import.meta.env.VITE_APP_MAINNET_RPC || process.env.VITE_APP_MAINNET_RPC || "" }, API_ADDRESS: { LOCAL: import.meta.env.VITE_APP_LOCAL_API || process.env.VITE_APP_LOCAL_API || "", + DEV: import.meta.env.VITE_APP_DEV_API || process.env.VITE_APP_DEV_API || "", PRIVATE: import.meta.env.VITE_APP_PRIVATE_API || process.env.VITE_APP_PRIVATE_API || "", PUBLIC: import.meta.env.VITE_APP_PUBLIC_API || process.env.VITE_APP_PUBLIC_API || "", MAINNET: import.meta.env.VITE_APP_MAINNET_API || process.env.VITE_APP_MAINNET_API || "" }, STAKING_URL: { LOCAL: import.meta.env.VITE_APP_LOCAL_STAKING_URL || process.env.VITE_APP_LOCAL_STAKING_URL || "", + DEV: import.meta.env.VITE_APP_DEV_STAKING_URL || process.env.VITE_APP_DEV_STAKING_URL || "", PRIVATE: import.meta.env.VITE_APP_PRIVATE_STAKING_URL || process.env.VITE_APP_PRIVATE_STAKING_URL || "", PUBLIC: import.meta.env.VITE_APP_PUBLIC_STAKING_URL || process.env.VITE_APP_PUBLIC_STAKING_URL || "", MAINNET: import.meta.env.VITE_APP_MAINNET_STAKING_URL || process.env.VITE_APP_MAINNET_STAKING_URL || "" }, EXPLORER_URL: { LOCAL: import.meta.env.VITE_APP_LOCAL_EXPLORER_URL || process.env.VITE_APP_LOCAL_EXPLORER_URL || "", + DEV: import.meta.env.VITE_APP_DEV_EXPLORER_URL || process.env.VITE_APP_DEV_EXPLORER_URL || "", PRIVATE: import.meta.env.VITE_APP_PRIVATE_EXPLORER_URL || process.env.VITE_APP_PRIVATE_EXPLORER_URL || "", PUBLIC: import.meta.env.VITE_APP_PUBLIC_EXPLORER_URL || process.env.VITE_APP_PUBLIC_EXPLORER_URL || "", MAINNET: import.meta.env.VITE_APP_MAINNET_EXPLORER_URL || process.env.VITE_APP_MAINNET_EXPLORER_URL || "" }, CHAIN_NAME: { LOCAL: import.meta.env.VITE_APP_LOCAL_CHAIN_NAME || process.env.VITE_APP_LOCAL_CHAIN_NAME || "", + DEV: import.meta.env.VITE_APP_DEV_CHAIN_NAME || process.env.VITE_APP_DEV_CHAIN_NAME || "", PRIVATE: import.meta.env.VITE_APP_PRIVATE_CHAIN_NAME || process.env.VITE_APP_PRIVATE_CHAIN_NAME || "", PUBLIC: import.meta.env.VITE_APP_PUBLIC_CHAIN_NAME || process.env.VITE_APP_PUBLIC_CHAIN_NAME || "", MAINNET: import.meta.env.VITE_APP_MAINNET_CHAIN_NAME || process.env.VITE_APP_MAINNET_CHAIN_NAME || "" }, CHAIN_ID: { LOCAL: import.meta.env.VITE_APP_LOCAL_CHAIN_ID || process.env.VITE_APP_LOCAL_CHAIN_ID || "", + DEV: import.meta.env.VITE_APP_DEV_CHAIN_ID || process.env.VITE_APP_DEV_CHAIN_ID || "", PRIVATE: import.meta.env.VITE_APP_PRIVATE_CHAIN_ID || process.env.VITE_APP_PRIVATE_CHAIN_ID || "", PUBLIC: import.meta.env.VITE_APP_PUBLIC_CHAIN_ID || process.env.VITE_APP_PUBLIC_CHAIN_ID || "", MAINNET: import.meta.env.VITE_APP_MAINNET_CHAIN_ID || process.env.VITE_APP_MAINNET_CHAIN_ID || "" @@ -72,6 +83,10 @@ export const CHAIN_DETAILS = { ALIAS_NAME: 'Local Testnet', SHORT_NAMES: ['local'] }, + DEV: { + ALIAS_NAME: 'DEV Environment', + SHORT_NAMES: ['cudos-dev-test-network', 'dev-network'] + }, PRIVATE: { ALIAS_NAME: 'Private Testnet', SHORT_NAMES: ['private', 'dev-test'] From c3f89b8006a1c2c16347bd312665979d772e0e78 Mon Sep 17 00:00:00 2001 From: SpaghettiOverload Date: Thu, 16 Feb 2023 14:15:51 +0200 Subject: [PATCH 3/4] adding faucet_url --- .env.example | 4 ++++ src/api/getFaucetTokens.ts | 4 ++-- src/containers/Faucet/components/Form/index.tsx | 2 +- src/utils/constants.tsx | 7 +++++++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.env.example b/.env.example index e772014..0decfa7 100644 --- a/.env.example +++ b/.env.example @@ -1,5 +1,6 @@ # LOCAL VITE_APP_LOCAL_CAPTCHA_SITE_KEY='' +VITE_APP_LOCAL_FAUCET_URL='' VITE_APP_LOCAL_FAUCET_ADDRESS='' VITE_APP_LOCAL_BRIDGE_URL='' VITE_APP_LOCAL_GRAPHQL_URL='' @@ -13,6 +14,7 @@ VITE_APP_LOCAL_CHAIN_ID='' # DEV VITE_APP_DEV_CAPTCHA_SITE_KEY='' +VITE_APP_DEV_FAUCET_URL='' VITE_APP_DEV_FAUCET_ADDRESS='' VITE_APP_DEV_BRIDGE_URL='' VITE_APP_DEV_GRAPHQL_URL='' @@ -26,6 +28,7 @@ VITE_APP_DEV_CHAIN_ID='' # PRIVATE VITE_APP_PRIVATE_CAPTCHA_SITE_KEY='' +VITE_APP_PRIVATE_FAUCET_URL='' VITE_APP_PRIVATE_FAUCET_ADDRESS='' VITE_APP_PRIVATE_BRIDGE_URL='' VITE_APP_PRIVATE_GRAPHQL_URL='' @@ -39,6 +42,7 @@ VITE_APP_PRIVATE_CHAIN_ID='' # PUBLIC VITE_APP_PUBLIC_CAPTCHA_SITE_KEY='' +VITE_APP_PUBLIC_FAUCET_URL='' VITE_APP_PUBLIC_FAUCET_ADDRESS='' VITE_APP_PUBLIC_BRIDGE_URL='' VITE_APP_PUBLIC_GRAPHQL_UR='' diff --git a/src/api/getFaucetTokens.ts b/src/api/getFaucetTokens.ts index 8913d55..af8c459 100644 --- a/src/api/getFaucetTokens.ts +++ b/src/api/getFaucetTokens.ts @@ -1,11 +1,11 @@ import axios from 'axios' -const getFaucetTokens = async (faucetAddress: string, data: { +const getFaucetTokens = async (faucedUrl: string, data: { address: string coins: Array captchaResponse: string }) => { - return axios.post(faucetAddress, data) + return axios.post(faucedUrl, data) } export default getFaucetTokens diff --git a/src/containers/Faucet/components/Form/index.tsx b/src/containers/Faucet/components/Form/index.tsx index 5432bbd..cf27efd 100644 --- a/src/containers/Faucet/components/Form/index.tsx +++ b/src/containers/Faucet/components/Form/index.tsx @@ -85,7 +85,7 @@ const Form = () => { handleModal({ open: true, status: ModalStatus.LOADING }) const response = await getFaucetTokens( - CHAIN_DETAILS.FAUCET_ADDRESS[chosenNetwork as keyof typeof CHAIN_DETAILS.FAUCET_ADDRESS], + CHAIN_DETAILS.FAUCET_URL[chosenNetwork as keyof typeof CHAIN_DETAILS.FAUCET_URL], data ) diff --git a/src/utils/constants.tsx b/src/utils/constants.tsx index 11b6123..047087b 100644 --- a/src/utils/constants.tsx +++ b/src/utils/constants.tsx @@ -9,6 +9,13 @@ export const CHAIN_DETAILS = { PUBLIC: import.meta.env.VITE_APP_PUBLIC_CAPTCHA_SITE_KEY || process.env.VITE_APP_PUBLIC_CAPTCHA_SITE_KEY || "", MAINNET: '' }, + FAUCET_URL: { + LOCAL: import.meta.env.VITE_APP_LOCAL_FAUCET_URL || process.env.VITE_APP_LOCAL_FAUCET_URL || "", + DEV: import.meta.env.VITE_APP_DEV_FAUCET_URL || process.env.VITE_APP_DEV_FAUCET_URL || "", + PRIVATE: import.meta.env.VITE_APP_PRIVATE_FAUCET_URL || process.env.VITE_APP_PRIVATE_FAUCET_URL || "", + PUBLIC: import.meta.env.VITE_APP_PUBLIC_FAUCET_URL || process.env.VITE_APP_PUBLIC_FAUCET_URL || "", + MAINNET: '' + }, FAUCET_ADDRESS: { LOCAL: import.meta.env.VITE_APP_LOCAL_FAUCET_ADDRESS || process.env.VITE_APP_LOCAL_FAUCET_ADDRESS || "", DEV: import.meta.env.VITE_APP_DEV_FAUCET_ADDRESS || process.env.VITE_APP_DEV_FAUCET_ADDRESS || "", From ae4c239fc67a228d4de461f7cb5d115471e76c19 Mon Sep 17 00:00:00 2001 From: SpaghettiOverload Date: Thu, 16 Feb 2023 16:23:07 +0200 Subject: [PATCH 4/4] fixing changes being undefined --- .../ProposalDetails/components/ProposalInformation/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/containers/Proposals/ProposalDetails/components/ProposalInformation/index.tsx b/src/containers/Proposals/ProposalDetails/components/ProposalInformation/index.tsx index 34d9f62..910c7e4 100644 --- a/src/containers/Proposals/ProposalDetails/components/ProposalInformation/index.tsx +++ b/src/containers/Proposals/ProposalDetails/components/ProposalInformation/index.tsx @@ -209,7 +209,7 @@ const ProposalInformation = () => { Value - {overview.content.changes.map((item: Change, idx: number) => { + {overview.content.changes?.map((item: Change, idx: number) => { return (