Merge branch 'develop' into fix/bugbash-lite-peach2

alleslabs · Jun 21, 2024 · 5b9dfa0 · 5b9dfa0
2 parents 2c6aff3 + a4e5404
commit 5b9dfa0
Show file tree

Hide file tree

Showing 21 changed files with 118 additions and 84 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -102,6 +102,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Bug fixes
 
 - [#986](https://github.com/alleslabs/celatone-frontend/pull/986) Fix bugbash lite version (creator, sorting name in validator)
+- [#985](https://github.com/alleslabs/celatone-frontend/pull/985) Fix proposal details lite version bugs
+- [#987](https://github.com/alleslabs/celatone-frontend/pull/987) Fix bug bash (query redirection, module button color, modal open/close, migration contract radio button, txs count in account detail)
+- [#989](https://github.com/alleslabs/celatone-frontend/pull/989) Change tomcat endpoints
 - [#984](https://github.com/alleslabs/celatone-frontend/pull/984) Exclude non block number from searching block in lite
 - [#974](https://github.com/alleslabs/celatone-frontend/pull/974) Fix tx by account addr lcd to support new cosmos sdk
 - [#976](https://github.com/alleslabs/celatone-frontend/pull/976) Support save accounts in lite version

diff --git a/src/config/chain/initia.ts b/src/config/chain/initia.ts
@@ -12,8 +12,8 @@ export const INITIA_CHAIN_CONFIGS: ChainConfigs = {
     chain: "initia",
     registryChainName: "blackwingtestnet",
     prettyName: "Blackwing Testnet Lite",
-    lcd: "https://maze-rest-18bdff44-3aa4-425e-9bc0-06a2afa40af8.ue1-prod.newmetric.xyz",
-    rpc: "https://maze-rpc-18bdff44-3aa4-425e-9bc0-06a2afa40af8.ue1-prod.newmetric.xyz",
+    lcd: "https://maze-rest-18bdff44-3aa4-425e-9bc0-06a2afa40af8.ase1-prod.newmetric.xyz",
+    rpc: "https://maze-rpc-18bdff44-3aa4-425e-9bc0-06a2afa40af8.ase1-prod.newmetric.xyz",
     indexer: "https://tomcat-1-graphql.alleslabs.dev/v1/graphql",
     wallets: [...initiaWallets, ...keplrWallets],
     features: {
@@ -203,8 +203,8 @@ export const INITIA_CHAIN_CONFIGS: ChainConfigs = {
     chain: "initia",
     registryChainName: "blackwingtestnet",
     prettyName: "Blackwing",
-    lcd: "https://maze-rest-18bdff44-3aa4-425e-9bc0-06a2afa40af8.ue1-prod.newmetric.xyz",
-    rpc: "https://maze-rpc-18bdff44-3aa4-425e-9bc0-06a2afa40af8.ue1-prod.newmetric.xyz",
+    lcd: "https://maze-rest-18bdff44-3aa4-425e-9bc0-06a2afa40af8.ase1-prod.newmetric.xyz",
+    rpc: "https://maze-rpc-18bdff44-3aa4-425e-9bc0-06a2afa40af8.ase1-prod.newmetric.xyz",
     indexer: "https://tomcat-1-graphql.alleslabs.dev/v1/graphql",
     wallets: [...initiaWallets, ...keplrWallets],
     features: {

diff --git a/src/lib/chain-registry/initiatestnet.ts b/src/lib/chain-registry/initiatestnet.ts
@@ -231,13 +231,13 @@ export const initiatestnet: Chain[] = [
       rpc: [
         {
           address:
-            "https://maze-rpc-18bdff44-3aa4-425e-9bc0-06a2afa40af8.ue1-prod.newmetric.xyz",
+            "https://maze-rpc-18bdff44-3aa4-425e-9bc0-06a2afa40af8.ase1-prod.newmetric.xyz",
         },
       ],
       rest: [
         {
           address:
-            "https://maze-rest-18bdff44-3aa4-425e-9bc0-06a2afa40af8.ue1-prod.newmetric.xyz",
+            "https://maze-rest-18bdff44-3aa4-425e-9bc0-06a2afa40af8.ase1-prod.newmetric.xyz",
         },
       ],
     },

diff --git a/src/lib/components/select-code/CodeSelectSection.tsx b/src/lib/components/select-code/CodeSelectSection.tsx
@@ -3,6 +3,7 @@ import { useState } from "react";
 import type { Control, FieldPath, FieldValues } from "react-hook-form";
 
 import { AmpEvent, track } from "lib/amplitude";
+import { useTierConfig } from "lib/app-provider";
 import { ControllerInput } from "lib/components/forms";
 import type { FormStatus } from "lib/components/forms";
 import type { Code } from "lib/services/types";
@@ -29,29 +30,32 @@ export const CodeSelectSection = <T extends FieldValues>({
   setCodeHash,
   status,
 }: CodeSelectSectionProps<T>) => {
+  const isFullTier = useTierConfig() === "full";
   const [method, setMethod] = useState<"select-existing" | "fill-manually">(
-    "select-existing"
+    isFullTier ? "select-existing" : "fill-manually"
   );
 
   return (
     <>
-      <RadioGroup
-        onChange={(nextVal: "select-existing" | "fill-manually") => {
-          track(
-            nextVal === "fill-manually"
-              ? AmpEvent.USE_CODE_FILL
-              : AmpEvent.USE_CODE_SELECT
-          );
-          setMethod(nextVal);
-        }}
-        value={method}
-        w="100%"
-      >
-        <Flex justify="space-around">
-          <Radio value="select-existing">Select from your code</Radio>
-          <Radio value="fill-manually">Fill Code ID manually</Radio>
-        </Flex>
-      </RadioGroup>
+      {isFullTier && (
+        <RadioGroup
+          onChange={(nextVal: "select-existing" | "fill-manually") => {
+            track(
+              nextVal === "fill-manually"
+                ? AmpEvent.USE_CODE_FILL
+                : AmpEvent.USE_CODE_SELECT
+            );
+            setMethod(nextVal);
+          }}
+          value={method}
+          w="100%"
+        >
+          <Flex justify="space-around">
+            <Radio value="select-existing">Select from your code</Radio>
+            <Radio value="fill-manually">Fill Code ID manually</Radio>
+          </Flex>
+        </RadioGroup>
+      )}
       <form style={{ width: "100%" }}>
         {method === "select-existing" ? (
           <CodeSelect

diff --git a/src/lib/components/tx/modal/ButtonSection.tsx b/src/lib/components/tx/modal/ButtonSection.tsx
@@ -32,7 +32,6 @@ export const ButtonSection = ({
       .find((r) => r.title === "Tx Hash")
       ?.value?.toString();
     openTxTab(txHash);
-    onClose?.();
   };
 
   const openProposalExplorer = () => {

diff --git a/src/lib/layout/mobile/utils.ts b/src/lib/layout/mobile/utils.ts
@@ -34,7 +34,7 @@ export const getNavDrawerLite = (
             },
             {
               name: "Query",
-              slug: "/query",
+              slug: "/interact-contract",
               icon: "query" as IconKeys,
             },
           ]

diff --git a/src/lib/pages/account-details/components/tables/txs/Lite.tsx b/src/lib/pages/account-details/components/tables/txs/Lite.tsx
@@ -59,6 +59,7 @@ export const TxsTableLite = ({
           title="Transactions"
           count={txsCount}
           onViewMore={onViewMore}
+          showCount={isFullTier}
         />
       ) : (
         <Flex direction="column" gap={6}>

diff --git a/src/lib/pages/home/components/DevShortcut.tsx b/src/lib/pages/home/components/DevShortcut.tsx
@@ -43,13 +43,13 @@ export const DevShortcut = () => {
             {
               title: "Query",
               subtitle: "Query and get contract state data",
-              slug: "query",
+              slug: "interact-contract",
               icon: "query" as const,
             },
             {
               title: "Execute",
               subtitle: "Send transactions to contracts",
-              slug: "execute",
+              slug: "interact-contract?selectedType=execute",
               icon: "execute" as const,
             },
           ]

diff --git a/src/lib/pages/home/components/QuickMenuLite.tsx b/src/lib/pages/home/components/QuickMenuLite.tsx
@@ -137,15 +137,15 @@ export const QuickMenuLite = () => {
         {
           title: "Query",
           subtitle: "Query and get contract state data",
-          slug: "query",
+          slug: "interact-contract",
           icon: "query" as const,
           isHighlight: false,
           isDocument: false,
         },
         {
           title: "Execute",
           subtitle: "Send transactions to contracts",
-          slug: "execute",
+          slug: "interact-contract?selectedType=execute",
           icon: "execute" as const,
           isHighlight: false,
           isDocument: false,

diff --git a/src/lib/pages/home/components/QuickMenuMobileLite.tsx b/src/lib/pages/home/components/QuickMenuMobileLite.tsx
@@ -175,7 +175,7 @@ export const QuickMenuMobileLite = ({ prettyName }: { prettyName: string }) => {
             item={{
               title: "Query",
               subtitle: "Query and get contract state data",
-              slug: "query",
+              slug: "interact-contract",
               icon: "query" as const,
               isDocument: false,
             }}

diff --git a/src/lib/pages/proposal-details/components/VoteQuorumCircle.tsx b/src/lib/pages/proposal-details/components/VoteQuorumCircle.tsx
@@ -1,4 +1,5 @@
 import { Circle, Heading, Text } from "@chakra-ui/react";
+import { isNull } from "lodash";
 
 import type { Nullable, Ratio } from "lib/types";
 import { formatPrettyPercent } from "lib/utils";
@@ -64,7 +65,7 @@ export const VoteQuorumCircle = ({
           fontWeight={600}
           color={totalRatio ? "text.main" : "text.dark"}
         >
-          {totalRatio ? formatPrettyPercent(totalRatio, 1) : "N/A"}
+          {!isNull(totalRatio) ? formatPrettyPercent(totalRatio, 1) : "N/A"}
         </Heading>
       </Circle>
     </Circle>

diff --git a/src/lib/pages/proposal-details/components/proposal-overview/ProposalMessages.tsx b/src/lib/pages/proposal-details/components/proposal-overview/ProposalMessages.tsx
@@ -69,7 +69,7 @@ export const ProposalMessages = ({ messages }: ProposalMessagesProps) => {
         >
           {messages.map((item, i) => (
             <ProposalMessageCard
-              key={`msg-${JSON.stringify(item)}`}
+              key={`msg-${i.toString()}-${JSON.stringify(item)}`}
               header={`[${i}] ${item["@type"]}`}
               jsonString={jsonPrettify(JSON.stringify(item))}
             />

diff --git a/.../pages/proposal-details/components/proposal-overview/status-summary/SummaryStatusTime.tsx b/.../pages/proposal-details/components/proposal-overview/status-summary/SummaryStatusTime.tsx
@@ -22,6 +22,8 @@ const getResolvedPrefix = (status: ProposalStatus) => {
 };
 
 export const SummaryStatusTime = ({ proposalData }: StatusTimeProps) => {
+  const endTime = proposalData.resolvedTimestamp ?? proposalData.votingEndTime;
+
   if (proposalData.status === ProposalStatus.DEPOSIT_PERIOD)
     return (
       <Text variant="body2">
@@ -46,9 +48,7 @@ export const SummaryStatusTime = ({ proposalData }: StatusTimeProps) => {
     <Text variant="body2" color="text.dark">
       {getResolvedPrefix(proposalData.status)}
       {" at "}
-      {proposalData.resolvedTimestamp
-        ? formatUTC(proposalData.resolvedTimestamp)
-        : "N/A"}
+      {endTime ? formatUTC(endTime) : "N/A"}
     </Text>
   );
 };
diff --git a/src/lib/pages/proposal-details/components/proposal-top/index.tsx b/src/lib/pages/proposal-details/components/proposal-top/index.tsx
@@ -71,14 +71,15 @@ export const ProposalTop = ({ proposalData }: ProposalTopProps) => {
             <Flex
               gap={{ base: 0, md: 2 }}
               direction={{ base: "column", md: "row" }}
-              align={{ base: "start", md: "center" }}
+              align="start"
             >
               <Text
                 variant="body2"
                 color="text.dark"
                 fontWeight={500}
                 whiteSpace="nowrap"
                 lineHeight="24px"
+                mt="1px"
               >
                 Proposal Messages:
               </Text>
@@ -110,7 +111,7 @@ export const ProposalTop = ({ proposalData }: ProposalTopProps) => {
                   ))}
                 </Flex>
               ) : (
-                <Text variant="body2" color="text.dark">
+                <Text variant="body2" color="text.dark" mt="3px">
                   (No Message)
                 </Text>
               )}

diff --git a/...ib/pages/proposal-details/components/vote-details/deposit-period/DepositPeriodSection.tsx b/...ib/pages/proposal-details/components/vote-details/deposit-period/DepositPeriodSection.tsx
@@ -89,6 +89,7 @@ export const DepositPeriodSection = ({
           <DepositorsTable
             depositors={proposalData.proposalDeposits}
             isDepositsLoading={isDepositsLoading}
+            showTransaction={isFullTier}
             isPruned={!isFullTier && !isDepositOrVoting}
           />
         </>

diff --git a/...details/components/vote-details/deposit-period/depositors-table/DepositorsTableHeader.tsx b/...details/components/vote-details/deposit-period/depositors-table/DepositorsTableHeader.tsx
@@ -5,15 +5,21 @@ import { TableHeader } from "lib/components/table";
 
 interface DepositorsTableHeaderProps {
   templateColumns: GridProps["templateColumns"];
+  showTransaction: boolean;
 }
 
 export const DepositorsTableHeader = ({
   templateColumns,
+  showTransaction,
 }: DepositorsTableHeaderProps) => (
   <Grid templateColumns={templateColumns} minW="min-content">
     <TableHeader>Depositor</TableHeader>
-    <TableHeader>Transaction Hash</TableHeader>
-    <TableHeader>Timestamp</TableHeader>
-    <TableHeader textAlign="right">Deposited Amount</TableHeader>
+    {showTransaction && (
+      <>
+        <TableHeader>Transaction Hash</TableHeader>
+        <TableHeader>Timestamp</TableHeader>
+      </>
+    )}
+    <TableHeader>Deposited Amount</TableHeader>
   </Grid>
 );
diff --git a/...al-details/components/vote-details/deposit-period/depositors-table/DepositorsTableRow.tsx b/...al-details/components/vote-details/deposit-period/depositors-table/DepositorsTableRow.tsx
@@ -9,11 +9,13 @@ import { dateFromNow, formatUTC } from "lib/utils";
 interface DepositorsTableRowProps {
   proposalDeposit: ProposalDeposit;
   templateColumns: string;
+  showTransaction: boolean;
 }
 
 export const DepositorsTableRow = ({
   proposalDeposit,
   templateColumns,
+  showTransaction,
 }: DepositorsTableRowProps) => (
   <Grid
     className="copier-wrapper"
@@ -27,34 +29,40 @@ export const DepositorsTableRow = ({
         showCopyOnHover
       />
     </TableRow>
+    {showTransaction && (
+      <>
+        <TableRow>
+          {proposalDeposit.txHash ? (
+            <ExplorerLink
+              type="tx_hash"
+              value={proposalDeposit.txHash.toUpperCase()}
+              showCopyOnHover
+            />
+          ) : (
+            <Text variant="body3" textColor="text.dark">
+              N/A
+            </Text>
+          )}
+        </TableRow>
+        <TableRow>
+          {proposalDeposit.timestamp ? (
+            <Flex direction="column">
+              <Text variant="body3">
+                {formatUTC(proposalDeposit.timestamp)}
+              </Text>
+              <Text variant="body3" color="text.dark" mt="2px">
+                ({dateFromNow(proposalDeposit.timestamp)})
+              </Text>
+            </Flex>
+          ) : (
+            <Text variant="body3" color="text.dark">
+              N/A
+            </Text>
+          )}
+        </TableRow>
+      </>
+    )}
     <TableRow>
-      {proposalDeposit.txHash ? (
-        <ExplorerLink
-          type="tx_hash"
-          value={proposalDeposit.txHash.toUpperCase()}
-          showCopyOnHover
-        />
-      ) : (
-        <Text variant="body3" textColor="text.dark">
-          N/A
-        </Text>
-      )}
-    </TableRow>
-    <TableRow>
-      {proposalDeposit.timestamp ? (
-        <Flex direction="column">
-          <Text variant="body3">{formatUTC(proposalDeposit.timestamp)}</Text>
-          <Text variant="body3" color="text.dark" mt="2px">
-            ({dateFromNow(proposalDeposit.timestamp)})
-          </Text>
-        </Flex>
-      ) : (
-        <Text variant="body3" color="text.dark">
-          N/A
-        </Text>
-      )}
-    </TableRow>
-    <TableRow justifyContent="flex-end">
       <DepositAmounts deposit={proposalDeposit} />
     </TableRow>
   </Grid>

diff --git a/.../pages/proposal-details/components/vote-details/deposit-period/depositors-table/index.tsx b/.../pages/proposal-details/components/vote-details/deposit-period/depositors-table/index.tsx
@@ -10,16 +10,18 @@ import { DepositorsTableRow } from "./DepositorsTableRow";
 interface DepositorsTableProps {
   depositors: ProposalDeposit[];
   isDepositsLoading: boolean;
+  showTransaction: boolean;
   isPruned: boolean;
 }
 
-const templateColumns = `1.5fr 1.5fr 2fr 1fr`;
-
 export const DepositorsTable = ({
   depositors,
   isDepositsLoading,
+  showTransaction,
   isPruned,
 }: DepositorsTableProps) => {
+  const templateColumns = showTransaction ? "1.5fr 1.5fr 2fr 1fr" : "240px 1fr";
+
   if (isDepositsLoading) return <Loading />;
 
   if (isPruned)
@@ -32,12 +34,16 @@ export const DepositorsTable = ({
 
   return (
     <TableContainer>
-      <DepositorsTableHeader templateColumns={templateColumns} />
+      <DepositorsTableHeader
+        templateColumns={templateColumns}
+        showTransaction={showTransaction}
+      />
       {depositors.map((each) => (
         <DepositorsTableRow
           key={each.depositor}
           proposalDeposit={each}
           templateColumns={templateColumns}
+          showTransaction={showTransaction}
         />
       ))}
     </TableContainer>