Skip to content

Commit

Permalink
Merge pull request #4417 from Giveth/release-add-new-fields-to-donation
Browse files Browse the repository at this point in the history
release add new fields to donation
  • Loading branch information
mohammadranjbarz authored Jul 17, 2024
2 parents c2d37de + 3e1f549 commit be57d6a
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 0 deletions.
8 changes: 8 additions & 0 deletions src/apollo/gql/gqlDonations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ export const CREATE_DONATION = gql`
$referrerId: String
$safeTransactionId: String
$draftDonationId: Float
$useDonationBox: Boolean
$relevantDonationTxHash: String
) {
createDonation(
transactionId: $transactionId
Expand All @@ -139,6 +141,8 @@ export const CREATE_DONATION = gql`
referrerId: $referrerId
safeTransactionId: $safeTransactionId
draftDonationId: $draftDonationId
useDonationBox: $useDonationBox
relevantDonationTxHash: $relevantDonationTxHash
)
}
`;
Expand Down Expand Up @@ -182,6 +186,8 @@ export const CREATE_DRAFT_DONATION = gql`
$anonymous: Boolean
$referrerId: String
$safeTransactionId: String
$useDonationBox: Boolean
$relevantDonationTxHash: String
) {
createDraftDonation(
networkId: $networkId
Expand All @@ -193,6 +199,8 @@ export const CREATE_DRAFT_DONATION = gql`
anonymous: $anonymous
referrerId: $referrerId
safeTransactionId: $safeTransactionId
useDonationBox: $useDonationBox
relevantDonationTxHash: $relevantDonationTxHash
)
}
`;
3 changes: 3 additions & 0 deletions src/components/views/donate/DonateModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ const DonateModal: FC<IDonateModalProps> = props => {
chainvineReferred,
setFailedModalType,
symbol: token.symbol,
useDonationBox: isDonatingToGiveth,
})
.then(({ isSaved, txHash: firstHash }) => {
if (!firstHash) {
Expand All @@ -224,6 +225,8 @@ const DonateModal: FC<IDonateModalProps> = props => {
projectId: config.GIVETH_PROJECT_ID,
setFailedModalType,
symbol: token.symbol,
useDonationBox: true,
relevantDonationTxHash: firstHash,
})
.then(({ txHash: secondHash }) => {
if (!secondHash) {
Expand Down
2 changes: 2 additions & 0 deletions src/components/views/donate/helpers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ export interface ICreateDonation {
symbol: string;
draftDonationId?: number;
setFailedModalType: (type: EDonationFailedType) => void;
useDonationBox: boolean;
relevantDonationTxHash?: string;
}

export const calcDonationShare = (
Expand Down
10 changes: 10 additions & 0 deletions src/hooks/useCreateEvmDonation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ export const useCreateEvmDonation = () => {
token,
draftDonationId,
setFailedModalType,
useDonationBox,
relevantDonationTxHash,
} = props;

if (isSafeEnv) {
Expand All @@ -94,6 +96,8 @@ export const useCreateEvmDonation = () => {
setFailedModalType,
safeTransactionId: txHash,
draftDonationId,
useDonationBox,
relevantDonationTxHash,
};
} else {
return null;
Expand All @@ -115,6 +119,8 @@ export const useCreateEvmDonation = () => {
setFailedModalType,
safeTransactionId: null,
draftDonationId,
useDonationBox,
relevantDonationTxHash,
};
} else {
return null;
Expand Down Expand Up @@ -142,6 +148,8 @@ export const useCreateEvmDonation = () => {
walletAddress: transaction?.from,
symbol: token.symbol,
error: e.message,
useDonationBox,
relevantDonationTxHash,
});
setFailedModalType(EDonationFailedType.NOT_SAVED);
}
Expand Down Expand Up @@ -199,6 +207,8 @@ export const useCreateEvmDonation = () => {
tokenAddress: token.address,
anonymous: props.anonymous,
referrerId: props.chainvineReferred,
usingDonationBox: props.useDonationBox,
relevantDonationTxHash: props.relevantDonationTxHash,
// safeTransactionId: safeTransactionId, // Not supported yet
},
});
Expand Down
6 changes: 6 additions & 0 deletions src/hooks/useCreateSolanaDonation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ export const useCreateSolanaDonation = () => {
amount,
token,
setFailedModalType,
useDonationBox,
relevantDonationTxHash,
} = props;

let donationData: IOnTxHash;
Expand All @@ -77,6 +79,8 @@ export const useCreateSolanaDonation = () => {
symbol: token.symbol,
setFailedModalType,
safeTransactionId: null,
useDonationBox,
relevantDonationTxHash,
};
} else return;

Expand All @@ -101,6 +105,8 @@ export const useCreateSolanaDonation = () => {
walletAddress: transaction?.from,
symbol: token.symbol,
error: e.message,
useDonationBox,
relevantDonationTxHash,
});
setFailedModalType(EDonationFailedType.NOT_SAVED);
}
Expand Down
4 changes: 4 additions & 0 deletions src/services/donation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ const createDonation = async (props: IOnTxHash) => {
chainvineReferred,
safeTransactionId,
draftDonationId,
useDonationBox,
relevantDonationTxHash,
} = props;
const { address, symbol } = token;
let donationId = 0;
Expand All @@ -91,6 +93,8 @@ const createDonation = async (props: IOnTxHash) => {
referrerId: chainvineReferred,
safeTransactionId,
draftDonationId,
useDonationBox,
relevantDonationTxHash,
},
});
donationId = data.createDonation;
Expand Down

0 comments on commit be57d6a

Please sign in to comment.