From 7c0d572918f1bcd5461f9d76d931eaa1c34b818e Mon Sep 17 00:00:00 2001 From: Luis Cuende Date: Mon, 15 Apr 2019 15:30:53 +0200 Subject: [PATCH 1/4] Copy improvements --- apps/finance/app/src/App.js | 4 ++-- apps/finance/app/src/components/Balances.js | 2 +- apps/finance/app/src/components/NewTransfer/Deposit.js | 2 +- apps/finance/app/src/components/NewTransfer/Withdrawal.js | 2 +- apps/token-manager/app/src/components/HolderRow.js | 2 +- apps/token-manager/app/src/screens/EmptyState.js | 2 +- apps/voting/app/src/App.js | 2 +- apps/voting/app/src/components/NewVotePanelContent.js | 2 +- apps/voting/app/src/components/VotePanelContent.js | 2 +- apps/voting/app/src/components/VoteStatus.js | 4 ++-- apps/voting/app/src/components/VoteSuccess.js | 3 ++- apps/voting/app/src/components/VoteSummary.js | 2 +- apps/voting/app/src/screens/EmptyState.js | 2 +- 13 files changed, 16 insertions(+), 15 deletions(-) diff --git a/apps/finance/app/src/App.js b/apps/finance/app/src/App.js index a55f194c14..59ea37c4a9 100644 --- a/apps/finance/app/src/App.js +++ b/apps/finance/app/src/App.js @@ -136,7 +136,7 @@ class App extends React.Component { icon={} title="There are no funds yet" text="Create a new transfer to get started." - actionText="New Transfer" + actionText="New transfer" onActivate={this.handleNewTransferOpen} /> @@ -145,7 +145,7 @@ class App extends React.Component { - Token Balances + Balances {balanceItems.length > 0 ? ( diff --git a/apps/finance/app/src/components/NewTransfer/Deposit.js b/apps/finance/app/src/components/NewTransfer/Deposit.js index ccad8f26bb..6d66232989 100644 --- a/apps/finance/app/src/components/NewTransfer/Deposit.js +++ b/apps/finance/app/src/components/NewTransfer/Deposit.js @@ -300,7 +300,7 @@ class Deposit extends React.Component { wide /> - + - Assign Tokens + Assign tokens )} diff --git a/apps/token-manager/app/src/screens/EmptyState.js b/apps/token-manager/app/src/screens/EmptyState.js index 9cd7281dba..f2cef5fe87 100644 --- a/apps/token-manager/app/src/screens/EmptyState.js +++ b/apps/token-manager/app/src/screens/EmptyState.js @@ -9,7 +9,7 @@ const EmptyState = ({ onActivate }) => ( icon={} title="There are no tokens assigned yet" text="Assign tokens to get started." - actionText="Assign Tokens" + actionText="Assign tokens" onActivate={onActivate} /> diff --git a/apps/voting/app/src/App.js b/apps/voting/app/src/App.js index f1cad6e125..6e3cac296d 100644 --- a/apps/voting/app/src/App.js +++ b/apps/voting/app/src/App.js @@ -256,7 +256,7 @@ class App extends React.Component { diff --git a/apps/voting/app/src/components/NewVotePanelContent.js b/apps/voting/app/src/components/NewVotePanelContent.js index 91b36bd567..ba3ff100e0 100644 --- a/apps/voting/app/src/components/NewVotePanelContent.js +++ b/apps/voting/app/src/components/NewVotePanelContent.js @@ -48,7 +48,7 @@ class NewVotePanelContent extends React.Component { /> If you are allowed to directly create this vote, you will diff --git a/apps/voting/app/src/components/VotePanelContent.js b/apps/voting/app/src/components/VotePanelContent.js index 64e3c4513c..48d2588ced 100644 --- a/apps/voting/app/src/components/VotePanelContent.js +++ b/apps/voting/app/src/components/VotePanelContent.js @@ -187,7 +187,7 @@ class VotePanelContent extends React.Component {

- +

{round(quorumProgress * 100, 2)}%{' '} diff --git a/apps/voting/app/src/components/VoteStatus.js b/apps/voting/app/src/components/VoteStatus.js index 5ac2345760..99f4efbfb7 100644 --- a/apps/voting/app/src/components/VoteStatus.js +++ b/apps/voting/app/src/components/VoteStatus.js @@ -18,7 +18,7 @@ const ATTRIBUTES = { bold: false, }, [VOTE_STATUS_ACCEPTED]: { - label: 'Pending execution', + label: 'Pending enactment', Icon: null, color: theme.textTertiary, bold: false, @@ -30,7 +30,7 @@ const ATTRIBUTES = { bold: true, }, [VOTE_STATUS_EXECUTED]: { - label: 'Executed', + label: 'Enacted', Icon: IconCheck, color: theme.positive, bold: true, diff --git a/apps/voting/app/src/components/VoteSuccess.js b/apps/voting/app/src/components/VoteSuccess.js index 4137e1962f..85f8a91ed9 100644 --- a/apps/voting/app/src/components/VoteSuccess.js +++ b/apps/voting/app/src/components/VoteSuccess.js @@ -19,7 +19,8 @@ const VoteSuccess = ({ settings, vote, ...props }) => ( - {success ? 'Vote will pass' : 'Vote won’t pass'} + Current outcome: + {success ? ' Yes' : ' No'} ) diff --git a/apps/voting/app/src/components/VoteSummary.js b/apps/voting/app/src/components/VoteSummary.js index 1eb98f57e7..7fa061be56 100644 --- a/apps/voting/app/src/components/VoteSummary.js +++ b/apps/voting/app/src/components/VoteSummary.js @@ -21,7 +21,7 @@ const VoteSummary = ({ vote, tokenSymbol, tokenDecimals, ready }) => {
- Current support{' '} + Votes{' '} ({Math.round(supportRequired * 100)}% needed) diff --git a/apps/voting/app/src/screens/EmptyState.js b/apps/voting/app/src/screens/EmptyState.js index 379c57ad88..c94828123d 100644 --- a/apps/voting/app/src/screens/EmptyState.js +++ b/apps/voting/app/src/screens/EmptyState.js @@ -8,7 +8,7 @@ const EmptyState = ({ onActivate }) => ( } onActivate={onActivate} /> From 51c8824565c1e4a4eaa4cd9b14fce7008d249953 Mon Sep 17 00:00:00 2001 From: Luis Cuende Date: Tue, 16 Apr 2019 18:47:49 +0200 Subject: [PATCH 2/4] More specific copy --- apps/voting/app/src/components/VoteSummary.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/voting/app/src/components/VoteSummary.js b/apps/voting/app/src/components/VoteSummary.js index 7fa061be56..b2cbbf23d9 100644 --- a/apps/voting/app/src/components/VoteSummary.js +++ b/apps/voting/app/src/components/VoteSummary.js @@ -24,7 +24,7 @@ const VoteSummary = ({ vote, tokenSymbol, tokenDecimals, ready }) => { Votes{' '} - ({Math.round(supportRequired * 100)}% needed) + ({Math.round(supportRequired * 100)}% support needed for approval)
From c36a8a77a3fcc458cdcc0b15de3b6da99e3ed109 Mon Sep 17 00:00:00 2001 From: Luis Cuende Date: Wed, 17 Apr 2019 04:10:12 +0200 Subject: [PATCH 3/4] Reverting change --- apps/voting/app/src/components/VotePanelContent.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/voting/app/src/components/VotePanelContent.js b/apps/voting/app/src/components/VotePanelContent.js index 89dbd58ef1..350f47f6d0 100644 --- a/apps/voting/app/src/components/VotePanelContent.js +++ b/apps/voting/app/src/components/VotePanelContent.js @@ -81,7 +81,7 @@ const VotePanelContent = React.memo(

- +

{round(quorumProgress * 100, 2)}%{' '} From b0050624f09f8ad28d468bd5c8a79d7dfc8c43b3 Mon Sep 17 00:00:00 2001 From: Luis Cuende Date: Wed, 17 Apr 2019 04:17:55 +0200 Subject: [PATCH 4/4] Change confusing token manager copy --- .../app/src/components/Panels/AssignVotePanelContent.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/token-manager/app/src/components/Panels/AssignVotePanelContent.js b/apps/token-manager/app/src/components/Panels/AssignVotePanelContent.js index 6fa4327a61..ef0bdb3327 100644 --- a/apps/token-manager/app/src/components/Panels/AssignVotePanelContent.js +++ b/apps/token-manager/app/src/components/Panels/AssignVotePanelContent.js @@ -137,7 +137,7 @@ class AssignVotePanelContent extends React.Component {