Merge branch 'develop' into fix/contract-lists

alleslabs · Jan 18, 2024 · 3b71597 · 3b71597
2 parents 6eb6ff9 + ff4eef4
commit 3b71597
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -61,6 +61,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Bug fixes
 
 - [#733](https://github.com/alleslabs/celatone-frontend/pull/733) Fix contract list nullable fields
+- [#732](https://github.com/alleslabs/celatone-frontend/pull/732) Fix custom tab incorrect variant and recent modules text
 - [#722](https://github.com/alleslabs/celatone-frontend/pull/722) Fix flicker query page
 
 ## v1.4.1

diff --git a/src/lib/components/CustomTab.tsx b/src/lib/components/CustomTab.tsx
@@ -17,6 +17,7 @@ interface CustomTabProps extends TabProps {
 export const CustomTab = ({
   count,
   isLoading,
+  isDisabled,
   ...restProps
 }: CustomTabProps) => {
   const tabProps = useTab({ ...restProps });
@@ -43,6 +44,7 @@ export const CustomTab = ({
           color: "gray.500",
         },
       }}
+      isDisabled={isDisabled}
       _active={{
         bg: "unset",
       }}

diff --git a/src/lib/pages/modules/components/RecentModulesTable.tsx b/src/lib/pages/modules/components/RecentModulesTable.tsx
@@ -31,7 +31,7 @@ export const RecentModulesTable = () => {
         isLoading={isLoading}
         emptyState={
           error ? (
-            <ErrorFetching dataName="recent modules" />
+            <ErrorFetching dataName="modules" />
           ) : (
             <EmptyState
               withBorder

diff --git a/src/lib/pages/modules/index.tsx b/src/lib/pages/modules/index.tsx
@@ -17,7 +17,7 @@ const RecentModules = () => {
   return (
     <PageContainer>
       <Heading variant="h5" as="h5" minH="36px">
-        Recent Modules
+        Modules
       </Heading>
       <Text variant="body2" color="text.dark" mb={8}>
         These modules are the most recently published on this network