centrifuge · philipstanislaus · Feb 5, 2020 · Feb 3, 2020 · Feb 3, 2020 · Feb 3, 2020
diff --git a/Dockerfile b/Dockerfile
@@ -7,19 +7,18 @@ RUN apt-get update && apt-get install -y curl git gnupg
 RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
 RUN apt-get install -y nodejs
 
-WORKDIR /app
-RUN git clone https://github.com/polkadot-js/apps
+WORKDIR /apps
+COPY . .
 
-WORKDIR /app/apps
 RUN npm install yarn -g
 RUN yarn
-RUN NODE_ENV=production yarn build
+RUN NODE_ENV=production yarn build:www
 
 FROM ubuntu:18.04
 
 RUN apt-get update && apt-get -y install nginx
 
-COPY --from=builder /app/apps/packages/apps/build /var/www/html
+COPY --from=builder /apps/packages/apps/build /var/www/html
 
 EXPOSE 80
 

diff --git a/lerna.json b/lerna.json
@@ -10,5 +10,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.40.0-beta.1"
+  "version": "0.40.0-beta.8"
 }
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.40.0-beta.1",
+  "version": "0.40.0-beta.8",
   "private": true,
   "engines": {
     "node": ">=10.13.0",
@@ -10,20 +10,21 @@
     "packages/*"
   ],
   "resolutions": {
-    "@polkadot/api": "^1.1.0-beta.8",
-    "@polkadot/api-contract": "^1.1.0-beta.8",
-    "@polkadot/keyring": "^2.0.1",
-    "@polkadot/types": "^1.1.0-beta.8",
-    "@polkadot/util": "^2.0.1",
-    "@polkadot/util-crypto": "^2.0.1",
+    "@polkadot/api": "^1.1.0-beta.19",
+    "@polkadot/api-contract": "^1.1.0-beta.19",
+    "@polkadot/keyring": "^2.1.1",
+    "@polkadot/types": "^1.1.0-beta.19",
+    "@polkadot/util": "^2.1.1",
+    "@polkadot/util-crypto": "^2.1.1",
     "babel-core": "^7.0.0-bridge.0",
     "typescript": "^3.7.5"
   },
   "scripts": {
     "analyze": "yarn run build && cd packages/apps && yarn run source-map-explorer build/main.*.js",
-    "build": "yarn run build:code && yarn run build:i18n",
+    "build": "yarn run build:i18n && yarn run build:code",
     "build:code": "NODE_ENV=production polkadot-dev-build-ts",
     "build:i18n": "i18next-scanner --config i18next-scanner.config.js",
+    "build:www": "rm -rf packages/apps/build && mkdir -p packages/apps/build && yarn run build:i18n && cd packages/apps && NODE_ENV=production webpack --config webpack.config.js",
     "docs": "echo \"skipping docs\"",
     "clean": "polkadot-dev-clean-build",
     "clean:i18n": "rm -rf packages/apps/public/locales/en && mkdir -p packages/apps/public/locales/en",

diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/app-123code",
-  "version": "0.40.0-beta.1",
+  "version": "0.40.0-beta.8",
   "description": "A basic app that shows the ropes on customisation",
   "main": "index.js",
   "scripts": {},
@@ -11,6 +11,6 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.8.3",
-    "@polkadot/react-components": "^0.40.0-beta.1"
+    "@polkadot/react-components": "^0.40.0-beta.8"
   }
 }
diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/app-accounts",
-  "version": "0.40.0-beta.1",
+  "version": "0.40.0-beta.8",
   "main": "index.js",
   "repository": "https://github.com/polkadot-js/apps.git",
   "author": "Jaco Greeff <jacogr@gmail.com>",
@@ -11,8 +11,8 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.8.3",
-    "@polkadot/react-components": "^0.40.0-beta.1",
-    "@polkadot/react-qr": "^0.48.1",
+    "@polkadot/react-components": "^0.40.0-beta.8",
+    "@polkadot/react-qr": "^0.49.0-beta.1",
     "@types/file-saver": "^2.0.0",
     "@types/yargs": "^15.0.2",
     "detect-browser": "^4.8.0",

diff --git a/packages/app-address-book/package.json b/packages/app-address-book/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/app-address-book",
-  "version": "0.40.0-beta.1",
+  "version": "0.40.0-beta.8",
   "main": "index.js",
   "repository": "https://github.com/polkadot-js/apps.git",
   "author": "Jaco Greeff <jacogr@gmail.com>",
@@ -11,6 +11,6 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.8.3",
-    "@polkadot/react-components": "^0.40.0-beta.1"
+    "@polkadot/react-components": "^0.40.0-beta.8"
   }
 }
diff --git 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-claims/package.json b/packages/app-claims/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/app-claims",
-  "version": "0.40.0-beta.1",
+  "version": "0.40.0-beta.8",
   "description": "An app for claiming Polkadot tokens",
   "main": "index.js",
   "scripts": {},
@@ -12,7 +12,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.8.3",
-    "@polkadot/react-components": "^0.40.0-beta.1",
+    "@polkadot/react-components": "^0.40.0-beta.8",
     "secp256k1": "^3.8.0"
   }
 }
diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/app-contracts",
-  "version": "0.40.0-beta.1",
+  "version": "0.40.0-beta.8",
   "description": "Deployment and management of substrate contracts",
   "main": "index.js",
   "scripts": {},
@@ -11,6 +11,6 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.8.3",
-    "@polkadot/api-contract": "^1.1.0-beta.8"
+    "@polkadot/api-contract": "^1.1.0-beta.19"
   }
 }
diff --git a/packages/app-council/package.json b/packages/app-council/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/app-council",
-  "version": "0.40.0-beta.1",
+  "version": "0.40.0-beta.8",
   "description": "Council",
   "main": "index.js",
   "scripts": {},
@@ -11,7 +11,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.8.3",
-    "@polkadot/react-components": "^0.40.0-beta.1",
-    "@polkadot/react-query": "^0.40.0-beta.1"
+    "@polkadot/react-components": "^0.40.0-beta.8",
+    "@polkadot/react-query": "^0.40.0-beta.8"
   }
 }
diff --git a/packages/app-council/src/Motions/Propose.tsx b/packages/app-council/src/Motions/Propose.tsx
@@ -2,8 +2,9 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { SubmittableExtrinsic } from '@polkadot/api/types';
 import { ApiProps } from '@polkadot/react-api/types';
-import { Call, Proposal } from '@polkadot/types/interfaces';
+import { Proposal } from '@polkadot/types/interfaces';
 
 import BN from 'bn.js';
 import React from 'react';
@@ -20,7 +21,7 @@ interface Props extends TxModalProps, ApiProps {
 }
 
 interface State extends TxModalState {
-  method: Call | null;
+  method: SubmittableExtrinsic<'promise'> | null;
   threshold: BN | null;
 }
 
@@ -122,7 +123,7 @@ class Propose extends TxModal<Props, State> {
     this.setState({ threshold });
   }
 
-  private onChangeExtrinsic = (method?: Call): void => {
+  private onChangeExtrinsic = (method?: SubmittableExtrinsic<'promise'>): void => {
     if (!method) {
       return;
     }

diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/app-dashboard",
-  "version": "0.40.0-beta.1",
+  "version": "0.40.0-beta.8",
   "description": "Dashboard for all apps, allowing for an overview and quick navigation",
   "main": "index.js",
   "scripts": {},
@@ -11,7 +11,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.8.3",
-    "@polkadot/apps-routing": "^0.40.0-beta.1",
-    "@polkadot/react-components": "^0.40.0-beta.1"
+    "@polkadot/apps-routing": "^0.40.0-beta.8",
+    "@polkadot/react-components": "^0.40.0-beta.8"
   }
 }
diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/app-democracy",
-  "version": "0.40.0-beta.1",
+  "version": "0.40.0-beta.8",
   "description": "A referendum & proposal app",
   "main": "index.js",
   "scripts": {},
@@ -11,7 +11,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.8.3",
-    "@polkadot/react-components": "^0.40.0-beta.1",
-    "@polkadot/react-query": "^0.40.0-beta.1"
+    "@polkadot/react-components": "^0.40.0-beta.8",
+    "@polkadot/react-query": "^0.40.0-beta.8"
   }
 }
diff --git a/packages/app-democracy/src/Overview/Externals.tsx b/packages/app-democracy/src/Overview/Externals.tsx
@@ -12,6 +12,7 @@ import { FormatBalance } from '@polkadot/react-query';
 import { Bytes, Option } from '@polkadot/types';
 
 import { useTranslation } from '../translate';
+import PreImageButton from './PreImageButton';
 import ProposalCell from './ProposalCell';
 
 interface Props {
@@ -70,6 +71,13 @@ export default function Externals ({ className }: Props): React.ReactElement<Pro
               proposalHash={hash}
               proposal={expanded?.proposal}
             />
+            <td className='together number top'>
+              <PreImageButton
+                hash={hash}
+                proposal={expanded?.proposal}
+                withoutOr
+              />
+            </td>
           </tr>
         </Table.Body>
       </Table>

diff --git 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';
@@ -16,22 +16,32 @@ interface Props {
   referendumId: PropIndex;
 }
 
+const CONVICTIONS: [number, number][] = [1, 2, 4, 8, 16, 32].map((lock, index) => [index + 1, lock]);
+
 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 },
+    ...CONVICTIONS.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-explorer/package.json b/packages/app-explorer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/app-explorer",
-  "version": "0.40.0-beta.1",
+  "version": "0.40.0-beta.8",
   "main": "index.js",
   "repository": "https://github.com/polkadot-js/apps.git",
   "author": "Jaco Greeff <jacogr@gmail.com>",
@@ -11,6 +11,6 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.8.3",
-    "@polkadot/react-components": "^0.40.0-beta.1"
+    "@polkadot/react-components": "^0.40.0-beta.8"
   }
 }
diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/app-extrinsics",
-  "version": "0.40.0-beta.1",
+  "version": "0.40.0-beta.8",
   "main": "index.js",
   "repository": "https://github.com/polkadot-js/apps.git",
   "author": "Jaco Greeff <jacogr@gmail.com>",
@@ -11,8 +11,8 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.8.3",
-    "@polkadot/react-components": "^0.40.0-beta.1",
-    "@polkadot/react-params": "^0.40.0-beta.1",
-    "@polkadot/react-signer": "^0.40.0-beta.1"
+    "@polkadot/react-components": "^0.40.0-beta.8",
+    "@polkadot/react-params": "^0.40.0-beta.8",
+    "@polkadot/react-signer": "^0.40.0-beta.8"
   }
 }
diff --git a/packages/app-extrinsics/src/Selection.tsx b/packages/app-extrinsics/src/Selection.tsx
@@ -2,11 +2,10 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Call } from '@polkadot/types/interfaces';
 import { I18nProps } from '@polkadot/react-components/types';
 import { QueueTxExtrinsicAdd } from '@polkadot/react-components/Status/types';
 import { ApiProps } from '@polkadot/react-api/types';
-import { SubmittableExtrinsic } from '@polkadot/api/promise/types';
+import { SubmittableExtrinsic } from '@polkadot/api/types';
 
 import React from 'react';
 import { Button, Extrinsic, InputAddress, TxButton, TxComponent } from '@polkadot/react-components';
@@ -22,7 +21,7 @@ interface Props extends ApiProps, I18nProps {
 interface State {
   isValid: boolean;
   isValidUnsigned: boolean;
-  method: Call | null;
+  method: SubmittableExtrinsic<'promise'> | null;
   accountId?: string | null;
 }
 
@@ -71,7 +70,6 @@ class Selection extends TxComponent<Props, State> {
             icon='sign-in'
             extrinsic={extrinsic}
             ref={this.button}
-            withSpinner
           />
         </Button.Group>
       </div>
@@ -98,15 +96,15 @@ class Selection extends TxComponent<Props, State> {
     );
   }
 
-  private onChangeExtrinsic = (method: Call | null = null): void => {
+  private onChangeExtrinsic = (method: SubmittableExtrinsic<'promise'> | null = null): void => {
     this.nextState({ method });
   }
 
   private onChangeSender = (accountId: string | null): void => {
     this.nextState({ accountId });
   }
 
-  private getExtrinsic (): SubmittableExtrinsic | null {
+  private getExtrinsic (): SubmittableExtrinsic<'promise'> | null {
     const { api } = this.props;
     const { method } = this.state;
-Original file line number
+Diff line change
@@ Expand Up @@
                 </Table>
               </>
             )
-            : t('no contracts yet, add an existing contact')
+            : t('no addresses saved yet, add any existing address')
           }
         </div>
       );
@@ Expand Down @@