Skip to content

Commit f2b519e

Browse files
jwhardwickjhesgodidreamoftrees
authored
Sale widget fixes (#1236)
Co-authored-by: Jhonatan Gonzalez <jhesgodi@gmail.com> Co-authored-by: Charlie McKenzie <charlie@dreamoftrees.com>
1 parent 8d84581 commit f2b519e

3 files changed

Lines changed: 11 additions & 22 deletions

File tree

packages/checkout/widgets-lib/src/components/Transak/useTransakEvents.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
} from '../../context/analytics-provider/SegmentAnalyticsProvider';
1212

1313
const TRANSAK_ORIGIN = 'transak.com';
14-
const FAILED_TO_LOAD_TIMEOUT_IN_MS = 5000;
14+
const FAILED_TO_LOAD_TIMEOUT_IN_MS = 10000;
1515

1616
export type TransakEventHandlers = {
1717
onInit?: (data: Record<string, unknown>) => void;
@@ -78,18 +78,19 @@ export const useTransakEvents = (props: UseTransakEventsProps) => {
7878
const [initialised, setInitialsed] = useState<boolean>(false);
7979
const failedToLoadTimeout = failedToLoadTimeoutInMs || FAILED_TO_LOAD_TIMEOUT_IN_MS;
8080

81-
const timeout = useRef<NodeJS.Timeout | number>(0);
81+
const timeout = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);
8282

8383
const onInit = (data: Record<string, unknown>) => {
8484
setInitialsed(true);
8585
clearTimeout(timeout.current);
86+
timeout.current = undefined;
8687
props.onInit?.(data);
8788
};
8889

8990
const onLoad = () => {
9091
if (onFailedToLoad === undefined) return;
9192

92-
if (!initialised) {
93+
if (timeout.current === undefined && !initialised) {
9394
timeout.current = setTimeout(() => {
9495
if (!initialised) onFailedToLoad();
9596
}, failedToLoadTimeout);

packages/checkout/widgets-lib/src/widgets/sale/components/FundingRouteSelect/FundingRouteSelect.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import { PurchaseMenuItem } from '../PurchaseMenuItem/PurchaseMenuItem';
1919
import { text } from '../../../../resources/text/textConfig';
2020
import { sendSaleWidgetCloseEvent } from '../../SaleWidgetEvents';
2121
import { EventTargetContext } from '../../../../context/event-target-context/EventTargetContext';
22+
import { useSaleContext } from '../../context/SaleContextProvider';
2223

2324
type FundingRouteSelectProps = {
2425
fundingRoutes: FundingRoute[];
@@ -31,6 +32,7 @@ export function FundingRouteSelect({ fundingRoutes, onFundingRouteSelected }: Fu
3132
const [activeFundingRouteIndex, setActiveFundingRouteIndex] = useState(0);
3233
const { viewDispatch } = useContext(ViewContext);
3334
const { eventTargetState: { eventTarget } } = useContext(EventTargetContext);
35+
const { goBackToPaymentMethods } = useSaleContext();
3436

3537
const onClickContinue = () => {
3638
onFundingRouteSelected(fundingRoutes[activeFundingRouteIndex]);
@@ -98,7 +100,7 @@ export function FundingRouteSelect({ fundingRoutes, onFundingRouteSelected }: Fu
98100
<Button key="continueButton" sx={{ mt: 'auto' }} variant="primary" onClick={onClickContinue}>
99101
{textConfig.fundingRouteSelect.continue}
100102
</Button>,
101-
<Button key="payWithCardButton" variant="tertiary">
103+
<Button key="payWithCardButton" variant="tertiary" onClick={() => goBackToPaymentMethods()}>
102104
{textConfig.fundingRouteSelect.payWithCardInstead}
103105
</Button>,
104106
] }

packages/checkout/widgets-sample-app/src/components/ui/sale/sale.tsx

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,11 @@ const defaultPassportConfig = {
1717

1818
const defaultItems: SaleItem[] = [
1919
{
20-
productId: 'P0001',
20+
productId: '645',
2121
qty: 3,
22-
name: 'Bulbasaur',
23-
image: 'https://pokemon-nfts.s3.ap-southeast-2.amazonaws.com/images/1.png',
24-
description: 'Bulbasaur',
25-
},
26-
{
27-
productId: 'P0002',
28-
qty: 2,
29-
name: 'Ivyasaur',
30-
image: 'https://pokemon-nfts.s3.ap-southeast-2.amazonaws.com/images/2.png',
31-
description: 'Ivyasaur',
32-
},
33-
{
34-
productId: 'P0003',
35-
qty: 1,
36-
name: 'Venusaur',
37-
image: 'https://pokemon-nfts.s3.ap-southeast-2.amazonaws.com/images/3.png',
38-
description: 'Venusaur',
22+
name: 'Landorus',
23+
image: 'https://pokemon-nfts.mystagingwebsite.com/wp-content/uploads/2023/11/645-300x300.png',
24+
description: 'Landorus',
3925
},
4026
];
4127

0 commit comments

Comments
 (0)