Skip to content

Expose signed transactions #2203

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
jacogr merged 17 commits into from
Jan 31, 2020
Merged

Expose signed transactions #2203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b571d09
sign offline WIP
ma12ki Jan 24, 2020
f6424ff
signing transactions from extrinsics screen
ma12ki Jan 27, 2020
973164c
signing tx from accounts screen
ma12ki Jan 27, 2020
9b3c10c
added translations
ma12ki Jan 27, 2020
798c195
removed unnecessary value
ma12ki Jan 27, 2020
340eaca
removed console logs
ma12ki Jan 27, 2020
0df6060
resolved merge conflicts
ma12ki Jan 27, 2020
efe83ed
removed unused import
ma12ki Jan 27, 2020
75cb793
used new signAsync method
ma12ki Jan 28, 2020
86e12a0
Merge branch 'master' into feature/sign-offline
ma12ki Jan 28, 2020
a78b44f
fixed types
ma12ki Jan 28, 2020
2cb7af6
removed unused imports
ma12ki Jan 28, 2020
6a0f5e3
added missing translations
ma12ki Jan 28, 2020
7069178
code review changes
ma12ki Jan 30, 2020
6deda43
fixed signing with local account
ma12ki Jan 30, 2020
2009a1a
added sign toggle
ma12ki Jan 30, 2020
5de293d
improvements for QR
ma12ki Jan 30, 2020
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
5 changes: 3 additions & 2 deletions packages/react-components/src/ButtonCancel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@ import { useTranslation } from './translate';
interface Props {
className?: string;
isDisabled?: boolean;
label?: string;
onClick: () => void;
tabIndex?: number;
}

export default function ButtonCancel ({ className, isDisabled, onClick, tabIndex }: Props): React.ReactElement<Props> {
export default function ButtonCancel ({ className, isDisabled, label, onClick, tabIndex }: Props): React.ReactElement<Props> {
const { t } = useTranslation();

return (
Expand All @@ -23,7 +24,7 @@ export default function ButtonCancel ({ className, isDisabled, onClick, tabIndex
icon='cancel'
isDisabled={isDisabled}
isNegative
label={t('Cancel')}
label={label || t('Cancel')}
onClick={onClick}
tabIndex={tabIndex}
/>
Expand Down
8 changes: 5 additions & 3 deletions packages/react-components/src/Modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ interface ModalProps extends BareProps {
}

interface ActionsProps extends BareProps {
cancelLabel?: string;
children: React.ReactNode;
withOr?: boolean;
onCancel: () => void;
}

Expand All @@ -42,12 +44,12 @@ function Modal (props: ModalProps): React.ReactElement<ModalProps> {
);
}

function Actions ({ className, children, onCancel }: ActionsProps): React.ReactElement<ActionsProps> {
function Actions ({ cancelLabel, className, children, withOr = true, onCancel }: ActionsProps): React.ReactElement<ActionsProps> {
return (
<SUIModal.Actions>
<Button.Group className={className}>
<ButtonCancel onClick={onCancel} />
<Button.Or />
<ButtonCancel label={cancelLabel} onClick={onCancel} />
{withOr && <Button.Or />}
{children}
</Button.Group>
</SUIModal.Actions>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-components/src/TxButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class TxButtonInner extends React.PureComponent<InnerProps> {
}

protected send = (): void => {
const { accountId, api, extrinsic: propsExtrinsic, isUnsigned, onClick, onFailed, onStart, onSuccess, onUpdate, params = [], queueExtrinsic, tx = '', withSpinner = false } = this.props;
const { accountId, api, extrinsic: propsExtrinsic, isUnsigned, onClick, onFailed, onStart, onSuccess, onUpdate, params = [], queueExtrinsic, tx = '', withSpinner = true } = this.props;
let extrinsic: any;

if (propsExtrinsic) {
Expand Down
Loading