Polish scan v2

scan/src/App.re

@@ -27,7 +27,7 @@ module Styles = {
 
   let bandLogo = style([width(`px(40))]);
 
-  let logoContainer = style([display(`flex), alignItems(`center), cursor(`pointer)]);
+  let logoContainer = style([display(`flex), alignItems(`center)]);
 
   let socialLink =
     style([
@@ -43,37 +43,52 @@ module Styles = {
 
   let routeContainer =
     style([minHeight(`calc((`sub, `vh(100.), `px(200)))), paddingBottom(`px(20))]);
+
+  let link = style([cursor(`pointer)]);
+};
+
+module LinkToHome = {
+  [@react.component]
+  let make = (~children) => {
+    <Link className=Styles.link route=Route.HomePage> children </Link>;
+  };
 };
 
 module TopBar = {
   [@react.component]
   let make = () => {
     <div className=Styles.topBarContainer>
       <div className={Css.merge([Styles.topBarInner, Styles.pageWidth])}>
-        <Link className=Styles.logoContainer route=Route.HomePage>
+        <div className=Styles.logoContainer>
           <Row>
-            <Col> <img src=Images.bandLogo className=Styles.bandLogo /> </Col>
+            <Col>
+              <LinkToHome> <img src=Images.bandLogo className=Styles.bandLogo /> </LinkToHome>
+            </Col>
             <Col> <HSpacing size=Spacing.sm /> </Col>
             <Col>
-              <Text
-                value="BandChain"
-                size=Text.Xxl
-                weight=Text.Bold
-                nowrap=true
-                color=Colors.gray8
-                spacing={Text.Em(0.05)}
-              />
-              <VSpacing size=Spacing.xs />
-              <div className=Styles.rFlex>
+              <LinkToHome>
                 <Text
-                  value="CosmoScan"
+                  value="BandChain"
+                  size=Text.Xxl
+                  weight=Text.Bold
                   nowrap=true
-                  size=Text.Sm
-                  weight=Text.Semibold
-                  color=Colors.gray6
-                  spacing={Text.Em(0.03)}
+                  color=Colors.gray8
+                  spacing={Text.Em(0.05)}
                 />
-                <HSpacing size=Spacing.xs />
+              </LinkToHome>
+              <VSpacing size=Spacing.xs />
+              <div className=Styles.rFlex>
+                <LinkToHome>
+                  <Text
+                    value="CosmoScan"
+                    nowrap=true
+                    size=Text.Sm
+                    weight=Text.Semibold
+                    color=Colors.gray6
+                    spacing={Text.Em(0.03)}
+                  />
+                  <HSpacing size=Spacing.xs />
+                </LinkToHome>
                 <ChainIDBadge />
               </div>
             </Col>
@@ -92,7 +107,7 @@ module TopBar = {
               </div>
             </Col>
           </Row>
-        </Link>
+        </div>
         <SearchBar />
       </div>
     </div>;

scan/src/components/ChainIDBadge.re

@@ -13,6 +13,7 @@ module Styles = {
       marginLeft(Spacing.xs),
       marginTop(`px(1)),
       position(`relative),
+      cursor(`pointer),
     ]);
 
   let versionLoading =
@@ -55,12 +56,14 @@ module Styles = {
 
 type chainID =
   | WenchangTestnet
+  | WenchangMainnet
   | GuanYuDevnet
   | Unknown;
 
 let parseChainID =
   fun
   | "band-wenchang-testnet2" => WenchangTestnet
+  | "band-wenchang-mainnet" => WenchangMainnet
   | "band-guanyu-devnet"
   | "band-guanyu-batrider"
   | "bandchain" => GuanYuDevnet
@@ -69,12 +72,14 @@ let parseChainID =
 let getLink =
   fun
   | WenchangTestnet => "https://scan-wenchang-testnet2.bandchain.org/"
+  | WenchangMainnet => ""
   | GuanYuDevnet => "https://guanyu-devnet.cosmoscan.io/"
   | Unknown => "";
 
 let getName =
   fun
   | WenchangTestnet => "wenchang-testnet"
+  | WenchangMainnet => "wenchang-mainnet"
   | GuanYuDevnet => "guanyu-devnet"
   | Unknown => "unknown";
 

scan/src/components/modal/connect/ConnectModal.re

@@ -75,8 +75,8 @@ type login_method_t =
 let toLoginMethodString = method => {
   switch (method) {
   | Mnemonic => "Mnemonic Phrase"
-  | LedgerWithCosmos => "Ledger (Cosmos)"
-  | LedgerWithBandChain => "Ledger (BandChain)"
+  | LedgerWithCosmos => "Ledger - Cosmos"
+  | LedgerWithBandChain => "Ledger - Band (beta)"
   };
 };
 

scan/src/components/modal/submitTx/WithdrawRewardMsg.re

@@ -29,7 +29,7 @@ let make = (~address, ~validator, ~setMsgsOpt) => {
     <VSpacing size=Spacing.lg />
     <div className=Styles.info>
       <Text
-        value="Withdraw Reward From"
+        value="Withdraw Delegation Rewards"
         size=Text.Lg
         spacing={Text.Em(0.03)}
         nowrap=true

scan/src/pages/TxIndexPage.re

@@ -12,7 +12,14 @@ module Styles = {
       backgroundColor(Colors.gray7),
     ]);
 
-  let hashContainer = style([marginTop(`px(25)), marginBottom(`px(44))]);
+  let hashContainer =
+    style([
+      display(`flex),
+      flexDirection(`row),
+      alignItems(`center),
+      marginTop(`px(25)),
+      marginBottom(`px(44)),
+    ]);
 
   let correctLogo = style([width(`px(20)), marginLeft(`px(10))]);
 
@@ -107,6 +114,8 @@ let make = (~txHash) =>
           code=true
           color=Colors.gray7
         />
+        <HSpacing size=Spacing.sm />
+        <CopyRender width=15 message={txHash |> Hash.toHex(~upper=true)} />
       </div>
       <Row>
         <Col size=0.9> <InfoHL info={InfoHL.Height(tx.blockHeight)} header="BLOCK" /> </Col>

scan/src/pages/ValidatorHomePage.re

@@ -536,15 +536,9 @@ let make = () => {
         </Col>
         <Col size=1.1>
           {switch (topPartAllSub) {
-           | Data((_, _, bondedTokenCount, _, metadata)) =>
+           | Data((_, _, bondedTokenCount, _, _)) =>
              <InfoHL
-               info={
-                 InfoHL.Fraction(
-                   bondedTokenCount |> Coin.getBandAmountFromCoin |> int_of_float,
-                   metadata.totalSupply->Coin.getBandAmountFromCoins |> int_of_float,
-                   true,
-                 )
-               }
+               info={InfoHL.FloatWithSuffix(bondedTokenCount->Coin.getBandAmountFromCoin, "", 0)}
                header="BONDED TOKENS"
              />
            | _ =>

scan/src/reusable/InfoHL.re

@@ -64,7 +64,7 @@ let make = (~info, ~header, ~isLeft=true) => {
        />
      | FloatWithSuffix(value, suffix, digits) =>
        <Text
-         value={(value |> Js.Float.toFixedWithPrecision(_, ~digits)) ++ suffix}
+         value={(value |> Format.fPretty(~digits)) ++ suffix}
          size=Text.Lg
          weight=Text.Semibold
          spacing={Text.Em(0.02)}