AcalaNetwork · xlc · Jan 20, 2020 · Dec 2, 2019 · Dec 2, 2019 · Dec 2, 2019
diff --git a/i18next-scanner.config.js b/i18next-scanner.config.js
@@ -1,7 +1,38 @@
+// Copyright 2017-2020 @polkadot/apps authors & contributors
+// This software may be modified and distributed under the terms
+// of the Apache-2.0 license. See the LICENSE file for details.
+
 const fs = require('fs');
 const path = require('path');
 const typescript = require('typescript');
 
+const findPackages = require('./scripts/findPackages');
+
+function transform (file, enc, done) {
+  const { ext } = path.parse(file.path);
+
+  if (ext === '.tsx') {
+    const content = fs.readFileSync(file.path, enc);
+
+    const { outputText } = typescript.transpileModule(content, {
+      compilerOptions: {
+        target: 'es2018'
+      },
+      fileName: path.basename(file.path)
+    });
+
+    const parserHandler = (key, options) => {
+      options.defaultValue = key;
+      options.ns = /packages\/(.*?)\/src/g.exec(file.path)[1];
+      this.parser.set(key, options);
+    };
+
+    this.parser.parseFuncFromString(outputText, parserHandler);
+  }
+
+  done();
+}
+
 module.exports = {
   input: [
     'packages/*/src/**/*.{ts,tsx}',
@@ -22,37 +53,7 @@ module.exports = {
     },
     lngs: ['en'],
     defaultLng: 'en',
-    ns: [
-      'app-123code',
-      'app-accounts',
-      'app-address-book',
-      'app-claims',
-      'app-contracts',
-      'app-council',
-      'app-dashboard',
-      'app-democracy',
-      'app-explorer',
-      'app-extrinsics',
-      'app-generic-asset',
-      'app-js',
-      'app-parachains',
-      'app-settings',
-      'app-staking',
-      'app-storage',
-      'app-sudo',
-      'app-tech-comm',
-      'app-toolbox',
-      'app-transfer',
-      'app-treasury',
-      'apps',
-      'apps-routing',
-      'react-api',
-      'react-components',
-      'react-params',
-      'react-query',
-      'react-signer',
-      'ui'
-    ],
+    ns: findPackages().map(({ dir }) => dir),
     defaultNs: 'ui',
     resource: {
       loadPath: 'packages/apps/public/locales/{{lng}}/{{ns}}.json',
@@ -63,28 +64,5 @@ module.exports = {
     nsSeparator: false, // namespace separator
     keySeparator: false // key separator
   },
-  transform: function transform (file, enc, done) {
-    const { ext } = path.parse(file.path);
-
-    if (ext === '.tsx') {
-      const content = fs.readFileSync(file.path, enc);
-
-      const { outputText } = typescript.transpileModule(content, {
-        compilerOptions: {
-          target: 'es2018'
-        },
-        fileName: path.basename(file.path)
-      });
-
-      const parserHandler = (key, options) => {
-        options.defaultValue = key;
-        options.ns = /packages\/(.*?)\/src/g.exec(file.path)[1];
-        this.parser.set(key, options);
-      };
-
-      this.parser.parseFuncFromString(outputText, parserHandler);
-    }
-
-    done();
-  }
+  transform
 };
diff --git a/lerna.json b/lerna.json
@@ -10,5 +10,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.39.0-beta.43"
+  "version": "0.39.0-beta.74"
 }
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.39.0-beta.43",
+  "version": "0.39.0-beta.74",
   "private": true,
   "engines": {
     "node": ">=10.13.0",
@@ -10,12 +10,12 @@
     "packages/*"
   ],
   "resolutions": {
-    "@polkadot/api": "^0.100.0-beta.28",
-    "@polkadot/api-contract": "^0.100.0-beta.28",
-    "@polkadot/keyring": "^1.8.1",
-    "@polkadot/types": "^0.100.0-beta.28",
-    "@polkadot/util": "^1.8.1",
-    "@polkadot/util-crypto": "^1.8.1",
+    "@polkadot/api": "^1.0.0-beta.13",
+    "@polkadot/api-contract": "^1.0.0-beta.13",
+    "@polkadot/keyring": "^2.0.0-beta.4",
+    "@polkadot/types": "^1.0.0-beta.13",
+    "@polkadot/util": "^2.0.0-beta.4",
+    "@polkadot/util-crypto": "^2.0.0-beta.4",
     "babel-core": "^7.0.0-bridge.0",
     "typescript": "^3.7.4"
   },

diff --git a/packages/app-123code/package.json b/packages/app-123code/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/app-123code",
-  "version": "0.39.0-beta.43",
+  "version": "0.39.0-beta.74",
   "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.7.7",
-    "@polkadot/react-components": "^0.39.0-beta.43"
+    "@polkadot/react-components": "^0.39.0-beta.74"
   }
 }
diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/app-accounts",
-  "version": "0.39.0-beta.43",
+  "version": "0.39.0-beta.74",
   "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.7.7",
-    "@polkadot/react-components": "^0.39.0-beta.43",
-    "@polkadot/react-qr": "^0.48.0-beta.8",
+    "@polkadot/react-components": "^0.39.0-beta.74",
+    "@polkadot/react-qr": "^0.48.0-beta.12",
     "@types/file-saver": "^2.0.0",
     "@types/yargs": "^13.0.2",
     "detect-browser": "^4.8.0",

diff --git a/packages/app-accounts/src/Overview.tsx b/packages/app-accounts/src/Overview.tsx
@@ -122,6 +122,7 @@ function Overview ({ className, onStatusChange }: Props): React.ReactElement<Pro
           <>
             <div className='filter--tags'>
               <Input
+                autoFocus
                 isFull
                 label={t('filter by name or tags')}
                 onChange={setFilter}

diff --git a/packages/app-accounts/src/modals/Backup.tsx b/packages/app-accounts/src/modals/Backup.tsx
@@ -68,7 +68,6 @@ export default function ({ address, onClose }: Props): React.ReactElement<Props>
     <Modal
       className='app--accounts-Modal'
       header={t('Backup account')}
-      open
     >
       <Content
         address={address}

diff --git a/packages/app-accounts/src/modals/ChangePass.tsx b/packages/app-accounts/src/modals/ChangePass.tsx
@@ -38,7 +38,6 @@ class ChangePass extends TxComponent<Props, State> {
       <Modal
         className='app--accounts-Modal'
         header={t('Change account password')}
-        open
       >
         {this.renderContent()}
         {this.renderButtons()}

diff --git a/packages/app-accounts/src/modals/Create.tsx b/packages/app-accounts/src/modals/Create.tsx
@@ -191,7 +191,6 @@ function Create ({ className, onClose, onStatusChange, seed: propsSeed, type: pr
     <Modal
       className={className}
       header={t('Add an account via seed')}
-      open
     >
       {address && isConfirmationOpen && (
         <CreateConfirmation

diff --git a/packages/app-accounts/src/modals/CreateConfirmation.tsx b/packages/app-accounts/src/modals/CreateConfirmation.tsx
@@ -18,10 +18,7 @@ export default function CreateConfirmation ({ address, name, onClose, onCommit }
   const { t } = useTranslation();
 
   return (
-    <Modal
-      header={t('Important notice')}
-      open
-    >
+    <Modal header={t('Important notice')}>
       <Modal.Content>
         <AddressRow
           defaultName={name}

diff --git a/packages/app-accounts/src/modals/Derive.tsx b/packages/app-accounts/src/modals/Derive.tsx
@@ -138,7 +138,6 @@ export default function Derive ({ className, from, onClose }: Props): React.Reac
     <Modal
       className={className}
       header={t('Derive account from pair')}
-      open
     >
       {address && isConfirmationOpen && (
         <CreateConfirmation

diff --git a/packages/app-accounts/src/modals/Identity.tsx b/packages/app-accounts/src/modals/Identity.tsx
@@ -99,13 +99,12 @@ function Identity ({ address, className, onClose }: Props): React.ReactElement<P
       // pgpFingerprint: hasPgp ? valPgp : null
     });
     //  errImg, errPgp, hasImg, hasPgp, valImg, valPgp,
-  }, [hasEmail, hasLegal, hasRiot, hasWeb, valDisplay, valEmail, valLegal, valRiot, valWeb]);
+  }, [hasEmail, hasLegal, hasRiot, hasTwitter, hasWeb, valDisplay, valEmail, valLegal, valRiot, valTwitter, valWeb]);
 
   return (
     <Modal
       className={className}
       header={t('Register identity')}
-      open
     >
       <Modal.Content>
         <Input

diff --git a/packages/app-accounts/src/modals/Import.tsx b/packages/app-accounts/src/modals/Import.tsx
@@ -38,10 +38,7 @@ class Import extends TxComponent<Props, State> {
     const { isFileValid, isPassValid } = this.state;
 
     return (
-      <Modal
-        header={t('Add via backup file')}
-        open
-      >
+      <Modal header={t('Add via backup file')}>
         {this.renderInput()}
         <Modal.Actions>
           <Button.Group>

diff --git a/packages/app-accounts/src/modals/Qr.tsx b/packages/app-accounts/src/modals/Qr.tsx
@@ -50,7 +50,6 @@ function QrModal ({ className, onClose, onStatusChange }: Props): React.ReactEle
     <Modal
       className={className}
       header={t('Add account via Qr')}
-      open
     >
       <Modal.Content>
         {

diff --git a/packages/app-accounts/src/modals/Transfer.tsx b/packages/app-accounts/src/modals/Transfer.tsx
@@ -87,7 +87,6 @@ function Transfer ({ className, onClose, recipientId: propRecipientId, senderId:
     <Modal
       className='app--accounts-Modal'
       header={t('Send funds')}
-      open
     >
       <Modal.Content>
         <div className={className}>

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.39.0-beta.43",
+  "version": "0.39.0-beta.74",
   "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.7.7",
-    "@polkadot/react-components": "^0.39.0-beta.43"
+    "@polkadot/react-components": "^0.39.0-beta.74"
   }
 }
diff --git a/packages/app-address-book/src/Overview.tsx b/packages/app-address-book/src/Overview.tsx
@@ -62,6 +62,7 @@ function Overview ({ className, onStatusChange }: Props): React.ReactElement<Pro
           <>
             <div className='filter--tags'>
               <Input
+                autoFocus
                 isFull
                 label={t('filter by name or tags')}
                 onChange={setFilter}

diff --git a/packages/app-address-book/src/modals/Create.tsx b/packages/app-address-book/src/modals/Create.tsx
@@ -75,10 +75,7 @@ export default function Create ({ onClose, onStatusChange }: Props): React.React
   };
 
   return (
-    <Modal
-      header={t('Add an address')}
-      open
-    >
+    <Modal header={t('Add an address')}>
       <Modal.Content>
         <AddressRow
           defaultName={name}

diff --git a/packages/app-claims/package.json b/packages/app-claims/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/app-claims",
-  "version": "0.39.0-beta.43",
+  "version": "0.39.0-beta.74",
   "description": "An app for claiming Polkadot tokens",
   "main": "index.js",
   "scripts": {},
@@ -12,6 +12,6 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.7.7",
-    "@polkadot/react-components": "^0.39.0-beta.43"
+    "@polkadot/react-components": "^0.39.0-beta.74"
   }
 }