Strip network prefix from the Address when calling EthHashInfo (#3037)

* Strip network prefix from the Address when calling EthHashInfo * Do not use chain prefix for TxHash and SafeTxHash in the Tx List
5afe · Nov 23, 2021 · 6809c9d · 6809c9d
1 parent 38ab408
commit 6809c9d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/src/components/PrefixedEthHashInfo/index.tsx b/src/components/PrefixedEthHashInfo/index.tsx
@@ -3,6 +3,7 @@ import { ReactElement } from 'react'
 import { useSelector } from 'react-redux'
 import { copyShortNameSelector, showShortNameSelector } from 'src/logic/appearance/selectors'
 import { extractShortChainName } from 'src/routes/routes'
+import getAddressWithoutNetworkPrefix from 'src/utils/getAddressWithoutNetworkPrefix'
 
 type Props = Omit<Parameters<typeof EthHashInfo>[0], 'shouldShowShortName' | 'shouldCopyShortName'>
 
@@ -12,7 +13,7 @@ const PrefixedEthHashInfo = ({ hash, ...rest }: Props): ReactElement => {
 
   return (
     <EthHashInfo
-      hash={hash}
+      hash={getAddressWithoutNetworkPrefix(hash)}
       shortName={extractShortChainName()}
       shouldShowShortName={showChainPrefix}
       shouldCopyShortName={copyChainPrefix}

diff --git a/src/routes/safe/components/Transactions/TxList/TxInfoCreation.tsx b/src/routes/safe/components/Transactions/TxList/TxInfoCreation.tsx
@@ -5,7 +5,7 @@ import { getExplorerInfo } from 'src/config'
 import { formatDateTime } from 'src/utils/date'
 import { Transaction } from 'src/logic/safe/store/models/types/gateway.d'
 import { NOT_AVAILABLE } from './utils'
-import { PrefixedInlineEthHashInfo, TxDetailsContainer } from './styled'
+import { InlineEthHashInfo, TxDetailsContainer } from './styled'
 import { Creation } from '@gnosis.pm/safe-react-gateway-sdk'
 import { useKnownAddress } from './hooks/useKnownAddress'
 import PrefixedEthHashInfo from 'src/components/PrefixedEthHashInfo'
@@ -34,7 +34,7 @@ export const TxInfoCreation = ({ transaction }: { transaction: Transaction }): R
           <Text size="xl" strong as="span">
             Transaction hash:{' '}
           </Text>
-          <PrefixedInlineEthHashInfo
+          <InlineEthHashInfo
             textSize="xl"
             hash={txInfo.transactionHash}
             shortenHash={8}

diff --git a/src/routes/safe/components/Transactions/TxList/TxSummary.tsx b/src/routes/safe/components/Transactions/TxList/TxSummary.tsx
@@ -5,7 +5,7 @@ import { ReactElement } from 'react'
 import { getExplorerInfo } from 'src/config'
 import { formatDateTime } from 'src/utils/date'
 import { ExpandedTxDetails, isMultiSigExecutionDetails } from 'src/logic/safe/store/models/types/gateway.d'
-import { PrefixedInlineEthHashInfo } from './styled'
+import { InlineEthHashInfo } from './styled'
 import { NOT_AVAILABLE } from './utils'
 
 export const TxSummary = ({ txDetails }: { txDetails: ExpandedTxDetails }): ReactElement => {
@@ -22,13 +22,7 @@ export const TxSummary = ({ txDetails }: { txDetails: ExpandedTxDetails }): Reac
           Transaction hash:{' '}
         </Text>
         {txHash ? (
-          <PrefixedInlineEthHashInfo
-            textSize="xl"
-            hash={txHash}
-            shortenHash={8}
-            showCopyBtn
-            explorerUrl={explorerUrl}
-          />
+          <InlineEthHashInfo textSize="xl" hash={txHash} shortenHash={8} showCopyBtn explorerUrl={explorerUrl} />
         ) : (
           <Text size="xl" as="span">
             {NOT_AVAILABLE}
@@ -40,7 +34,7 @@ export const TxSummary = ({ txDetails }: { txDetails: ExpandedTxDetails }): Reac
           <Text size="xl" strong as="span">
             SafeTxHash:{' '}
           </Text>
-          <PrefixedInlineEthHashInfo textSize="xl" hash={safeTxHash} shortenHash={8} showCopyBtn />
+          <InlineEthHashInfo textSize="xl" hash={safeTxHash} shortenHash={8} showCopyBtn />
         </div>
       )}
       {nonce !== undefined && (

diff --git a/src/routes/safe/components/Transactions/TxList/styled.tsx b/src/routes/safe/components/Transactions/TxList/styled.tsx
@@ -1,6 +1,5 @@
-import { Text, Accordion, AccordionDetails, AccordionSummary } from '@gnosis.pm/safe-react-components'
+import { Text, Accordion, AccordionDetails, AccordionSummary, EthHashInfo } from '@gnosis.pm/safe-react-components'
 import styled, { css } from 'styled-components'
-import PrefixedEthHashInfo from 'src/components/PrefixedEthHashInfo'
 
 export const Wrapper = styled.div`
   display: flex;
@@ -467,7 +466,7 @@ export const OwnerListItem = styled.li`
   }
 `
 
-export const PrefixedInlineEthHashInfo = styled(PrefixedEthHashInfo)`
+export const InlineEthHashInfo = styled(EthHashInfo)`
   display: inline-flex;
 
   span {