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

alleslabs · Jun 21, 2024 · fa5d444 · fa5d444
2 parents 4d3a161 + 1176a33
commit fa5d444
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -102,6 +102,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Bug fixes
 
 - [#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/publish-module/components/ModulePublishCard.tsx b/src/lib/pages/publish-module/components/ModulePublishCard.tsx
@@ -77,8 +77,8 @@ export const ModulePublishCard = ({ module }: ModulePublishCardProps) => {
       </Flex>
       <Grid templateColumns="1fr 1fr 1fr" columnGap={4}>
         <Button
-          rightIcon={<CustomIcon name="launch" boxSize={3} color="text.main" />}
-          variant="outline-white"
+          rightIcon={<CustomIcon name="launch" boxSize={3} />}
+          variant="primary"
           onClick={() => {
             track(AmpEvent.USE_PUBLISHED_MODULE_ACTION, {
               label: "See Module",