diff --git a/scan/src/components/ChainInfoHighlights.re b/scan/src/components/ChainInfoHighlights.re index e254a1068e..d205a335d0 100644 --- a/scan/src/components/ChainInfoHighlights.re +++ b/scan/src/components/ChainInfoHighlights.re @@ -16,7 +16,7 @@ module Styles = { zIndex(2), height(`px(130)), padding2(~v=`px(16), ~h=`px(24)), - Media.mobile([padding2(~v=`px(16), ~h=`px(12))]), + Media.mobile([padding2(~v=`px(10), ~h=`px(12)), height(`px(120))]), ]); let bgCard = (url: string) => @@ -119,7 +119,7 @@ let make = (~latestBlockSub: Sub.t(BlockSub.t)) => { } />
- + // TODO: make it to link later diff --git a/scan/src/components/account/AccountIndexDelegations.re b/scan/src/components/account/AccountIndexDelegations.re index 4845d94685..0e7b789141 100644 --- a/scan/src/components/account/AccountIndexDelegations.re +++ b/scan/src/components/account/AccountIndexDelegations.re @@ -127,7 +127,6 @@ let make = (~address) => isMobile ? renderBodyMobile(delegation) : renderBody(delegation) }) ->React.array} - setPage(_ => newPage)} />
diff --git a/scan/src/components/account/AccountIndexRedelegate.re b/scan/src/components/account/AccountIndexRedelegate.re index 787600573b..fa0e93dd63 100644 --- a/scan/src/components/account/AccountIndexRedelegate.re +++ b/scan/src/components/account/AccountIndexRedelegate.re @@ -174,7 +174,6 @@ let make = (~address) => isMobile ? renderBodyMobile(redelegateEntry) : renderBody(redelegateEntry) ) ->React.array} - setPage(_ => newPage)} /> diff --git a/scan/src/components/account/AccountIndexTransactions.re b/scan/src/components/account/AccountIndexTransactions.re index 9b0edc64a9..7d681e85da 100644 --- a/scan/src/components/account/AccountIndexTransactions.re +++ b/scan/src/components/account/AccountIndexTransactions.re @@ -43,11 +43,9 @@ let make = (~accountAddress: Address.t) => { {switch (txsCountSub) { | Data(txsCount) => let pageCount = Page.getPageCount(txsCount, pageSize); - <> - - setPage(_ => newPage)} /> - - ; + + setPage(_ => newPage)} />; + | _ => React.null }} ; diff --git a/scan/src/components/account/AccountIndexUnbonding.re b/scan/src/components/account/AccountIndexUnbonding.re index 8590b3679b..892434c0a1 100644 --- a/scan/src/components/account/AccountIndexUnbonding.re +++ b/scan/src/components/account/AccountIndexUnbonding.re @@ -61,7 +61,7 @@ let renderBodyMobile = (operatorAddress |> Address.toBech32) ++ (completionTime |> MomentRe.Moment.toISOString) ++ (amount |> Coin.getBandAmountFromCoin |> Js.Float.toString); - + isMobile ? renderBodyMobile(unbondingEntry) : renderBody(unbondingEntry) ) ->React.array} - setPage(_ => newPage)} /> diff --git a/scan/src/components/data-source/DataSourceExecute.re b/scan/src/components/data-source/DataSourceExecute.re index b37f70d7b9..0fb38f4cb1 100644 --- a/scan/src/components/data-source/DataSourceExecute.re +++ b/scan/src/components/data-source/DataSourceExecute.re @@ -36,8 +36,6 @@ module Styles = { border(`zero, `solid, Colors.white), ]); - let hFlex = style([display(`flex), flexDirection(`row)]); - let withWH = (w, h) => style([ width(w), @@ -47,16 +45,26 @@ module Styles = { alignItems(`center), ]); - let resultWrapper = (w, h, overflowChioce) => + let resultContainer = style([ - width(w), - height(h), - display(`flex), - flexDirection(`column), - justifyContent(`center), backgroundColor(Colors.white), - borderRadius(`px(4)), - overflow(overflowChioce), + margin2(~v=`px(20), ~h=`zero), + selector("> div + div", [borderTop(`px(1), `solid, Colors.gray9)]), + ]); + let resultBox = style([padding(`px(20))]); + let labelWrapper = + style([ + flexShrink(0.), + flexGrow(0.), + flexBasis(`px(220)), + Media.mobile([flexBasis(`px(100))]), + ]); + let resultWrapper = + style([ + flexShrink(0.), + flexGrow(0.), + flexBasis(`calc((`sub, `percent(100.), `px(220)))), + Media.mobile([flexBasis(`calc((`sub, `percent(100.), `px(100))))]), ]); }; @@ -74,7 +82,8 @@ let parameterInput = (name, index, setCalldataList) => { { let newVal = ReactEvent.Form.target(event)##value; setCalldataList(prev => { @@ -115,39 +124,31 @@ let resultRender = result => { | Error(err) => <> -
- -
+
| Success({returncode, stdout, stderr}) => - <> - -
-
- -
- -
- string_of_int} /> +
+
+
+
- -
- -
- -
- +
string_of_int} />
+
+
+
+
- -
- -
- -
+
+
+
+
+ +
+
- +
}; }; diff --git a/scan/src/pages/BlockHomePage.re b/scan/src/pages/BlockHomePage.re index 7b3289ee53..4991f987bc 100644 --- a/scan/src/pages/BlockHomePage.re +++ b/scan/src/pages/BlockHomePage.re @@ -204,15 +204,11 @@ let make = () => { ->React.array} {isMobile ? React.null - : <> - - setPage(_ => newPage)} - /> - - } + : setPage(_ => newPage)} + />} ; | _ => Belt_Array.make(10, ApolloHooks.Subscription.NoData) diff --git a/scan/src/pages/BlockIndexPage.re b/scan/src/pages/BlockIndexPage.re index 3604ae5ead..1a82c122a6 100644 --- a/scan/src/pages/BlockIndexPage.re +++ b/scan/src/pages/BlockIndexPage.re @@ -132,15 +132,8 @@ let make = (~height) => { {switch (blockSub) { | Data({txn}) => let pageCount = Page.getPageCount(txn, pageSize); - <> - - setPage(_ => newPage)} - /> - - ; + + setPage(_ => newPage)} />; | _ => React.null }}
diff --git a/scan/src/pages/DataSourceHomePage.re b/scan/src/pages/DataSourceHomePage.re index c3ec154ed8..a991489b31 100644 --- a/scan/src/pages/DataSourceHomePage.re +++ b/scan/src/pages/DataSourceHomePage.re @@ -217,15 +217,11 @@ let make = () => { ->React.array} {isMobile ? React.null - : <> - - setPage(_ => newPage)} - /> - - } + : setPage(_ => newPage)} + />} ; | _ => Belt_Array.make(10, ApolloHooks.Subscription.NoData) diff --git a/scan/src/pages/TxHomePage.re b/scan/src/pages/TxHomePage.re index 71ce983129..4c21c51145 100644 --- a/scan/src/pages/TxHomePage.re +++ b/scan/src/pages/TxHomePage.re @@ -63,15 +63,8 @@ let make = () => { {switch (txsCountSub) { | Data(txsCount) => let pageCount = Page.getPageCount(txsCount, pageSize); - <> - - setPage(_ => newPage)} - /> - - ; + + setPage(_ => newPage)} />; | _ => React.null }}
diff --git a/scan/src/pages/ValidatorIndexPage.re b/scan/src/pages/ValidatorIndexPage.re index 013dc36e91..f78dc58aa0 100644 --- a/scan/src/pages/ValidatorIndexPage.re +++ b/scan/src/pages/ValidatorIndexPage.re @@ -6,6 +6,7 @@ module Styles = { backgroundColor(Colors.white), boxShadow(Shadow.box(~x=`zero, ~y=`px(2), ~blur=`px(4), Css.rgba(0, 0, 0, 0.08))), padding(`px(24)), + height(`percent(100.)), Media.mobile([padding(`px(16))]), ]); let infoHeader = @@ -14,6 +15,7 @@ module Styles = { let idContainer = style([marginBottom(`px(16)), Media.mobile([marginBottom(`px(8))])]); let containerSpacingSm = style([Media.mobile([marginTop(`px(16))])]); + let infoHeaderCustom = style([margin3(~top=`px(8), ~h=`px(12), ~bottom=`px(20))]); // Avatar Box let avatarContainer = @@ -387,10 +389,9 @@ let make = (~address, ~hashtag: Route.validator_tab_t) => { className={Css.merge([ CssHelper.flexBox(), Styles.infoHeader, - CssHelper.px(~size=12, ()), - CssHelper.mb(~size=14, ()), + Styles.infoHeaderCustom, ])}> - + //TODO: remove mock message later @@ -439,7 +440,7 @@ let make = (~address, ~hashtag: Route.validator_tab_t) => { CssHelper.mb(~size=24, ()), Styles.infoHeader, ])}> - + diff --git a/scan/src/reusable/InfoMobileCard.re b/scan/src/reusable/InfoMobileCard.re index 114cca5ac5..11c91f5577 100644 --- a/scan/src/reusable/InfoMobileCard.re +++ b/scan/src/reusable/InfoMobileCard.re @@ -67,14 +67,7 @@ let make = (~info) => {
| Coin({value, hasDenom}) => - | Count(value) => - Format.iPretty} - size=Text.Md - weight=Text.Semibold - spacing={Text.Em(0.02)} - code=true - /> + | Count(value) => Format.iPretty} size=Text.Md /> | DataSource(id, name) =>
@@ -90,24 +83,17 @@ let make = (~info) => { | RequestID(id) => | RequestResponse({request, responseTime}) =>
- Format.iPretty} weight=Text.Regular block=true ellipsis=true /> + Format.iPretty} block=true ellipsis=true /> Format.iPretty) ++ "ms)"} - weight=Text.Regular block=true color=Colors.gray6 />
| ProgressBar({reportedValidators, minimumValidators, requestValidators}) => - | Float(value, digits) => - Format.fPretty(~digits?)} - size=Text.Md - spacing={Text.Em(0.02)} - code=true - /> + | Float(value, digits) => Format.fPretty(~digits?)} /> | KVTableReport(heading, rawReports) => { spacing={Text.Em(0.02)} nowrap=true ellipsis=true - code=true block=true /> } | CopyButton(calldata) => - | Percentage(value, digits) => - Format.fPercent(~digits?)} - size=Text.Md - spacing={Text.Em(0.02)} - code=true - /> + | Percentage(value, digits) => Format.fPercent(~digits?)} /> | Text(text) => - - | Timestamp(time) => + + | Timestamp(time) => | Validator(address, moniker, identity) => { Coin.getBandAmountFromCoin |> Format.fPretty(~digits=0)} color=Colors.gray7 - code=true - weight=Text.Regular - spacing={Text.Em(0.02)} block=true /> Format.fPercent(~digits=2)) ++ ")"} color=Colors.gray6 - code=true weight=Text.Thin - spacing={Text.Em(0.02)} block=true />
@@ -198,16 +172,11 @@ let make = (~info) => { switch (uptimeOpt) { | Some(uptime) =>
- Format.fPercent(~digits=2)} - spacing={Text.Em(0.02)} - code=true - nowrap=true - /> + Format.fPercent(~digits=2)} spacing={Text.Em(0.02)} nowrap=true />
- | None => + | None => } | Loading(width) => | Nothing => React.null diff --git a/scan/src/reusable/MobileCard.re b/scan/src/reusable/MobileCard.re index 1e4e8f6752..f34dce6717 100644 --- a/scan/src/reusable/MobileCard.re +++ b/scan/src/reusable/MobileCard.re @@ -79,7 +79,7 @@ module InnerPanel = { switch (value) { | InfoMobileCard.Nothing =>
- +
| _ => } }) diff --git a/scan/src/reusable/TBody.re b/scan/src/reusable/TBody.re index ab13b2b569..e50b2712ce 100644 --- a/scan/src/reusable/TBody.re +++ b/scan/src/reusable/TBody.re @@ -6,7 +6,6 @@ module Styles = { boxShadow(Shadow.box(~x=`zero, ~y=`px(2), ~blur=`px(2), Css.rgba(0, 0, 0, 0.05))), backgroundColor(white), marginBottom(`px(1)), - hover([backgroundColor(Colors.blueGray1)]), display(`flex), alignItems(`center), padding2(~v=pv, ~h=ph), @@ -17,7 +16,6 @@ module Styles = { boxShadow(Shadow.box(~x=`zero, ~y=`px(2), ~blur=`px(2), Css.rgba(0, 0, 0, 0.05))), backgroundColor(white), marginBottom(`px(1)), - hover([backgroundColor(Colors.blueGray1)]), padding2(~v=pv, ~h=ph), overflow(`hidden), ]); diff --git a/scan/src/utils/ID.re b/scan/src/utils/ID.re index aecdc96473..b8c1f35460 100644 --- a/scan/src/utils/ID.re +++ b/scan/src/utils/ID.re @@ -9,7 +9,7 @@ module type RawIDSig = { module RawDataSourceID = { type tab_t = Route.data_source_tab_t; let prefix = "#D"; - let color = Colors.yellow5; + let color = Colors.bandBlue; let route = (id, tab) => Route.DataSourceIndexPage(id, tab); let defaultTab = Route.DataSourceRequests; }; @@ -17,7 +17,7 @@ module RawDataSourceID = { module RawOracleScriptID = { type tab_t = Route.oracle_script_tab_t; let prefix = "#O"; - let color = Colors.pink5; + let color = Colors.bandBlue; let route = (id, tab) => Route.OracleScriptIndexPage(id, tab); let defaultTab = Route.OracleScriptRequests; }; @@ -25,7 +25,7 @@ module RawOracleScriptID = { module RawRequestID = { type tab_t = unit; let prefix = "#R"; - let color = Colors.orange5; + let color = Colors.bandBlue; let route = (id, _) => Route.RequestIndexPage(id); let defaultTab = (); };