@@ -154,7 +158,9 @@ class ExecutionContext extends Component {
{i18n.t('mist.sendTx.tokenContractName')}
- {token.address}
+
+ {token.address}
+
)}
diff --git a/interface/components/SendTx/TxParties.js b/interface/components/SendTx/TxParties.js
index 4e79c4a83..f6a37427e 100644
--- a/interface/components/SendTx/TxParties.js
+++ b/interface/components/SendTx/TxParties.js
@@ -44,7 +44,7 @@ class TxParties extends Component {
{i18n.t('mist.sendTx.from')}
-
- {i18n.t('mist.txHistory.status')}: {status}
-
{i18n.t('mist.txHistory.txHash')}:{' '}
{txHashLink}
{i18n.t('mist.txHistory.etherAmount')}:{' '}
- {etherAmount} ether{' '}
+ {etherAmount} Ether{' '}
{etherAmountUSD && (${etherAmountUSD} USD)}
@@ -148,20 +114,20 @@ class TxRow extends Component {
)}
{i18n.t('mist.txHistory.gasPrice')}:{' '}
- {gasPriceEther} ether ({gasPriceGwei}{' '}
+ {gasPriceEther} Ether ({gasPriceGwei}{' '}
Gwei)
{txCostEther && (
{i18n.t('mist.txHistory.txCost')}:{' '}
- {txCostEther} ether
+ {txCostEther} Ether
{txCostUSD && (${txCostUSD} USD)}
)}
{tx.data && (
{i18n.t('mist.txHistory.data')}:{' '}
- {tx.data}
+ {tx.data}
)}
this.toggleDetails()}>
@@ -200,7 +166,38 @@ class TxRow extends Component {
description = 'Executed “' + executionFunctionSentence + '” function';
} else {
const etherAmount = this.valueToEtherAmount(tx.value);
- description = `Sent ${etherAmount} ether`;
+ description = `Sent ${etherAmount} Ether`;
+ }
+
+ let status = (
+
+ {i18n.t('mist.txHistory.statusPending')}
+
+ );
+ if (tx.status === 0) {
+ status = (
+
+ {i18n.t('mist.txHistory.statusFailed')}
+
+ );
+ } else if (tx.status === 1 && tx.blockNumber) {
+ const blockNumber = _.max([
+ this.props.nodes.local.blockNumber,
+ this.props.nodes.remote.blockNumber
+ ]);
+ const numberConfirmations = blockNumber - tx.blockNumber;
+ status = (
+
+
+ {i18n.t('mist.txHistory.statusConfirmed')}
+ {' '}
+
+ ({i18n.t('mist.txHistory.confirmations', {
+ count: numberConfirmations
+ })})
+
+
+ );
}
return (
@@ -241,6 +238,9 @@ class TxRow extends Component {
)}
)}
+
+ {i18n.t('mist.txHistory.status')}: {status}
+
{this.renderDetails()}
);
diff --git a/interface/i18n/mist.en.i18n.json b/interface/i18n/mist.en.i18n.json
index 75d87ca9c..643301ffa 100644
--- a/interface/i18n/mist.en.i18n.json
+++ b/interface/i18n/mist.en.i18n.json
@@ -138,9 +138,9 @@
"gasEstimate": "Gas Estimate:",
"errorMessage": "Error Message:",
"transactionExecutingFunction": "Transaction Executing Function:",
- "from": "FROM",
- "to": "TO",
- "contract": "CONTRACT",
+ "from": "From",
+ "to": "To",
+ "contract": "Contract",
"loading": "Loading...",
"priorityFee": "Priority Fee:",
"standardFee": "Standard Fee:",
@@ -175,7 +175,7 @@
"statusPending": "Pending",
"statusFailed": "Failed",
"statusConfirmed": "Confirmed",
- "confirmations": "__count__ confirmations",
+ "confirmations": "__count__ block confirmations",
"txHash": "Transaction Hash",
"etherAmount": "Ether Amount",
"nonce": "Nonce",
diff --git a/interface/utils/formatters.js b/interface/utils/formatters.js
index d331bdb86..54173a6eb 100644
--- a/interface/utils/formatters.js
+++ b/interface/utils/formatters.js
@@ -1,3 +1,14 @@
export function formatTokenCount(value, decimals) {
return Number((value /= Math.pow(10, decimals))).toString();
}
+
+export function formatFunctionName(functionName) {
+ if (functionName === undefined)
+ throw new Error('formatFunctionName() expects a non-empty string');
+ return functionName
+ .slice(0, functionName.indexOf('('))
+ .replace(/_+/g, ' ')
+ .replace(/([A-Z]+|[0-9]+)/g, ' $1')
+ .toLowerCase()
+ .trim();
+}
diff --git a/modules/ipcCommunicator.js b/modules/ipcCommunicator.js
index a8f9195b7..ae17fc46d 100644
--- a/modules/ipcCommunicator.js
+++ b/modules/ipcCommunicator.js
@@ -60,12 +60,15 @@ ipc.on('backendAction_setWindowSize', (e, width, height) => {
if (senderWindow) {
const { x, y } = senderWindow.window.getBounds();
- senderWindow.window.setBounds({
- width,
- height: height | 0,
- x,
- y
- });
+ senderWindow.window.setBounds(
+ {
+ width,
+ height: height | 0,
+ x,
+ y
+ },
+ true
+ );
}
});
diff --git a/package.json b/package.json
index 1d4bc4f52..193bead77 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "Mist",
- "version": "0.11.2",
+ "version": "0.12.0",
"license": "GPL-3.0",
"author": "Ethereum Mist Team
",
"description": "Ethereum Mist",
diff --git a/tests/unit/utils/formatters.test.js b/tests/unit/utils/formatters.test.js
index 220775f7d..286b22673 100644
--- a/tests/unit/utils/formatters.test.js
+++ b/tests/unit/utils/formatters.test.js
@@ -1,5 +1,8 @@
import { assert } from 'chai';
-import { formatTokenCount } from '../../../interface/utils/formatters';
+import {
+ formatTokenCount,
+ formatFunctionName
+} from '../../../interface/utils/formatters';
describe('the formatter util', () => {
context('formatTokenCount', () => {
@@ -19,4 +22,51 @@ describe('the formatter util', () => {
assert.equal(formatTokenCount(-1500000000000000000, 18), '-1.5');
});
});
+
+ context('formatFunctionName', () => {
+ const fn = n => formatFunctionName(n);
+
+ it('should handle empty param', () => {
+ assert.equal(fn(''), '');
+ });
+
+ it('should handle a basic scenario', () => {
+ assert.equal(fn('approve()'), 'approve');
+ });
+
+ it('should separate words', () => {
+ assert.equal(fn('transferFrom()'), 'transfer from');
+ });
+
+ it('should separate numbers', () => {
+ assert.equal(fn('splitTo2()'), 'split to 2');
+ });
+
+ it('should mix letters and numbers', () => {
+ assert.equal(fn('transfer20Shares()'), 'transfer 20 shares');
+ });
+
+ it('should split function names with underscore', () => {
+ assert.equal(fn('send_payload()'), 'send payload');
+ });
+
+ it('should split function names with multiple underscores', () => {
+ assert.equal(
+ fn('send__payload__to_blockchain()'),
+ 'send payload to blockchain'
+ );
+ });
+
+ it('should handle acronyms', () => {
+ assert.equal(fn('setURL()'), 'set url');
+ });
+
+ it('all caps function names should return as a single word', () => {
+ assert.equal(fn('IDONOTFOLLOWRULES()'), 'idonotfollowrules');
+ });
+
+ it('should fire meaninful error when no parameters are passed', () => {
+ assert.throws(fn, 'formatFunctionName() expects a non-empty string');
+ });
+ });
});