Skip to content

fix flow between claim and attest #2738

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
amaury1093 merged 1 commit into from
May 13, 2020
Merged

fix flow between claim and attest #2738

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions packages/page-claims/src/Attest.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ function Attest ({ accountId, className }: Props): React.ReactElement<Props> | n
const { t } = useTranslation();

return (
<Card>
<Card isSuccess>
<div className={className}>
{t('By signing this transaction, you agree with attestation available at the following address: XXX')}
{t('By signing this transaction, you agree with the attestation available at the following address: XXX')}
<h3>{addrToChecksum(accountId)}</h3>
<Button.Group>
<TxButton
Expand Down
18 changes: 9 additions & 9 deletions packages/page-claims/src/Claim.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@ interface Props {
className?: string;
ethereumAddress: EthereumAddress | null;
ethereumSignature: string | null;
// Do we sign with `claims.claimAttest` instead of `claims.claim`?
isClaimAttest: boolean;
// Do we sign with `claims.claimAttest` (new) instead of `claims.claim` (old)?
isOldClaimProcess: boolean;
}

// Depending on isClaimAttest, construct the correct tx.
function constructTx (accountId: string, ethereumSignature: string | null, isClaimAttest: boolean): {
// Depending on isOldClaimProcess, construct the correct tx.
function constructTx (accountId: string, ethereumSignature: string | null, isOldClaimProcess: boolean): {
params: any[];
tx: string;
} {
return isClaimAttest
return isOldClaimProcess
// FIXME How to get the StatementKind?
? { params: [accountId, ethereumSignature, 'Default'], tx: 'claims.claimAttest' }
: { params: [accountId, ethereumSignature], tx: 'claims.claimAttest' };
? { params: [accountId, ethereumSignature], tx: 'claims.claimAttest' }
: { params: [accountId, ethereumSignature, 'Default'], tx: 'claims.claimAttest' };
}

function Claim ({ accountId, className, ethereumAddress, ethereumSignature, isClaimAttest }: Props): React.ReactElement<Props> | null {
function Claim ({ accountId, className, ethereumAddress, ethereumSignature, isOldClaimProcess }: Props): React.ReactElement<Props> | null {
const { t } = useTranslation();
const { api } = useApi();
const [claimValue, setClaimValue] = useState<BalanceOf | null>(null);
Expand Down Expand Up @@ -87,7 +87,7 @@ function Claim ({ accountId, className, ethereumAddress, ethereumSignature, isCl
icon='send'
isPrimary
label={t('Claim')}
{...constructTx(accountId, ethereumSignature, isClaimAttest)}
{...constructTx(accountId, ethereumSignature, isOldClaimProcess)}
/>
</Button.Group>
</>
Expand Down
63 changes: 19 additions & 44 deletions packages/page-claims/src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// of the Apache-2.0 license. See the LICENSE file for details.

import { Option } from '@polkadot/types';
import { Balance, EcdsaSignature, EthereumAddress } from '@polkadot/types/interfaces';
import { EcdsaSignature, EthereumAddress } from '@polkadot/types/interfaces';
import { AppProps, I18nProps } from '@polkadot/react-components/types';
import { ApiProps } from '@polkadot/react-api/types';

Expand Down Expand Up @@ -69,7 +69,6 @@ const Signature = styled.textarea`

const ClaimsApp = (props: Props): React.ReactElement => {
const [isOldClaimProcess, setIsOldClaimProcess] = useState(true);
const [claim, setClaim] = useState<Balance | null>(null);
const [didCopy, setDidCopy] = useState(false);
const [ethereumAddress, setEthereumAddress] = useState<EthereumAddress | null>(null);
const [signature, setSignature] = useState<EcdsaSignature | null>(null);
Expand All @@ -80,7 +79,7 @@ const ClaimsApp = (props: Props): React.ReactElement => {
const [isPreclaimed, setIsPreclaimed] = useState(false);

useEffect(() => {
if (isApiReady && typeof api.query.claims.claimAttest !== undefined) {
if (isApiReady && typeof api.query.claims.claimAttest !== 'undefined') {
setIsOldClaimProcess(false);
}

Expand All @@ -95,29 +94,33 @@ const ClaimsApp = (props: Props): React.ReactElement => {
}
}, [didCopy]);

const goToStepSign = useCallback(() => {
setStep(Step.Sign);
}, []);

const goToStepClaim = useCallback(() => {
setStep(Step.Claim);
}, []);

useEffect(() => {
if (isApiReady && accountId) {
api.query.claims
.preclaims<Option<EthereumAddress>>(accountId)
.then((opt): void => {
setIsPreclaimed(opt.isSome);

if (opt.isSome) {
goToStepClaim();
} else {
goToStepSign();
}
});
}
}, [accountId, api.query.claims, isApiReady]);

const goToStepSign = useCallback(() => {
setStep(Step.Sign);
}, []);

const goToStepClaim = useCallback(() => {
setStep(Step.Claim);
}, []);
}, [accountId, api.query.claims, goToStepClaim, goToStepSign, isApiReady]);

const onChangeAccount = useCallback((newAccountId) => {
setAccountId(newAccountId);
// FIXME Amaury It should not be Step.Sign
goToStepSign();
}, [goToStepSign]);
}, []);

const onChangeSignature = useCallback((event: React.SyntheticEvent<Element>) => {
const { value: signatureJson } = event.target as HTMLInputElement;
Expand Down Expand Up @@ -219,41 +222,13 @@ const ClaimsApp = (props: Props): React.ReactElement => {
accountId={accountId}
ethereumAddress={ethereumAddress}
ethereumSignature={signature}
// Use claims.claimAttest is chain supports it
isClaimAttest={!!api.query.claims.claimAttest}
isOldClaimProcess={isOldClaimProcess}
/>
)}
</Column>
</Columar>
</main>
);

// FIXME Amaury Below are from the old component
// How to use TxModalNew?
// }

// protected isDisabled = (): boolean => {
// const { accountId, signature } = this.state;

// return !accountId || !signature;
// }

// protected isUnsigned = (): boolean => true;

// protected submitLabel = (): React.ReactNode => this.props.t('Redeem');

// protected txMethod = (): string => 'claims.claim';

// protected txParams = (): [string | null, EcdsaSignature | null] => {
// const { accountId, signature } = this.state;

// return [
// accountId ? accountId.toString() : null,
// signature || null
// ];
// }

// }
};

export default withMulti(
Expand Down