Skip to content

Revert "Remove contracts call functionality (not working) (#1999)" #2004

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 1 commit into from
Dec 5, 2019
Merged

Revert "Remove contracts call functionality (not working) (#1999)" #2004

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
20 changes: 9 additions & 11 deletions packages/app-contracts/src/Contracts/Contract.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import translate from '../translate';
interface Props extends I18nProps, RouteComponentProps {
basePath: string;
contract: ApiContract;
onCall?: (_?: number) => () => void;
onCall: (_?: number) => () => void;
}

const ContractCard = styled(Card)`
Expand Down Expand Up @@ -82,16 +82,14 @@ function Contract (props: Props): React.ReactElement<Props> | null {
size='small'
tooltip={t('Forget this contract')}
/>
{onCall && (
<Button
icon='play'
isPrimary
label={t('execute')}
onClick={onCall()}
size='small'
tooltip={t('Call a method on this contract')}
/>
)}
<Button
icon='play'
isPrimary
label={t('execute')}
onClick={onCall()}
size='small'
tooltip={t('Call a method on this contract')}
/>
</div>
}
isContract
Expand Down
93 changes: 48 additions & 45 deletions packages/app-contracts/src/Contracts/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 { ApiProps } from '@polkadot/react-api/types';
import { I18nProps } from '@polkadot/react-components/types';
import { I18nProps, StringOrNull } from '@polkadot/react-components/types';
import { ComponentProps } from '../types';

import React, { useState, useEffect } from 'react';
Expand All @@ -14,7 +14,7 @@ import { Button, CardGrid } from '@polkadot/react-components';
import translate from '../translate';
import Add from './Add';
import ContractCard from './Contract';
// import Call from './Call';
import Call from './Call';
import { getContractForAddress } from './util';

interface Props extends ComponentProps, I18nProps, ApiProps {}
Expand All @@ -27,47 +27,49 @@ function filterContracts ({ api, accounts, contracts: keyringContracts }: Props)

function Contracts (props: Props): React.ReactElement<Props> {
const { accounts, basePath, contracts: keyringContracts, hasCode, showDeploy, t } = props;
// const { callAddress, callMessage, isAddOpen, isCallOpen } = this.state;

const [contracts, setContracts] = useState<ApiContract[]>(filterContracts(props));
const [callContractIndex, setCallContractIndex] = useState<number>(0);
const [callMessageIndex, setCallMessageIndex] = useState<number>(0);
const [isAddOpen, setIsAddOpen] = useState(false);
// const [isCallOpen, setIsCallOpen] = useState(false);
// const [callContractIndex, setCallContractIndex] = useState<number>(0);
// const [callMessageIndex, setCallMessageIndex] = useState<number>(0);
const [isCallOpen, setIsCallOpen] = useState(false);

useEffect((): void => {
setContracts(filterContracts(props));
}, [accounts, keyringContracts]);

// let callContract = contracts[callContractIndex] || null;
let callContract = contracts[callContractIndex] || null;

// useEffect((): void => {
// callContract = contracts[callContractIndex];
// }, [callContractIndex]);
useEffect((): void => {
callContract = contracts[callContractIndex];
}, [callContractIndex]);

const _toggleAdd = (): void => setIsAddOpen(!isAddOpen);
// const _toggleCall = (): void => setIsCallOpen(!isCallOpen);

// const _onChangeCallContractAddress = (newCallContractAddress: StringOrNull): void => {
// const index = contracts.findIndex(({ address }: ApiContract): boolean => newCallContractAddress === address.toString());

// if (index > -1) {
// index !== callContractIndex && setCallMessageIndex(0);
// setCallContractIndex(index);
// }
// };

// const _onChangeCallMessageIndex = (callMessageIndex: number): void => {
// !!callContract && setCallMessageIndex(callMessageIndex);
// };

// const _onCall = (callContractIndex: number): (_?: number) => () => void => {
// return function (callMessageIndex?: number): () => void {
// return function (): void {
// setCallContractIndex(callContractIndex);
// setCallMessageIndex(callMessageIndex || 0);
// setIsCallOpen(true);
// };
// };
// };
const _toggleCall = (): void => setIsCallOpen(!isCallOpen);

const _onChangeCallContractAddress = (newCallContractAddress: StringOrNull): void => {
const index = contracts.findIndex(({ address }: ApiContract): boolean => newCallContractAddress === address.toString());

if (index > -1) {
index !== callContractIndex && setCallMessageIndex(0);
setCallContractIndex(index);
}
};

const _onChangeCallMessageIndex = (callMessageIndex: number): void => {
!!callContract && setCallMessageIndex(callMessageIndex);
};

const _onCall = (callContractIndex: number): (_?: number) => () => void => {
return function (callMessageIndex?: number): () => void {
return function (): void {
setCallContractIndex(callContractIndex);
setCallMessageIndex(callMessageIndex || 0);
setIsCallOpen(true);
};
};
};

return (
<>
Expand Down Expand Up @@ -95,30 +97,31 @@ function Contracts (props: Props): React.ReactElement<Props> {
</Button.Group>
}
>
{contracts.map((contract: ApiContract): React.ReactNode => {
return (
<ContractCard
basePath={basePath}
contract={contract}
key={contract.address.toString()}
// onCall={_onCall(index)}
/>
);
})}
{contracts
.map((contract: ApiContract, index): React.ReactNode => {
return (
<ContractCard
basePath={basePath}
contract={contract}
key={contract.address.toString()}
onCall={_onCall(index)}
/>
);
})}
</CardGrid>
<Add
basePath={basePath}
isOpen={isAddOpen}
onClose={_toggleAdd}
/>
{/* <Call
<Call
callContract={callContract}
callMessageIndex={callMessageIndex}
isOpen={isCallOpen}
onChangeCallContractAddress={_onChangeCallContractAddress}
onChangeCallMessageIndex={_onChangeCallMessageIndex}
onClose={_toggleCall}
/> */}
/>
</>
);
}
Expand Down