diff --git a/.env b/.env index f4f3f09..284a240 100644 --- a/.env +++ b/.env @@ -6,4 +6,3 @@ REACT_APP_AVAILABLE_SHARDS=0,1,2,3 REACT_APP_EXPLORER_V1_API_URL=https://explorer.pops.one:8888/ REACT_APP_INDEXER_IPFS_GATEWAY=https://ipfs.io/ipfs/ REACT_APP_PROD_ADDRESS=https://ws.explorer-v2-api.hmny.io -REACT_APP_DEV_ADDRESS=https://ws.explorer-v2-api.hmny.io diff --git a/.env.example b/.env.example index eda405d..db7af7f 100644 --- a/.env.example +++ b/.env.example @@ -11,5 +11,3 @@ REACT_APP_EXPLORER_V1_API_URL=https://explorer.pops.one:8888/ REACT_APP_INDEXER_IPFS_GATEWAY=https://ipfs.io/ipfs/ # backend websocket API url REACT_APP_PROD_ADDRESS=https://explorer-v2-api.hmny.io/ -# dev url -REACT_APP_DEV_ADDRESS=https://ws.explorer-v2.hmny.io/ diff --git a/src/Routes.tsx b/src/Routes.tsx index 645db5b..86be969 100644 --- a/src/Routes.tsx +++ b/src/Routes.tsx @@ -63,6 +63,14 @@ export function Routes() { + + + + + + + + diff --git a/src/components/transaction/TransactionDetails.tsx b/src/components/transaction/TransactionDetails.tsx index bc003ab..ede4013 100644 --- a/src/components/transaction/TransactionDetails.tsx +++ b/src/components/transaction/TransactionDetails.tsx @@ -58,6 +58,7 @@ type TransactionDetailsProps = { type?: TransactionSubType; logs?: Log[]; errorMsg: string | undefined; + shorMoreHide?: boolean; }; type tableEntry = { @@ -127,6 +128,7 @@ export const TransactionDetails: FunctionComponent = ({ type, logs = [], errorMsg, + shorMoreHide }) => { const [showDetails, setShowDetails] = useState(false); @@ -134,7 +136,7 @@ export const TransactionDetails: FunctionComponent = ({ Status: errorMsg === undefined ? ( +transaction.shardID > 0 ? ( - + ) : ( <> ) @@ -190,24 +192,26 @@ export const TransactionDetails: FunctionComponent = ({ }} /> - - setShowDetails(!showDetails)} - margin={{ top: "medium" }} - > - {showDetails ? ( - <> - Show less  - - - ) : ( - <> - Show more  - - - )} - - + {shorMoreHide ? null : ( + + setShowDetails(!showDetails)} + margin={{ top: "medium" }} + > + {showDetails ? ( + <> + Show less  + + + ) : ( + <> + Show more  + + + )} + + + )} ); }; diff --git a/src/components/transaction/helpers.tsx b/src/components/transaction/helpers.tsx index 1fac5cb..ec61b82 100644 --- a/src/components/transaction/helpers.tsx +++ b/src/components/transaction/helpers.tsx @@ -247,7 +247,7 @@ export const transactionDisplayValues = ( const text = typeof value === "string" ? value : <>{value}; const copyText = - typeof text === "string" && !["from", "to"].find((item) => item === key) + typeof text === "string" && !["from", "to", 'type', 'delegatorAddress', 'validatorAddress'].find((item) => item === key) ? text : ""; diff --git a/src/pages/AddressPage/index.tsx b/src/pages/AddressPage/index.tsx index 29bdaf0..9afdfde 100644 --- a/src/pages/AddressPage/index.tsx +++ b/src/pages/AddressPage/index.tsx @@ -53,8 +53,12 @@ export function AddressPage() { //TODO remove hardcode // @ts-ignore - const { id } = useParams(); + let { id } = useParams(); + id = `${id}`.toLowerCase() + id = id.slice(0, 3) === "one" ? getAddress(id).basicHex : id; + const erc20Token = erc20Map[id] || null; + let oneAddress = id; let type = erc721Map[id] @@ -122,7 +126,9 @@ export function AddressPage() { let inventory = type === "erc721" ? await getTokenERC721Assets([id]) - : await (await getTokenERC1155Assets([id])).map((item) => { + : await ( + await getTokenERC1155Assets([id]) + ).map((item) => { if (item.meta && item.meta.image) { item.meta.image = `${process.env.REACT_APP_INDEXER_IPFS_GATEWAY}${item.meta.image}`; } diff --git a/src/pages/AddressPage/tabs/Transactions.tsx b/src/pages/AddressPage/tabs/Transactions.tsx index d1d20d5..5a8b193 100644 --- a/src/pages/AddressPage/tabs/Transactions.tsx +++ b/src/pages/AddressPage/tabs/Transactions.tsx @@ -23,6 +23,7 @@ import { import styled, { css } from "styled-components"; import { TRelatedTransaction } from "src/api/client.interface"; import { getERC20Columns } from "./erc20Columns"; +import { getAddress } from "src/utils"; const initFilter: Filter = { offset: 0, @@ -402,7 +403,9 @@ export function Transactions(props: { const { limit = 10 } = filter[props.type]; // @ts-ignore - const { id } = useParams(); + let { id } = useParams(); + id = `${id}`.toLowerCase(); + id = id.slice(0, 3) === "one" ? getAddress(id).basicHex : id; useEffect(() => { const getElements = async () => { diff --git a/src/pages/StackingTransactionPage/index.tsx b/src/pages/StackingTransactionPage/index.tsx index 396cc9b..37ac695 100644 --- a/src/pages/StackingTransactionPage/index.tsx +++ b/src/pages/StackingTransactionPage/index.tsx @@ -49,6 +49,7 @@ export const StakingTransactionPage = () => { transaction={tx.msg} type={subTypeMap[tx.type] || ""} errorMsg={''} + shorMoreHide={true} /> );