From a09d1af6bd9ef347abaffef7de7776a13e1329e1 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Wed, 5 Feb 2020 11:17:14 +0100
Subject: [PATCH] Display day breakdown for voting locks

---
 packages/app-address-book/src/Overview.tsx    |  2 +-
 .../app-democracy/src/Overview/Voting.tsx     | 26 ++++++++++++-------
 packages/app-extrinsics/src/Selection.tsx     |  1 -
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/packages/app-address-book/src/Overview.tsx b/packages/app-address-book/src/Overview.tsx
index c8f60212aef..4548f08a60b 100644
--- a/packages/app-address-book/src/Overview.tsx
+++ b/packages/app-address-book/src/Overview.tsx
@@ -84,7 +84,7 @@ function Overview ({ className, onStatusChange }: Props): React.ReactElement<Pro
             </Table>
           </>
         )
-        : t('no contracts yet, add an existing contact')
+        : t('no addresses saved yet, add any existing address')
       }
     </div>
   );
diff --git a/packages/app-democracy/src/Overview/Voting.tsx b/packages/app-democracy/src/Overview/Voting.tsx
index ee6bb2975a3..053352d3abb 100644
--- a/packages/app-democracy/src/Overview/Voting.tsx
+++ b/packages/app-democracy/src/Overview/Voting.tsx
@@ -6,7 +6,7 @@ import { PropIndex, Proposal } from '@polkadot/types/interfaces';
 
 import React, { useMemo, useState } from 'react';
 import { Button, Dropdown, Modal, ProposedAction, VoteAccount, VoteActions, VoteToggle } from '@polkadot/react-components';
-import { useAccounts, useToggle } from '@polkadot/react-hooks';
+import { useAccounts, useApi, useToggle } from '@polkadot/react-hooks';
 import { isBoolean } from '@polkadot/util';
 
 import { useTranslation } from '../translate';
@@ -18,20 +18,28 @@ interface Props {
 
 export default function Voting ({ proposal, referendumId }: Props): React.ReactElement<Props> | null {
   const { t } = useTranslation();
+  const { api } = useApi();
   const { hasAccounts } = useAccounts();
   const [accountId, setAccountId] = useState<string | null>(null);
   const [conviction, setConviction] = useState(0);
   const [isVotingOpen, toggleVoting] = useToggle();
   const [aye, setVoteValue] = useState(true);
+  const [enact] = useState(
+    (api.consts.democracy.enactmentPeriod.toNumber() * api.consts.timestamp.minimumPeriod.toNumber() / 1000 * 2) / 60 / 60 / 24
+  );
   const convictionOpts = useMemo(() => [
-    { text: t('0.1x of voting balance, no lockup period'), value: 0 },
-    { text: t('1x of voting balance, locked for 1x enactment'), value: 1 },
-    { text: t('2x of voting balance, locked for 2x enactment'), value: 2 },
-    { text: t('3x of voting balance, locked for 4x enactment'), value: 3 },
-    { text: t('4x of voting balance, locked for 8x enactment'), value: 4 },
-    { text: t('5x of voting balance, locked for 16x enactment'), value: 5 },
-    { text: t('6x of voting balance, locked for 32x enactment'), value: 6 }
-  ], [t]);
+    { text: t('0.1x voting balance, no lockup period'), value: 0 },
+    ...[[1, 1], [2, 2], [3, 4], [4, 8], [5, 16], [6, 32]].map(([value, lock]): { text: string; value: number } => ({
+      text: t('{{value}}x voting balance, locked for {{lock}}x enactment ({{period}} days)', {
+        replace: {
+          lock,
+          period: (enact * lock).toFixed(2),
+          value
+        }
+      }),
+      value
+    }))
+  ], [t, enact]);
 
   if (!hasAccounts) {
     return null;
diff --git a/packages/app-extrinsics/src/Selection.tsx b/packages/app-extrinsics/src/Selection.tsx
index 758e24b3a94..c642e945c53 100644
--- a/packages/app-extrinsics/src/Selection.tsx
+++ b/packages/app-extrinsics/src/Selection.tsx
@@ -70,7 +70,6 @@ class Selection extends TxComponent<Props, State> {
             icon='sign-in'
             extrinsic={extrinsic}
             ref={this.button}
-            withSpinner
           />
         </Button.Group>
       </div>