Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ import {
import {useConfigContext} from 'src/components/widget/hooks/useConfigContext';
import {useSubmitDonation} from 'src/components/widget/hooks/useSubmitDonation';
import {useWidgetContext} from 'src/components/widget/hooks/useWidgetContext';
import {OneTimeFrequencyMethods} from 'src/components/widget/types/PaymentMethod';
import {getSubmitButtonText} from 'src/helpers/getSubmitButtonText';

export const DefaultFlow = () => {
const {frequency: fixedFrequency, amount: fixedAmount} = useConfigContext();
const {
frequency,
donationAmount,
selectedPaymentMethod,
paymentRequestAvailable,
Expand All @@ -48,13 +46,7 @@ export const DefaultFlow = () => {
<PublicTestimony />
<ErrorMessage message={submitError} />
<SubmitButton
disabled={
(!frequency &&
!fixedFrequency &&
!OneTimeFrequencyMethods.includes(selectedPaymentMethod)) ||
!donationAmount ||
Number.isNaN(donationAmount)
}
disabled={!donationAmount || Number.isNaN(donationAmount)}
>
{getSubmitButtonText({
method: selectedPaymentMethod,
Expand Down
2 changes: 2 additions & 0 deletions packages/donate-button-v4/src/helpers/constructDonateUrl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,8 @@ export function constructDonateUrl({
amount,
...rest
}: DonateUrlParams) {
// If frequency is "" or undefined, default to one-time
frequency ||= DonationFrequency.OneTime;
const baseUrl = getBaseUrl(rest);
const params = getBaseParams(rest);

Expand Down