Skip to content
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

chore: add reserve amount in transfer modal #166

Merged
merged 1 commit into from
Apr 20, 2022
Merged

chore: add reserve amount in transfer modal #166

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
5 changes: 4 additions & 1 deletion src/components/Args.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,10 @@ export function Args({ args, className }: ArgsProps) {
}

if (isBalanceType(type || name) || isCrabValue(name)) {
return formatBalance(value, +chain.tokens[0].decimal, { noDecimal: false, withThousandSplit: true }); // FIXME: decimal issue;
return formatBalance(value, +chain.tokens[0].decimal, {
noDecimal: false,
withThousandSplit: true,
}); // FIXME: decimal issue;
}

if (isDownloadType(value)) {
Expand Down
100 changes: 72 additions & 28 deletions src/components/modals/Transfer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import { keyring } from '@polkadot/ui-keyring';
import { KeyringSectionOption } from '@polkadot/ui-keyring/options/types';
import type { BN } from '@polkadot/util';
import { BN_HUNDRED, BN_ZERO, isFunction } from '@polkadot/util';
import { Typography } from 'antd';
import { flatten } from 'lodash';
import React, { useCallback, useEffect, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
Expand All @@ -33,6 +34,8 @@ import { AddressPair } from 'src/model';
import { extractExternal } from 'src/utils';
import styled from 'styled-components';

const { Text } = Typography;

interface Props {
className?: string;
onClose: () => void;
Expand Down Expand Up @@ -87,6 +90,7 @@ function Transfer({
const [multisigExtrinsic, setMultisigExtrinsic] = useState<SubmittableExtrinsic<'promise'> | null>(null);
const [accountId, setAccountId] = useState<string | null>(null);
const isExtensionAccount = useIsInjected();
const [reserveAmount, setReserveAmount] = useState(0);

const options = useMemo<KeyringSectionOption[]>(
() =>
Expand All @@ -102,6 +106,14 @@ function Transfer({
all: [],
});

const [depositBase, depositFactor] = useMemo(() => {
return [Number(api?.consts.multisig.depositBase.toJSON()), Number(api?.consts.multisig.depositFactor.toJSON())];
}, [api]);

const [chainDecimal, chainToken] = useMemo(() => {
return [api?.registry.chainDecimals[0], api?.registry.chainTokens[0]];
}, [api]);

const createMultiItem = useCallback(
(option: Option): Option[] => {
if (option.value === multisigAccount?.address) {
Expand Down Expand Up @@ -229,11 +241,36 @@ function Transfer({
const multiTx = module?.asMulti(...args);

// eslint-disable-next-line no-console
console.log('hexCallData', ext.method.toHex());
// console.log('hexCallData', ext.method.toHex());

setMultisigExtrinsic(multiTx);

// Estimate reserve amount
try {
if (chainDecimal) {
setReserveAmount(
// eslint-disable-next-line no-magic-numbers
(depositBase * 2 + depositFactor * threshold + (depositFactor * (ext.method.toHex().length + 31)) / 32) /
Math.pow(10, chainDecimal)
);
}
} catch (err) {
setReserveAmount(0);
}
})();
}, [canToggleAll, isAll, api, isProtected, amount, recipientId, propSenderId, accountId]);
}, [
canToggleAll,
isAll,
api,
isProtected,
amount,
recipientId,
propSenderId,
accountId,
chainDecimal,
depositBase,
depositFactor,
]);

return (
<Modal className="app--accounts-Modal" header={t<string>('Send funds')} onClose={onClose} size="large">
Expand Down Expand Up @@ -361,32 +398,39 @@ function Transfer({
</Modal.Columns>
</div>
</Modal.Content>
<Modal.Actions onCancel={onClose}>
<TxButton
// accountId={propSenderId || senderId}
accountId={accountId}
icon="paper-plane"
isDisabled={!hasAvailable || !(propRecipientId || recipientId) || !amount || !!recipientPhish}
label={t<string>('Make Transfer')}
onStart={onClose}
extrinsic={multisigExtrinsic}
onSuccess={onTxSuccess}
// params={
// canToggleAll && isAll
// ? isFunction(api.tx.balances?.transferAll)
// ? [propRecipientId || recipientId, false]
// : [propRecipientId || recipientId, maxTransfer]
// : [propRecipientId || recipientId, amount]
// }
// tx={
// canToggleAll && isAll && isFunction(api.tx.balances?.transferAll)
// ? api.tx.balances?.transferAll
// : isProtected
// ? api.tx.balances?.transferKeepAlive
// : api.tx.balances?.transfer
// }
/>
</Modal.Actions>

<div className="flex items-center justify-between px-5">
<Text style={{ color: 'rgba(78,78,78,0.6)', marginLeft: '20px' }}>
{t('multisig.estimate_reserve')} {reserveAmount} {chainToken}
</Text>

<Modal.Actions onCancel={onClose}>
<TxButton
// accountId={propSenderId || senderId}
accountId={accountId}
icon="paper-plane"
isDisabled={!hasAvailable || !(propRecipientId || recipientId) || !amount || !!recipientPhish}
label={t<string>('Make Transfer')}
onStart={onClose}
extrinsic={multisigExtrinsic}
onSuccess={onTxSuccess}
// params={
// canToggleAll && isAll
// ? isFunction(api.tx.balances?.transferAll)
// ? [propRecipientId || recipientId, false]
// : [propRecipientId || recipientId, maxTransfer]
// : [propRecipientId || recipientId, amount]
// }
// tx={
// canToggleAll && isAll && isFunction(api.tx.balances?.transferAll)
// ? api.tx.balances?.transferAll
// : isProtected
// ? api.tx.balances?.transferKeepAlive
// : api.tx.balances?.transfer
// }
/>
</Modal.Actions>
</div>
</Modal>
);
}
Expand Down
2 changes: 1 addition & 1 deletion src/utils/helper/balance.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export function prettyNumber(

prefix = prefix.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,');

return !noDecimal ? `${prefix}.${suffix}` : prefix;
return !noDecimal && Number(suffix) > 0 ? `${prefix}.${suffix}` : prefix;
}

const completeDecimal = (value: string, bits: number): string => {
Expand Down