Skip to content

Update generic sign screen #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vanruch merged 1 commit into from
Dec 12, 2019
Merged

Update generic sign screen #47

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions packages/extension-ui/src/Popup/Signing/Request.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { SignerPayloadJSON, SignerPayloadRaw } from '@polkadot/types/types';
import React, { useContext, useState, useEffect } from 'react';
import { TypeRegistry, createType } from '@polkadot/types';

import { ActionBar, ActionContext, Address, ButtonArea, Link } from '../../components';
import { ActionBar, ActionContext, Address, ButtonArea, Link, VerticalSpace } from '../../components';
import { approveSignPassword, approveSignSignature, cancelSignRequest } from '../../messaging';
import Bytes from './Bytes';
import Extrinsic from './Extrinsic';
Expand Down Expand Up @@ -91,14 +91,17 @@ export default function Request ({ account: { isExternal }, request, signId, url
} else if (hexBytes !== null) {
const payload = request.inner as SignerPayloadRaw;
return (
<Address address={payload.address}>
<>
<Address address={payload.address} />
<Bytes bytes={payload.data} url={url} />
{isFirst && !isExternal && <Unlock onSign={_onSign} />}
<ActionBar>
<div />
<Link isDanger onClick={_onCancel}>Reject</Link>
</ActionBar>
</Address>
<VerticalSpace />
<SignArea>
{!isExternal && <Unlock onSign={_onSign} />}
<CancelButton>
<Link isDanger onClick={_onCancel}>Reject</Link>
</CancelButton>
</SignArea>
</>
);
} else {
return null;
Expand All @@ -107,7 +110,7 @@ export default function Request ({ account: { isExternal }, request, signId, url

const SignArea = styled(ButtonArea)`
flex-direction: column;
padding: 6px 1rem;
padding: 6px 24px;
`;

const CancelButton = styled(ActionBar)`
Expand Down