diff --git a/js/src/shell/DappRequests/Request/request.js b/js/src/shell/DappRequests/Request/request.js
index 3b95bfc5a..5d02b03bf 100644
--- a/js/src/shell/DappRequests/Request/request.js
+++ b/js/src/shell/DappRequests/Request/request.js
@@ -38,33 +38,35 @@ export default function Request ({ appId, className, approveRequest, denyRequest
method
} }
/>
-
- }
- onClick={ _onApprove }
- />
-
- }
- onClick={ _onApproveAll }
- />
-
- }
- onClick={ _onReject }
- />
+
+
+ }
+ onClick={ _onApprove }
+ />
+
+ }
+ onClick={ _onApproveAll }
+ />
+
+ }
+ onClick={ _onReject }
+ />
+
);
}
diff --git a/js/src/shell/DappRequests/dappRequests.css b/js/src/shell/DappRequests/dappRequests.css
index 5d8f4898f..3118e8912 100644
--- a/js/src/shell/DappRequests/dappRequests.css
+++ b/js/src/shell/DappRequests/dappRequests.css
@@ -18,13 +18,16 @@
.requests {
background: #f80;
color: white;
- bottom: 0;
position: fixed;
left: 0;
right: 0;
+ top: 0;
z-index: 760; /* sits above requests */
.request {
+ align-items: center;
+ display: flex;
+ justify-content: flex-end;
padding: 0.5em;
> span {
diff --git a/js/src/shell/DappRequests/filteredRequests.js b/js/src/shell/DappRequests/filteredRequests.js
index 25448a397..0d0141dc6 100644
--- a/js/src/shell/DappRequests/filteredRequests.js
+++ b/js/src/shell/DappRequests/filteredRequests.js
@@ -17,5 +17,29 @@
export default {
'parity_accountsInfo': {},
'parity_allAccountsInfo': {},
- 'parity_hashContent': {}
+ 'parity_changeVault': {},
+ 'parity_changeVaultPassword': {},
+ 'parity_consensusCapability': {},
+ 'parity_checkRequest': {},
+ 'parity_closeVault': {},
+ 'parity_executeUpgrade': {},
+ 'parity_generateSecretPhrase': {},
+ 'parity_getVaultMeta': {},
+ 'parity_hashContent': {},
+ 'parity_importGethAccounts': {},
+ 'parity_localTransactions': {},
+ 'parity_listGethAccounts': {},
+ 'parity_listVaults': {},
+ 'parity_listOpenedVaults': {},
+ 'parity_newAccountFromPhrase': {},
+ 'parity_newAccountFromSecret': {},
+ 'parity_newAccountFromWallet': {},
+ 'parity_newVault': {},
+ 'parity_openVault': {},
+ 'parity_phraseToAddress': {},
+ 'parity_setAccountMeta': {},
+ 'parity_setAccountName': {},
+ 'parity_setVaultMeta': {},
+ 'parity_upgradeReady': {},
+ 'parity_versionInfo': {}
};
diff --git a/js/src/shell/DappRequests/store.js b/js/src/shell/DappRequests/store.js
index 689fcd1f6..9460fd332 100644
--- a/js/src/shell/DappRequests/store.js
+++ b/js/src/shell/DappRequests/store.js
@@ -17,7 +17,7 @@
import { action, computed, observable } from 'mobx';
import filteredRequests from './filteredRequests';
-import MethodsStore from '../DappMethods/store';
+import MethodsStore from '../Dapps/SelectMethods/store';
let nextQueueId = 0;
@@ -116,9 +116,13 @@ export default class Store {
}
receiveMessage = ({ data, origin, source }) => {
+ if (!data) {
+ return;
+ }
+
const { from, method, token } = data;
- if (from === 'shell' || from !== token) {
+ if (!from || from === 'shell' || from !== token) {
return;
}
diff --git a/js/src/shell/DappsVisible/index.js b/js/src/shell/Dapps/SelectAccounts/index.js
similarity index 94%
rename from js/src/shell/DappsVisible/index.js
rename to js/src/shell/Dapps/SelectAccounts/index.js
index 89b0c0fed..27b23b404 100644
--- a/js/src/shell/DappsVisible/index.js
+++ b/js/src/shell/Dapps/SelectAccounts/index.js
@@ -14,4 +14,4 @@
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see .
-export default from './dappsVisible';
+export default from './selectAccounts';
diff --git a/js/src/shell/DappAccounts/dappAccounts.js b/js/src/shell/Dapps/SelectAccounts/selectAccounts.js
similarity index 97%
rename from js/src/shell/DappAccounts/dappAccounts.js
rename to js/src/shell/Dapps/SelectAccounts/selectAccounts.js
index fc928982c..ba0c4e765 100644
--- a/js/src/shell/DappAccounts/dappAccounts.js
+++ b/js/src/shell/Dapps/SelectAccounts/selectAccounts.js
@@ -21,7 +21,7 @@ import { FormattedMessage } from 'react-intl';
import { AccountCard, Portal, SelectionList } from '@parity/ui';
@observer
-export default class DappAccounts extends Component {
+export default class SelectAccounts extends Component {
static propTypes = {
permissionStore: PropTypes.object.isRequired
};
diff --git a/js/src/shell/DappAccounts/dappAccounts.spec.js b/js/src/shell/Dapps/SelectAccounts/selectAccounts.spec.js
similarity index 96%
rename from js/src/shell/DappAccounts/dappAccounts.spec.js
rename to js/src/shell/Dapps/SelectAccounts/selectAccounts.spec.js
index 081003bf9..e1d543185 100644
--- a/js/src/shell/DappAccounts/dappAccounts.spec.js
+++ b/js/src/shell/Dapps/SelectAccounts/selectAccounts.spec.js
@@ -29,7 +29,7 @@ function renderShallow (permissionStore = {}) {
return component;
}
-describe('shell/DappAccounts', () => {
+describe('shell/Dapps/SelectAccounts', () => {
describe('rendering', () => {
it('renders defaults', () => {
expect(renderShallow()).to.be.ok;
diff --git a/js/src/shell/DappAccounts/store.js b/js/src/shell/Dapps/SelectAccounts/store.js
similarity index 100%
rename from js/src/shell/DappAccounts/store.js
rename to js/src/shell/Dapps/SelectAccounts/store.js
diff --git a/js/src/shell/DappAccounts/store.spec.js b/js/src/shell/Dapps/SelectAccounts/store.spec.js
similarity index 100%
rename from js/src/shell/DappAccounts/store.spec.js
rename to js/src/shell/Dapps/SelectAccounts/store.spec.js
diff --git a/js/src/shell/DappMethods/MethodCheck/index.js b/js/src/shell/Dapps/SelectMethods/MethodCheck/index.js
similarity index 100%
rename from js/src/shell/DappMethods/MethodCheck/index.js
rename to js/src/shell/Dapps/SelectMethods/MethodCheck/index.js
diff --git a/js/src/shell/DappMethods/MethodCheck/methodCheck.js b/js/src/shell/Dapps/SelectMethods/MethodCheck/methodCheck.js
similarity index 100%
rename from js/src/shell/DappMethods/MethodCheck/methodCheck.js
rename to js/src/shell/Dapps/SelectMethods/MethodCheck/methodCheck.js
diff --git a/js/src/shell/DappMethods/index.js b/js/src/shell/Dapps/SelectMethods/index.js
similarity index 94%
rename from js/src/shell/DappMethods/index.js
rename to js/src/shell/Dapps/SelectMethods/index.js
index e7196484b..c0dfefd23 100644
--- a/js/src/shell/DappMethods/index.js
+++ b/js/src/shell/Dapps/SelectMethods/index.js
@@ -14,4 +14,4 @@
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see .
-export default from './dappMethods';
+export default from './selectMethods';
diff --git a/js/src/shell/DappMethods/dappMethods.css b/js/src/shell/Dapps/SelectMethods/selectMethods.css
similarity index 100%
rename from js/src/shell/DappMethods/dappMethods.css
rename to js/src/shell/Dapps/SelectMethods/selectMethods.css
diff --git a/js/src/shell/DappMethods/dappMethods.js b/js/src/shell/Dapps/SelectMethods/selectMethods.js
similarity index 96%
rename from js/src/shell/DappMethods/dappMethods.js
rename to js/src/shell/Dapps/SelectMethods/selectMethods.js
index 178dc850d..0eab312a7 100644
--- a/js/src/shell/DappMethods/dappMethods.js
+++ b/js/src/shell/Dapps/SelectMethods/selectMethods.js
@@ -21,10 +21,10 @@ import { FormattedMessage } from 'react-intl';
import { Portal } from '@parity/ui';
import MethodCheck from './MethodCheck';
-import styles from './dappMethods.css';
+import styles from './selectMethods.css';
@observer
-export default class DappsMethods extends Component {
+export default class SelectMethods extends Component {
static propTypes = {
methodsStore: PropTypes.object.isRequired,
visibleStore: PropTypes.object.isRequired
diff --git a/js/src/shell/DappMethods/store.js b/js/src/shell/Dapps/SelectMethods/store.js
similarity index 97%
rename from js/src/shell/DappMethods/store.js
rename to js/src/shell/Dapps/SelectMethods/store.js
index 7ab6e631d..1bee24b4f 100644
--- a/js/src/shell/DappMethods/store.js
+++ b/js/src/shell/Dapps/SelectMethods/store.js
@@ -19,7 +19,7 @@ import store from 'store';
import { sha3 } from '@parity/api/util/sha3';
-import filteredRequests from '../DappRequests/filteredRequests';
+import filteredRequests from '../../DappRequests/filteredRequests';
const LS_PERMISSIONS = '_parity::dapps::methods';
diff --git a/js/src/shell/DappAccounts/index.js b/js/src/shell/Dapps/SelectVisible/index.js
similarity index 94%
rename from js/src/shell/DappAccounts/index.js
rename to js/src/shell/Dapps/SelectVisible/index.js
index b678d402a..fd2e5f1ce 100644
--- a/js/src/shell/DappAccounts/index.js
+++ b/js/src/shell/Dapps/SelectVisible/index.js
@@ -14,4 +14,4 @@
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see .
-export default from './dappAccounts';
+export default from './selectVisible';
diff --git a/js/src/shell/DappsVisible/dappsVisible.css b/js/src/shell/Dapps/SelectVisible/selectVisible.css
similarity index 100%
rename from js/src/shell/DappsVisible/dappsVisible.css
rename to js/src/shell/Dapps/SelectVisible/selectVisible.css
diff --git a/js/src/shell/DappsVisible/dappsVisible.js b/js/src/shell/Dapps/SelectVisible/selectVisible.js
similarity index 97%
rename from js/src/shell/DappsVisible/dappsVisible.js
rename to js/src/shell/Dapps/SelectVisible/selectVisible.js
index e3e06ccfb..da8bba1c5 100644
--- a/js/src/shell/DappsVisible/dappsVisible.js
+++ b/js/src/shell/Dapps/SelectVisible/selectVisible.js
@@ -20,10 +20,10 @@ import { FormattedMessage } from 'react-intl';
import { DappCard, Portal, SelectionList } from '@parity/ui';
-import styles from './dappsVisible.css';
+import styles from './selectVisible.css';
@observer
-export default class DappsVisible extends Component {
+export default class SelectVisible extends Component {
static propTypes = {
store: PropTypes.object.isRequired
};
diff --git a/js/src/shell/DappsVisible/dappsVisible.spec.js b/js/src/shell/Dapps/SelectVisible/selectVisible.spec.js
similarity index 96%
rename from js/src/shell/DappsVisible/dappsVisible.spec.js
rename to js/src/shell/Dapps/SelectVisible/selectVisible.spec.js
index 27893434b..aad3fb595 100644
--- a/js/src/shell/DappsVisible/dappsVisible.spec.js
+++ b/js/src/shell/Dapps/SelectVisible/selectVisible.spec.js
@@ -25,7 +25,7 @@ function renderShallow (store = {}) {
);
}
-describe('shell/DappsVisible', () => {
+describe('shell/Dapps/SelectVisible', () => {
describe('rendering', () => {
it('renders defaults', () => {
expect(renderShallow()).to.be.ok;
diff --git a/js/src/shell/Dapps/dapps.js b/js/src/shell/Dapps/dapps.js
index ddf3af734..829461b10 100644
--- a/js/src/shell/Dapps/dapps.js
+++ b/js/src/shell/Dapps/dapps.js
@@ -23,11 +23,11 @@ import { connect } from 'react-redux';
import { Actionbar, Button, Checkbox, DappCard, Page, SectionList } from '@parity/ui';
import { LockedIcon, MethodsIcon, VisibleIcon } from '@parity/ui/Icons';
-import DappAccounts from '../DappAccounts';
-import PermissionStore from '../DappAccounts/store';
-import DappMethods from '../DappMethods';
-import MethodsStore from '../DappMethods/store';
-import DappsVisible from '../DappsVisible';
+import SelectAccounts from './SelectAccounts';
+import PermissionStore from './SelectAccounts/store';
+import DappSelectMethods from './SelectMethods';
+import MethodsStore from './SelectMethods/store';
+import SelectVisible from './SelectVisible';
import DappsStore from './dappsStore';
@@ -83,12 +83,12 @@ class Dapps extends Component {
return (