Merge branch 'develop' into fix/validator-picture

alleslabs · Apr 28, 2023 · f8d98a7 · f8d98a7
2 parents 668e1a0 + 70872af
commit f8d98a7
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -83,6 +83,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Bug fixes
 
 - [#305](https://github.com/alleslabs/celatone-frontend/pull/305) Fix UI avatar for validator not shown when encounter special chars
+- [#302](https://github.com/alleslabs/celatone-frontend/pull/302) Fix token card width, text size for unsupported token button in account details page and tx count color when equal to zero
+- [#300](https://github.com/alleslabs/celatone-frontend/pull/300) Fix search bar's placeholder text and remove separator in latest block height
 - [#290](https://github.com/alleslabs/celatone-frontend/pull/290) Fix spacing and styling in account detail
 - [#280](https://github.com/alleslabs/celatone-frontend/pull/280) Fix begin unlocking optional coins field causing crash
 - [#269](https://github.com/alleslabs/celatone-frontend/pull/269) Fix array value json string format and receipt row text color

diff --git a/src/lib/components/modal/UnsupportedTokensModal.tsx b/src/lib/components/modal/UnsupportedTokensModal.tsx
@@ -172,6 +172,7 @@ export const UnsupportedTokensModal = ({
           variant="ghost"
           color="text.dark"
           mb={1}
+          fontSize="12px"
           fontWeight={500}
           {...buttonProps}
         >

diff --git a/src/lib/layout/Searchbar.tsx b/src/lib/layout/Searchbar.tsx
@@ -92,8 +92,8 @@ const Searchbar = () => {
   const boxRef = useRef<HTMLDivElement>(null);
   const chainConfig = getChainConfig();
 
-  let placeholder = "Search by Wallet Address / Contract Address / Tx Hash / ";
-  placeholder += chainConfig.isWasm ? "Code ID" : "Block";
+  let placeholder = "Search by Wallet Address / Tx Hash / ";
+  placeholder += chainConfig.isWasm ? "Code ID / Contract Address" : "Block";
 
   useEffect(() => {
     const res: SearchResultType[] = [];

diff --git a/src/lib/pages/account-details/components/asset/index.tsx b/src/lib/pages/account-details/components/asset/index.tsx
@@ -42,7 +42,7 @@ const AssetSectionContent = ({
       {supportedAssets
         .slice(0, onViewMore ? MaxAssetsShow : undefined)
         .map((asset) => (
-          <TokenCard userBalance={asset} key={asset.balance.id} />
+          <TokenCard userBalance={asset} key={asset.balance.id} minW="full" />
         ))}
     </Grid>
   ) : (

diff --git a/src/lib/pages/blocks/components/BlocksRow.tsx b/src/lib/pages/blocks/components/BlocksRow.tsx
@@ -28,7 +28,12 @@ export const BlocksRow = ({ templateColumns, blockData }: BlocksRowProps) => {
       <TableRow>
         <ValidatorBadge validator={blockData.proposer} />
       </TableRow>
-      <TableRow justifyContent="center">{blockData.txCount}</TableRow>
+      <TableRow
+        justifyContent="center"
+        color={blockData.txCount === 0 ? "text.dark" : "text.main"}
+      >
+        {blockData.txCount}
+      </TableRow>
       <TableRow>
         <Flex direction="column">
           <Text variant="body2" color="text.dark" mb="2px">

diff --git a/src/lib/pages/network-overview/index.tsx b/src/lib/pages/network-overview/index.tsx
@@ -142,7 +142,7 @@ const NetworkOverview = () => {
         <CardInfo
           title={blockInfo.title}
           tooltip={blockInfo.tooltip}
-          value={latestBlockInfo?.height?.toLocaleString() ?? "N/A"}
+          value={latestBlockInfo?.height?.toString() ?? "N/A"}
           isLoading={isLoadingLatestBlockInfo}
           navigate={toBlocks}
         />