From ed4696a208bc789625aac3bea130433b49e16a75 Mon Sep 17 00:00:00 2001 From: Cory Date: Tue, 28 Jun 2022 02:13:10 -0700 Subject: [PATCH 1/4] Display 6 leading addr chars instead of 4 --- app/App/Panel/Main/Account/Requests/TransactionRequest/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/App/Panel/Main/Account/Requests/TransactionRequest/index.js b/app/App/Panel/Main/Account/Requests/TransactionRequest/index.js index 7c0ae4735..9bdfdfc3c 100644 --- a/app/App/Panel/Main/Account/Requests/TransactionRequest/index.js +++ b/app/App/Panel/Main/Account/Requests/TransactionRequest/index.js @@ -432,7 +432,7 @@ class TransactionRequest extends React.Component { {'TO'} {'0x'} - {toAddress.substring(2, 5)} + {toAddress.substring(2, 7)} {svg.octicon('kebab-horizontal', { height: 14 })} {toAddress.substring(toAddress.length - 3)} From 5863184acdb8b6af6d612af1e85195f821f76e45 Mon Sep 17 00:00:00 2001 From: Matt Holtzman Date: Wed, 29 Jun 2022 14:31:11 +0200 Subject: [PATCH 2/4] show 6 leading and trailing digits on transaction confirms --- .../TxApproval/approvals/TokenSpend/index.js | 4 ++-- .../Account/Requests/TransactionRequest/TxRecipient/index.js | 2 +- .../Panel/Main/Account/Requests/TransactionRequest/index.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/App/Panel/Main/Account/Requests/TransactionRequest/TxApproval/approvals/TokenSpend/index.js b/app/App/Panel/Main/Account/Requests/TransactionRequest/TxApproval/approvals/TokenSpend/index.js index a0e3e682a..c5d785dee 100644 --- a/app/App/Panel/Main/Account/Requests/TransactionRequest/TxApproval/approvals/TokenSpend/index.js +++ b/app/App/Panel/Main/Account/Requests/TransactionRequest/TxApproval/approvals/TokenSpend/index.js @@ -245,9 +245,9 @@ class TokenSpend extends React.Component { {data.spender ? (
- {data.spender.substring(0, 6)} + {data.spender.substring(0, 8)} {svg.octicon('kebab-horizontal', { height: 15 })} - {data.spender.substr(data.contract.length - 4)} + {data.spender.substr(data.contract.length - 6)}
{ensName ? {ensName} - : {address.substring(0, 6)}{svg.octicon('kebab-horizontal', { height: 15 })}{address.substring(address.length - 4)} + : {address.substring(0, 8)}{svg.octicon('kebab-horizontal', { height: 15 })}{address.substring(address.length - 6)} } {req.decodedData && req.decodedData.contractName ? ( {(() => { diff --git a/app/App/Panel/Main/Account/Requests/TransactionRequest/index.js b/app/App/Panel/Main/Account/Requests/TransactionRequest/index.js index 9bdfdfc3c..7c0ae4735 100644 --- a/app/App/Panel/Main/Account/Requests/TransactionRequest/index.js +++ b/app/App/Panel/Main/Account/Requests/TransactionRequest/index.js @@ -432,7 +432,7 @@ class TransactionRequest extends React.Component { {'TO'} {'0x'} - {toAddress.substring(2, 7)} + {toAddress.substring(2, 5)} {svg.octicon('kebab-horizontal', { height: 14 })} {toAddress.substring(toAddress.length - 3)} From c3fb5d16142af116a71fa4df043e94e35ca83399 Mon Sep 17 00:00:00 2001 From: Cory Gabrielsen Date: Wed, 29 Jun 2022 07:02:24 -0700 Subject: [PATCH 3/4] Increase display to 8/8 --- .../TxApproval/approvals/TokenSpend/index.js | 29 ++++++++++--------- .../TransactionRequest/TxRecipient/index.js | 6 ++-- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/app/App/Panel/Main/Account/Requests/TransactionRequest/TxApproval/approvals/TokenSpend/index.js b/app/App/Panel/Main/Account/Requests/TransactionRequest/TxApproval/approvals/TokenSpend/index.js index c5d785dee..2c6af1f6a 100644 --- a/app/App/Panel/Main/Account/Requests/TransactionRequest/TxApproval/approvals/TokenSpend/index.js +++ b/app/App/Panel/Main/Account/Requests/TransactionRequest/TxApproval/approvals/TokenSpend/index.js @@ -9,6 +9,7 @@ import { ApprovalType } from '../../../../../../../../../../resources/constants' const numberRegex = /\.0+$|(\.[0-9]*[1-9])0+$/ const MAX_HEX = '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff' +const DISPLAY_ADDRESS_HALF_DIGITS = 8; // TODO: consolidate to a global config const digitsLookup = [ { value: 1, symbol: '' }, @@ -64,7 +65,7 @@ class TokenSpend extends React.Component { } else { amount = '0x' + custom.integerValue().toString(16) } - + this.setState({ mode: 'custom', amount, customInput: value }) } } @@ -139,7 +140,7 @@ class TokenSpend extends React.Component { } : {}} onClick={() => { this.props.onApprove( - this.props.req, + this.props.req, ApprovalType.TokenSpendApproval, { amount: this.state.amount } ) @@ -174,7 +175,7 @@ class TokenSpend extends React.Component { {symbol}
{this.state.mode === 'custom' ? ( - ) : (
-
{displayAmount.number}
-
{displayAmount.symbol}
+
{displayAmount.symbol}
)} @@ -214,7 +215,7 @@ class TokenSpend extends React.Component { > Requested
-
{ @@ -225,7 +226,7 @@ class TokenSpend extends React.Component { {'Unlimited'}
{!inputLock ? ( -
{ @@ -245,18 +246,18 @@ class TokenSpend extends React.Component { {data.spender ? (
- {data.spender.substring(0, 8)} + {data.spender.substring(0, 2 + DISPLAY_ADDRESS_HALF_DIGITS)} {svg.octicon('kebab-horizontal', { height: 15 })} - {data.spender.substr(data.contract.length - 6)} + {data.spender.substr(data.contract.length - DISPLAY_ADDRESS_HALF_DIGITS)}
-
{ link.send('tray:clipboardData', data.spender) this.setState({ copyTokenRequester: true }) setTimeout(() => { this.setState({ copyTokenRequester: false }) - }, 1000) + }, 1000) }} > {this.state.copyTokenRequester ? 'ADDRESS COPIED' : data.spender} @@ -270,14 +271,14 @@ class TokenSpend extends React.Component {
{symbol}
-
{ link.send('tray:clipboardData', data.contract) this.setState({ copyTokenContract: true }) setTimeout(() => { this.setState({ copyTokenContract: false }) - }, 1000) + }, 1000) }} > {this.state.copyTokenContract ? 'ADDRESS COPIED' : data.contract} diff --git a/app/App/Panel/Main/Account/Requests/TransactionRequest/TxRecipient/index.js b/app/App/Panel/Main/Account/Requests/TransactionRequest/TxRecipient/index.js index d61ac9b86..c27cf0413 100644 --- a/app/App/Panel/Main/Account/Requests/TransactionRequest/TxRecipient/index.js +++ b/app/App/Panel/Main/Account/Requests/TransactionRequest/TxRecipient/index.js @@ -4,6 +4,8 @@ import Restore from 'react-restore' import link from '../../../../../../../../resources/link' import svg from '../../../../../../../../resources/svg' +const DISPLAY_ADDRESS_HALF_DIGITS = 8; // TODO: consolidate to a global config + class TxRecipient extends React.Component { constructor (...args) { super(...args) @@ -38,9 +40,9 @@ class TxRecipient extends React.Component {
{ensName ? {ensName} - : {address.substring(0, 8)}{svg.octicon('kebab-horizontal', { height: 15 })}{address.substring(address.length - 6)} + : {address.substring(0, 2 + DISPLAY_ADDRESS_HALF_DIGITS)}{svg.octicon('kebab-horizontal', { height: 15 })}{address.substring(address.length - DISPLAY_ADDRESS_HALF_DIGITS)} } - {req.decodedData && req.decodedData.contractName ? ( + {req.decodedData && req.decodedData.contractName ? ( {(() => { if (req.decodedData.contractName.length > 11) return `${req.decodedData.contractName.substr(0, 9)}..` return req.decodedData.contractName From e2ed73592e3c051a180bbe191fef036731b10099 Mon Sep 17 00:00:00 2001 From: Matt Holtzman Date: Wed, 29 Jun 2022 16:59:17 +0200 Subject: [PATCH 4/4] create constant --- .../TxApproval/approvals/TokenSpend/index.js | 10 ++++++---- .../Requests/TransactionRequest/TxRecipient/index.js | 5 ++--- resources/constants/index.ts | 5 +++++ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/App/Panel/Main/Account/Requests/TransactionRequest/TxApproval/approvals/TokenSpend/index.js b/app/App/Panel/Main/Account/Requests/TransactionRequest/TxApproval/approvals/TokenSpend/index.js index 2c6af1f6a..8a6e1cfbb 100644 --- a/app/App/Panel/Main/Account/Requests/TransactionRequest/TxApproval/approvals/TokenSpend/index.js +++ b/app/App/Panel/Main/Account/Requests/TransactionRequest/TxApproval/approvals/TokenSpend/index.js @@ -5,11 +5,10 @@ import BigNumber from 'bignumber.js' import svg from '../../../../../../../../../../resources/svg' import link from '../../../../../../../../../../resources/link' -import { ApprovalType } from '../../../../../../../../../../resources/constants' +import { ADDRESS_DISPLAY_CHARS, ApprovalType } from '../../../../../../../../../../resources/constants' const numberRegex = /\.0+$|(\.[0-9]*[1-9])0+$/ const MAX_HEX = '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff' -const DISPLAY_ADDRESS_HALF_DIGITS = 8; // TODO: consolidate to a global config const digitsLookup = [ { value: 1, symbol: '' }, @@ -246,9 +245,12 @@ class TokenSpend extends React.Component { {data.spender ? (
- {data.spender.substring(0, 2 + DISPLAY_ADDRESS_HALF_DIGITS)} + { + // 0x prefix plus leading characters of address + data.spender.substring(0, 2 + ADDRESS_DISPLAY_CHARS) + } {svg.octicon('kebab-horizontal', { height: 15 })} - {data.spender.substr(data.contract.length - DISPLAY_ADDRESS_HALF_DIGITS)} + {data.spender.substr(data.contract.length - ADDRESS_DISPLAY_CHARS)}
{ensName ? {ensName} - : {address.substring(0, 2 + DISPLAY_ADDRESS_HALF_DIGITS)}{svg.octicon('kebab-horizontal', { height: 15 })}{address.substring(address.length - DISPLAY_ADDRESS_HALF_DIGITS)} + : {address.substring(0, 2 + ADDRESS_DISPLAY_CHARS)}{svg.octicon('kebab-horizontal', { height: 15 })}{address.substring(address.length - ADDRESS_DISPLAY_CHARS)} } {req.decodedData && req.decodedData.contractName ? ( {(() => { diff --git a/resources/constants/index.ts b/resources/constants/index.ts index 1e5be7ac5..8510d38f8 100644 --- a/resources/constants/index.ts +++ b/resources/constants/index.ts @@ -3,3 +3,8 @@ export enum ApprovalType { GasLimitApproval = 'approveGasLimit', TokenSpendApproval = 'approveTokenSpend' } + +const ADDRESS_DISPLAY_CHARS = 8 +export { + ADDRESS_DISPLAY_CHARS +}