Skip to content

Commit

Permalink
Made login height 100% (#122)
Browse files Browse the repository at this point in the history
* Made login height 100%

* Removed fixed height

* Fixed requestBalance unexpected behavior

Co-authored-by: Tomas Rocchi <[email protected]>
  • Loading branch information
tomiir and Tomas Rocchi authored Jul 21, 2021
1 parent deb87c8 commit 49df33d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
5 changes: 3 additions & 2 deletions source/Background/Controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -159,12 +159,13 @@ backgroundController.exposeController(
'requestBalance',
async (opts, metadata, accountId) => secureController(opts.callback, async () => {
const { callback, message, sender } = opts;

storage.get('apps', async (state) => {
if (
state?.apps?.[metadata.url]?.status === CONNECTION_STATUS.accepted
) {
if (!keyring.isUnlocked) {
if (Number.isNaN(parseInt(accountId, 10))) {
callback(ERRORS.CLIENT_ERROR('Invalid account id'), null);
} else if (!keyring.isUnlocked) {
const url = qs.stringifyUrl({
url: 'notification.html',
query: {
Expand Down
2 changes: 1 addition & 1 deletion source/Popup/Views/Login/styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { makeStyles } from '@material-ui/core/styles';

export default makeStyles((theme) => ({
root: {
height: 552,
height: '100%',
display: 'flex',
flexDirection: 'column',
justifyContent: 'space-between',
Expand Down
1 change: 0 additions & 1 deletion source/ui/IncomingAction/styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ export default makeStyles((theme) => ({
justifyContent: 'space-between',
flexDirection: 'column',
alignItems: 'center',
height: 120,
marginBottom: `${theme.spacing(3)}px`,
},
title: {
Expand Down

0 comments on commit 49df33d

Please sign in to comment.