status-im/MyCrypto
2
0
Fork 0
mirror of https://github.com/status-im/MyCrypto.git synced 2025-02-10 02:04:32 +00:00
Code Issues Projects Releases Wiki Activity

[FEATURE] Add tooltip to window and fix fee display.

Browse Source
This commit is contained in:
Daniel Kmak 2018-04-06 11:31:44 +02:00 committed by GitHub
parent 6e3ed8e0a8
commit b0907c36d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/components/TXMetaDataPanel/components/AdvancedGas.tsx
View File

@ -152,7 +152,7 @@ class AdvancedGas extends React.Component<Props, State> {
* {EAC_SCHEDULING_CONFIG.SCHEDULING_GAS_LIMIT.toString()} +{' '}
{scheduleGasPrice && scheduleGasPrice.value && scheduleGasPrice.value.toString()}{' '}
* ({EAC_SCHEDULING_CONFIG.FUTURE_EXECUTION_COST.toString()} + {scheduleGasLimit})
= {fee} {usd && <span>~= ${usd} USD</span>}
=&nbsp;{fee}&nbsp;{usd && <span>~=&nbsp;${usd}&nbsp;USD</span>}
</span>
</div>
)}

2
common/components/TXMetaDataPanel/components/FeeSummary.scss
View File

@ -12,4 +12,6 @@
.SchedulingFeeSummary {
font-size: 12px;
height: auto;
min-height: 42px;
}

2
common/components/TXMetaDataPanel/components/SimpleGas.tsx
View File

@ -134,7 +134,7 @@ class SimpleGas extends React.Component<Props> {
scheduleGasPrice={scheduleGasPrice}
render={({ fee, usd }) => (
<span>
{fee} {usd && <span>/ ${usd}</span>}
{fee}&nbsp;{usd && <span>/&nbsp;${usd}</span>}
</span>
)}
/>

2
common/components/ui/UnitDisplay.tsx
View File

@ -70,7 +70,7 @@ const UnitDisplay: React.SFC<EthProps | TokenProps> = params => {
element = (
<span>
{formattedValue}
<span>{symbol ? ` ${symbol}` : ''}</span>
<span>{symbol ? <>&nbsp;${symbol}</> : ''}</span>
</span>
);
}

2
common/translations/lang/en.json
View File

@ -125,7 +125,7 @@
"SCHEDULE_GAS_PRICE": "Future Gas Price",
"SCHEDULE_GAS_LIMIT": "Future Gas Limit",
"SCHEDULE_WINDOW_SIZE": "Window ",
"SCHEDULE_WINDOW_SIZE_TOOLTIP": "Window ",
"SCHEDULE_WINDOW_SIZE_TOOLTIP": "Range of blocks or minutes during which the transaction may be executed. ",
"SEND_GAS": "Gas ",
"SEND_TRANSFERTOTAL": "Send Entire Balance ",
"SEND_GENERATE": "Generate Transaction ",