Merge branch 'master' into ui-2

# Conflicts:
#	js/package-lock.json
#	js/src/Application/application.js
#	js/src/api/rpc/parity/parity.js
#	js/src/api/subscriptions/manager.spec.js
#	js/src/api/subscriptions/personal.spec.js
#	js/src/jsonrpc/interfaces/parity.js
#	js/src/mobx/hardwareStore.js
#	js/src/mobx/hardwareStore.spec.js
#	js/src/modals/index.js
#	js/src/redux/providers/signerMiddleware.spec.js
#	js/src/ui/SelectionList/selectionList.css
#	js/src/views/Account/account.spec.js
#	js/src/views/Accounts/accounts.spec.js
#	js/src/views/Application/Extension/store.js
#	js/src/views/Signer/components/SignRequest/signRequest.spec.js

js/src/Application/application.js

@@ -20,6 +20,7 @@ import { FormattedMessage } from 'react-intl';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 
+import HardwareStore from '@parity/shared/mobx/hardwareStore';
 import UpgradeStore from '@parity/shared/mobx/upgradeParity';
 import Errors from '@parity/ui/Errors';
 
@@ -28,6 +29,7 @@ import DappRequests from '../DappRequests';
 import Extension from '../Extension';
 import FirstRun from '../FirstRun';
 import ParityBar from '../ParityBar';
+import PinMatrix from '../PinMatrix';
 import Requests from '../Requests';
 import Snackbar from '../Snackbar';
 import Status from '../Status';
@@ -54,11 +56,13 @@ class Application extends Component {
   }
 
   store = new Store(this.context.api);
+  hwstore = HardwareStore.get(this.context.api);
   upgradeStore = UpgradeStore.get(this.context.api);
 
   render () {
     const [root] = (window.location.hash || '').replace('#/', '').split('/');
     const isMinimized = root !== '';
+    const { pinMatrixRequest } = this.hwstore;
 
     if (inFrame) {
       return (
@@ -85,6 +89,16 @@ class Application extends Component {
         }
         <Connection />
         <DappRequests />
+        {
+          (pinMatrixRequest.length > 0)
+            ? (
+              <PinMatrix
+                device={ pinMatrixRequest[0] }
+                store={ this.hwstore }
+              />
+            )
+            : null
+        }
         <Requests />
         <ParityBar dapp={ isMinimized } />
       </div>