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

Jump to bottom

Add approve to asset transfer permissions #325

Merged
merged 6 commits into from Dec 2, 2022
Merged

Add approve to asset transfer permissions #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ea3ee63
include approval action in asset transfer permissions
MiltonTulli Sep 19, 2022
25ebace
change edit mode
MiltonTulli Sep 19, 2022
d0bc569
refactor actionsmodal to acept decodedactions array as submit value
MiltonTulli Sep 19, 2022
f3e1706
Merge branch 'develop' into feature/approve-asset-transfer
MiltonTulli Nov 9, 2022
bb0fb70
use baseCall to spread
MiltonTulli Nov 9, 2022
a6a3c24
Merge branch 'develop' into feature/approve-asset-transfer
MiltonTulli Nov 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/components/ActionsBuilder/Action/Action.tsx
View file
Open in desktop
Expand Up @@ -179,7 +179,9 @@ export const ActionRow: React.FC<ActionViewProps> = ({
isOpen={isEditActionModalOpen}
setIsOpen={setIsEditActionModalOpen}
action={decodedAction}
onAddAction={onEdit}
onAddActions={null}
onEditAction={onEdit}
isEditing={true}
/>
)}
</CardWrapperWithMargin>
Expand Down
18 changes: 10 additions & 8 deletions src/components/ActionsBuilder/Option/Option.tsx
View file
Open in desktop
Expand Up @@ -43,16 +43,16 @@ export const OptionRow: React.FC<OptionRowProps> = ({
} = useSortable({ id: option.id });
const [isActionsModalOpen, setIsActionsModalOpen] = useState(false);

function addAction(action: DecodedAction) {
function addActions(actions: DecodedAction[]) {
onChange({
...option,
decodedActions: [...option.decodedActions, action],
decodedActions: [...option.decodedActions, ...actions],
});
}

function updateAction(index: number, action: DecodedAction) {
const updatedActions = option?.decodedActions.map((a, i) =>
index === i ? action : a
function updateAction(action: DecodedAction) {
const updatedActions = option?.decodedActions.map(a =>
a.id === action.id ? action : a
);
onChange({ ...option, decodedActions: updatedActions });
}
Expand Down Expand Up @@ -118,7 +118,7 @@ export const OptionRow: React.FC<OptionRowProps> = ({
key={index}
isEditable={true}
decodedAction={action}
onEdit={updatedAction => updateAction(index, updatedAction)}
onEdit={updateAction}
onRemove={targetAction => removeAction(targetAction)}
/>
);
Expand All @@ -137,10 +137,12 @@ export const OptionRow: React.FC<OptionRowProps> = ({
<ActionModal
isOpen={isActionsModalOpen}
setIsOpen={setIsActionsModalOpen}
onAddAction={action => {
addAction(action);
onAddActions={action => {
addActions(action);
setIsActionsModalOpen(false);
}}
onEditAction={updateAction}
isEditing={false}
/>
</OptionWrapper>
);
Expand Down
40 changes: 22 additions & 18 deletions src/components/ActionsBuilder/SupportedActions/ERC20Transfer/ERC20TransferEditor.tsx
View file
Open in desktop
Expand Up @@ -91,26 +91,30 @@ const ERC20TransferEditor: React.FC<ActionEditorProps> = ({
if (values.token.type === TokenType.ERC20) {
const ERC20Contract = new utils.Interface(ERC20.abi);

onSubmit({
...decodedCall,
callType: SupportedAction.ERC20_TRANSFER,
to: values.token.address,
value: BigNumber.from(0),
function: ERC20Contract.getFunction('transfer'),
args: {
_value: values.amount,
_to: values.recipientAddress,
onSubmit([
{
...decodedCall,
callType: SupportedAction.ERC20_TRANSFER,
to: values.token.address,
value: BigNumber.from(0),
function: ERC20Contract.getFunction('transfer'),
args: {
_value: values.amount,
_to: values.recipientAddress,
},
},
});
]);
} else {
onSubmit({
...decodedCall,
callType: SupportedAction.NATIVE_TRANSFER,
to: values.recipientAddress,
value: values.amount,
function: null,
args: null,
});
onSubmit([
{
...decodedCall,
callType: SupportedAction.NATIVE_TRANSFER,
to: values.recipientAddress,
value: values.amount,
function: null,
args: null,
},
]);
}
};

Expand Down
16 changes: 9 additions & 7 deletions src/components/ActionsBuilder/SupportedActions/RepMint/RepMintEditor.tsx
View file
Open in desktop
Expand Up @@ -68,14 +68,16 @@ export const Mint: React.FC<ActionEditorProps> = ({
};

const submitAction = (values: RepMintFormValues) => {
onSubmit({
...decodedCall,
args: {
...decodedCall.args,
to: values.recipient,
amount: ethers.utils.parseUnits(repAmount.toString()),
onSubmit([
{
...decodedCall,
args: {
...decodedCall.args,
to: values.recipient,
amount: ethers.utils.parseUnits(repAmount.toString()),
},
},
});
]);
};

return (
Expand Down
2 changes: 1 addition & 1 deletion src/components/ActionsBuilder/SupportedActions/SetGuildConfig/SetGuildConfigEditor.tsx
View file
Open in desktop
Expand Up @@ -197,7 +197,7 @@ const SetGuildConfigEditor: FC<ActionEditorProps> = ({
});

if (Object.keys(updatedValues).length > 0) {
return onSubmit(call);
return onSubmit([call]);
}
return setNoValueUpdatedError(true);
};
Expand Down
70 changes: 60 additions & 10 deletions src/components/ActionsBuilder/SupportedActions/SetPermissions/SetPermissionsEditor.tsx
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@ import { ParsedDataInterface, TABS } from './types';
import {
ANY_FUNC_SIGNATURE,
ERC20_TRANSFER_SIGNATURE,
ERC20_APPROVE_SIGNATURE,
preventEmptyString,
} from 'utils';
import { resolveUri } from 'utils/url';
Expand Down Expand Up @@ -49,6 +50,7 @@ interface FormValues {
const Permissions: React.FC<ActionEditorProps> = ({
decodedCall,
onSubmit,
isEdit,
}) => {
const parsedData = useMemo<ParsedDataInterface>(() => {
if (!decodedCall) return null;
Expand Down Expand Up @@ -115,28 +117,76 @@ const Permissions: React.FC<ActionEditorProps> = ({
updateFunctionSignature(value);
};

const submitAction = (values: FormValues) => {
const isAssetTransferCall = activeTab === TABS.ASSET_TRANSFER;
const submitAssetTransfer = (values: FormValues) => {
const baseCall = {
...decodedCall,
args: {
...decodedCall.args,
to: values.tokenAddress,
valueAllowed: BigNumber.from(0),
// "from" field set by default previously as guild id
},
optionalProps: {
asset: values.tokenAddress,
tab: TABS.ASSET_TRANSFER,
},
};
const newAssetTransferCall: DecodedCall = {
...baseCall,
args: {
...baseCall.args,
functionSignature: ERC20_TRANSFER_SIGNATURE,
},
optionalProps: {
...baseCall.optionalProps,
functionName: '',
},
};

const newApprovalAssetCall = {
...baseCall,
args: {
...baseCall.args,
functionSignature: ERC20_APPROVE_SIGNATURE,
},
optionalProps: {
...baseCall.optionalProps,
functionName: 'approve(address,uint256)',
},
};

if (isEdit) {
// in case of edit mode we submit only one action that is being edited
return parsedData?.functionSignature === ERC20_APPROVE_SIGNATURE
? onSubmit([newApprovalAssetCall])
: onSubmit([newAssetTransferCall]);
}
return onSubmit([newAssetTransferCall, newApprovalAssetCall]);
};

const submitFunctionCall = (values: FormValues) => {
const newCall: DecodedCall = {
...decodedCall,
args: {
...decodedCall.args,
to: isAssetTransferCall ? values.tokenAddress : values.toAddress,
to: values.toAddress,
// native value allowed
valueAllowed: isAssetTransferCall ? BigNumber.from(0) : values.amount,
functionSignature: isAssetTransferCall
? ERC20_TRANSFER_SIGNATURE
: values.functionSignature,
valueAllowed: values.amount,
functionSignature: values.functionSignature,
// "from" field set by default previously as guild id
},
optionalProps: {
functionName: isAssetTransferCall ? '' : values.functionName,
asset: isAssetTransferCall ? values.tokenAddress : '',
functionName: values.functionName,
asset: '',
tab: activeTab,
},
};
onSubmit(newCall);
onSubmit([newCall]);
};

const submitAction = (values: FormValues) => {
const isAssetTransferCall = activeTab === TABS.ASSET_TRANSFER;
(isAssetTransferCall ? submitAssetTransfer : submitFunctionCall)(values);
};

const tabArray = [
Expand Down
16 changes: 14 additions & 2 deletions src/components/ActionsBuilder/SupportedActions/SetPermissions/SetPermissionsInfoLine.tsx
View file
Open in desktop
Expand Up @@ -9,7 +9,11 @@ import { Flex } from 'components/primitives/Layout';
import { useNetwork } from 'wagmi';
import { useTokenList } from 'hooks/Guilds/tokens/useTokenList';
import { resolveUri } from 'utils/url';
import { shortenAddress } from 'utils';
import {
shortenAddress,
ERC20_TRANSFER_SIGNATURE,
ERC20_APPROVE_SIGNATURE,
} from 'utils';

const SetPermissionsInfoLine: React.FC<ActionViewProps> = ({
decodedCall,
Expand Down Expand Up @@ -48,7 +52,15 @@ const SetPermissionsInfoLine: React.FC<ActionViewProps> = ({
<Segment>
<BiCheckShield size={16} />
</Segment>
<Segment>{t('setPermissionsFor')}</Segment>
<Segment>
{t(
parsedData?.functionSignature === ERC20_APPROVE_SIGNATURE
? 'setApprovalPermissionsFor'
: parsedData?.functionSignature === ERC20_TRANSFER_SIGNATURE
? 'setTransferPermissionsFor'
: 'setPermissionsFor'
)}
</Segment>
<Segment>
{currentToken && currentToken.address ? (
<>
Expand Down
28 changes: 15 additions & 13 deletions src/components/ActionsBuilder/SupportedActions/UpdateENSContent/UpdateENSContentEditor.tsx
View file
Open in desktop
Expand Up @@ -56,20 +56,22 @@ const UpdateENSContentEditor: React.FC<ActionEditorProps> = ({
const { nameHash } = convertToNameHash(fullEnsName);
const { contentHash } = convertToContentHash(values.ipfsHash);

onSubmit({
...decodedCall,
to: resolver?.address,
args: {
...decodedCall.args,
node: nameHash,
hash: contentHash,
onSubmit([
{
...decodedCall,
to: resolver?.address,
args: {
...decodedCall.args,
node: nameHash,
hash: contentHash,
},
optionalProps: {
...decodedCall.optionalProps,
ensName: values.ensName,
ipfsHash: values.ipfsHash,
},
},
optionalProps: {
...decodedCall.optionalProps,
ensName: values.ensName,
ipfsHash: values.ipfsHash,
},
});
]);
};

if (chain.id === LOCALHOST_ID)
Expand Down
3 changes: 2 additions & 1 deletion src/components/ActionsBuilder/SupportedActions/index.tsx
View file
Open in desktop
Expand Up @@ -35,7 +35,8 @@ export interface ActionViewProps {

export interface ActionEditorProps extends ActionViewProps {
updateCall?: (updatedCall: DecodedCall) => void;
onSubmit: (decodedCall: DecodedCall) => void;
onSubmit: (decodedCall: DecodedCall[]) => void;
isEdit?: boolean;
}

type SupportedActionViews = {
Expand Down
2 changes: 1 addition & 1 deletion src/components/ActionsModal/ActionsModal.test.tsx
View file
Open in desktop
Expand Up @@ -45,7 +45,7 @@ describe('ActionsModal', () => {
props = {
isOpen: false,
setIsOpen: jest.fn(),
onAddAction: jest.fn(), // (action: DecodedAction) => void;
onAddActions: jest.fn(), // (actions: DecodedAction[]) => void;
};
});

Expand Down