Fixed formatting tx id (#458)

spacemeshos · Mar 25, 2020 · 91b5d67 · 91b5d67
1 parent b960d46
commit 91b5d67
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/app/components/transactions/TransactionRow.js b/app/components/transactions/TransactionRow.js
@@ -6,7 +6,7 @@ import { updateTransaction } from '/redux/wallet/actions';
 import { chevronLeftBlack, chevronRightBlack, addContact } from '/assets/images';
 import styled from 'styled-components';
 import { Button } from '/basicComponents';
-import { getAbbreviatedText, getFormattedTimestamp, getAddress, formatSmidge } from '/infra/utils';
+import { getAbbreviatedText, formatTxId, getFormattedTimestamp, getAddress, formatSmidge } from '/infra/utils';
 import { smColors } from '/vars';
 import TX_STATUSES from '/vars/enums';
 import type { Tx, Action } from '/types';
@@ -184,7 +184,7 @@ class TransactionRow extends Component<Props, State> {
               {txId === 'reward' ? (
                 <DarkGrayText>SMESHING REWARD</DarkGrayText>
               ) : (
-                [nickname && <DarkGrayText key="nickname">{nickname.toUpperCase()}</DarkGrayText>, <Text key={txId}>{getAbbreviatedText(txId, true, 10)}</Text>]
+                [nickname && <DarkGrayText key="nickname">{nickname.toUpperCase()}</DarkGrayText>, <Text key={txId}>{formatTxId(txId)}</Text>]
               )}
             </HeaderSection>
             <HeaderSection>
@@ -250,7 +250,7 @@ class TransactionRow extends Component<Props, State> {
             <BlackText>TRANSACTION ID</BlackText>
             <Dots>............</Dots>
             <BoldText color={smColors.realBlack} onClick={() => this.copyAddress({ id: txId })}>
-              {getAbbreviatedText(txId)}
+              {formatTxId(txId)}
             </BoldText>
           </TextRow>
           <TextRow>

diff --git a/app/infra/utils.js b/app/infra/utils.js
@@ -16,6 +16,8 @@ const createError = (message, func) => ({
 const getAbbreviatedText = (address: string, addPrefix: boolean = true, tailSize: number = 4) =>
   `${addPrefix && address.indexOf('0x') === -1 ? '0x' : ''}${address.substring(0, tailSize)}...${address.substring(address.length - tailSize, address.length)}`;
 
+const formatTxId = (id) => id && id.substring(0, 6);
+
 const formatNumber = (num) => num.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,');
 
 // Internal helper - returns the value and the unit of a smidge coin amount.
@@ -159,4 +161,16 @@ const getFormattedTimestamp = (timestamp: string) => {
 
 const getAddress = (key: string) => key.substring(24);
 
-export { testGetValueAndUnit, formatSmidge, fromHexString, toHexString, createError, getAbbreviatedText, formatNumber, asyncForEach, getFormattedTimestamp, getAddress };
+export {
+  testGetValueAndUnit,
+  formatSmidge,
+  fromHexString,
+  toHexString,
+  createError,
+  getAbbreviatedText,
+  formatNumber,
+  asyncForEach,
+  getFormattedTimestamp,
+  getAddress,
+  formatTxId
+};