Merge pull request #791 from alleslabs/feat/cfe-322-proposal-view-json

fix: proposal view in json
alleslabs · Feb 19, 2024 · 98b9519 · 98b9519
2 parents 5d74696 + 228a391
commit 98b9519
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -77,6 +77,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Bug fixes
 
+- [#791](https://github.com/alleslabs/celatone-frontend/pull/791) Proposal view in json direct to the lcd information
 - [#789](https://github.com/alleslabs/celatone-frontend/pull/789) Remove loading overlay on pool list page causing the page look like flicking
 - [#783](https://github.com/alleslabs/celatone-frontend/pull/783) Fix link used for Osmosis Pool JSON To poolmanager
 - [#780](https://github.com/alleslabs/celatone-frontend/pull/780) Fix proposal vote table, scroll to top on table

diff --git a/src/config/chain/initia.ts b/src/config/chain/initia.ts
@@ -37,6 +37,7 @@ export const INITIA_CHAIN_CONFIGS: ChainConfigs = {
       },
       gov: {
         enabled: true,
+        version: "v1",
         hideOpenProposal: true,
       },
       nft: {
@@ -186,6 +187,7 @@ export const INITIA_CHAIN_CONFIGS: ChainConfigs = {
       },
       gov: {
         enabled: true,
+        version: "v1",
         hideOpenProposal: true,
       },
       nft: {

diff --git a/src/config/chain/osmosis.ts b/src/config/chain/osmosis.ts
@@ -32,6 +32,7 @@ export const OSMOSIS_CHAIN_CONFIGS: ChainConfigs = {
       },
       gov: {
         enabled: true,
+        version: "v1",
         disableStoreCodeProposal: true,
         disableWhitelistProposal: true,
       },
@@ -83,6 +84,7 @@ export const OSMOSIS_CHAIN_CONFIGS: ChainConfigs = {
       },
       gov: {
         enabled: true,
+        version: "v1",
         disableWhitelistProposal: true,
         disableStoreCodeProposal: true,
       },
@@ -133,6 +135,7 @@ export const OSMOSIS_CHAIN_CONFIGS: ChainConfigs = {
       },
       gov: {
         enabled: true,
+        version: "v1",
         disableWhitelistProposal: true,
         disableStoreCodeProposal: true,
       },

diff --git a/src/config/chain/sei.ts b/src/config/chain/sei.ts
@@ -37,6 +37,7 @@ export const SEI_CHAIN_CONFIGS: ChainConfigs = {
       },
       gov: {
         enabled: true,
+        version: "v1beta1",
         hideOpenProposal: true,
       },
       nft: {
@@ -87,6 +88,7 @@ export const SEI_CHAIN_CONFIGS: ChainConfigs = {
       },
       gov: {
         enabled: true,
+        version: "v1beta1",
         hideOpenProposal: true,
       },
       nft: {

diff --git a/src/config/chain/stargaze.ts b/src/config/chain/stargaze.ts
@@ -31,6 +31,7 @@ export const STARGAZE_CHAIN_CONFIGS: ChainConfigs = {
       },
       gov: {
         enabled: true,
+        version: "v1",
       },
       nft: {
         enabled: false,
@@ -78,6 +79,7 @@ export const STARGAZE_CHAIN_CONFIGS: ChainConfigs = {
       },
       gov: {
         enabled: true,
+        version: "v1",
       },
       nft: {
         enabled: false,

diff --git a/src/config/chain/terra.ts b/src/config/chain/terra.ts
@@ -32,6 +32,7 @@ export const TERRA_CHAIN_CONFIGS: ChainConfigs = {
       },
       gov: {
         enabled: true,
+        version: "v1",
         hideOpenProposal: true,
       },
       nft: {
@@ -80,6 +81,7 @@ export const TERRA_CHAIN_CONFIGS: ChainConfigs = {
       },
       gov: {
         enabled: true,
+        version: "v1",
         hideOpenProposal: true,
       },
       nft: {

diff --git a/src/config/chain/types.ts b/src/config/chain/types.ts
@@ -38,6 +38,7 @@ type PublicProjectConfig = { enabled: boolean };
 type GovConfig =
   | {
       enabled: true;
+      version: "v1beta1" | "v1";
       hideOpenProposal?: boolean;
       disableWhitelistProposal?: boolean;
       disableStoreCodeProposal?: boolean;

diff --git a/src/lib/pages/proposal-details/components/proposal-top/ViewProposalJson.tsx b/src/lib/pages/proposal-details/components/proposal-top/ViewProposalJson.tsx
@@ -0,0 +1,35 @@
+import { Button } from "@chakra-ui/react";
+
+import { useGovConfig, useInitia, useLCDEndpoint } from "lib/app-provider";
+import { CustomIcon } from "lib/components/icon";
+import { openNewTab } from "lib/utils";
+
+interface ViewProposalJsonProps {
+  id: number;
+}
+
+export const ViewProposalJson = ({ id }: ViewProposalJsonProps) => {
+  const endpoint = useLCDEndpoint();
+  const config = useGovConfig({ shouldRedirect: false });
+  const isInitia = useInitia();
+
+  if (!config.enabled) return null;
+
+  const openLcdPage = () =>
+    openNewTab(
+      `${endpoint}/${isInitia ? "initia" : "cosmos"}/gov/${config.version}/proposals/${encodeURIComponent(id)}`
+    );
+
+  return (
+    <Button
+      variant="outline-primary"
+      w={{ base: "full", md: "min-content" }}
+      minWidth={{ md: "150px" }}
+      size={{ base: "sm", md: "md" }}
+      rightIcon={<CustomIcon name="launch" />}
+      onClick={openLcdPage}
+    >
+      View in JSON
+    </Button>
+  );
+};
diff --git a/src/lib/pages/proposal-details/components/proposal-top/index.tsx b/src/lib/pages/proposal-details/components/proposal-top/index.tsx
@@ -1,26 +1,23 @@
-import { Button, Flex, Heading, Text } from "@chakra-ui/react";
+import { Flex, Heading, Text } from "@chakra-ui/react";
 
-import { useBaseApiRoute, useMobile } from "lib/app-provider";
+import { useMobile } from "lib/app-provider";
 import { Breadcrumb } from "lib/components/Breadcrumb";
 import { DotSeparator } from "lib/components/DotSeparator";
 import { Expedited } from "lib/components/Expedited";
 import { ExplorerLink } from "lib/components/ExplorerLink";
 import { CustomIcon } from "lib/components/icon";
 import type { ProposalData } from "lib/types";
-import { formatUTC, openNewTab } from "lib/utils";
+import { formatUTC } from "lib/utils";
 
 import { ProposalInfo } from "./proposal-info";
+import { ViewProposalJson } from "./ViewProposalJson";
 
 interface ProposalTopProps {
   proposalData: ProposalData;
 }
 
 export const ProposalTop = ({ proposalData }: ProposalTopProps) => {
   const isMobile = useMobile();
-  // TODO: use LCD and gov config version
-  const endpoint = useBaseApiRoute("proposals");
-  const openApiPage = () =>
-    openNewTab(`${endpoint}/${encodeURIComponent(proposalData.id)}/info`);
 
   return (
     <Flex direction="column" mb={6} gap={5}>
@@ -144,16 +141,7 @@ export const ProposalTop = ({ proposalData }: ProposalTopProps) => {
             </Flex>
           </Flex>
         </Flex>
-        <Button
-          variant="outline-primary"
-          w={{ base: "full", md: "min-content" }}
-          minWidth={{ md: "150px" }}
-          size={{ base: "sm", md: "md" }}
-          rightIcon={<CustomIcon name="launch" />}
-          onClick={openApiPage}
-        >
-          View in JSON
-        </Button>
+        <ViewProposalJson id={proposalData.id} />
       </Flex>
       <ProposalInfo data={proposalData} />
     </Flex>