Skip to content

Update payment-choice.tsx #71

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

Open
Jatkingmodern wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update payment-choice.tsx #71

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
78 changes: 55 additions & 23 deletions app/routes/payment-choice.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ import { useDialPadContext } from '~/lib/context/dialpad'
import { useEffect } from 'react'
import type { WalletAddress } from '@interledger/open-payments'

type LoaderData = {
receiver: string
assetCode?: string | null
}

export async function loader({ request }: LoaderFunctionArgs) {
const searchParams = new URL(request.url).searchParams
const receiver = searchParams.get('receiver') || ''
Expand All @@ -21,30 +26,39 @@ export async function loader({ request }: LoaderFunctionArgs) {
try {
receiverWalletAddress = await getValidWalletAddress(receiver)
} catch (error) {
throw new Error(
'Receiver Wallet Address is not valid. Please check and try again.'
)
// Prefer redirecting to home instead of throwing a 500.
// You can customize this behavior (flash message, query param, etc.)
return redirect('/', {
headers: { 'Set-Cookie': await destroySession(session) }
})
}
} else {
return redirect('/', {
headers: { 'Set-Cookie': await destroySession(session) }
})
}

return json({
receiver: receiver,
assetCode: receiverWalletAddress.assetCode
} as const)
return json<LoaderData>({
receiver,
assetCode: receiverWalletAddress.assetCode ?? null
})
}

export default function PaymentChoice() {
const data = useLoaderData<typeof loader>()
const data = useLoaderData<typeof loader>() as LoaderData

const { setAssetCode, amountValue } = useDialPadContext()

// only set the asset code when it's available and avoid rerunning every render
useEffect(() => {
setAssetCode(data.assetCode)
})
if (data?.assetCode) {
setAssetCode(data.assetCode)
}
}, [data?.assetCode, setAssetCode])

const encodedReceiver = encodeURIComponent(data.receiver)
const encodedAmount = encodeURIComponent(String(amountValue ?? ''))
const hasAmount = amountValue !== undefined && amountValue !== null && String(amountValue).trim() !== ''

return (
<>
Expand All @@ -66,7 +80,7 @@ export default function PaymentChoice() {
</div>
<div className="flex sm:justify-center items-center sm:items-start mt-20 flex-col w-full gap-10 sm:flex-row h-full px-5">
<Link
to={`/pay-with-interledger?receiver=${data.receiver}`}
to={`/pay-with-interledger?receiver=${encodedReceiver}`}
className={`w-48 h-24 text-right ease-in-out transition-[box-shadow,transform] duration-200 aspect-[5/3] rounded-lg flex flex-col p-3 border-2
hover:scale-105 focus:scale-105 hover:bg-green-2 hover:border-green-2`}
>
Expand All @@ -77,18 +91,36 @@ export default function PaymentChoice() {
Pay with Interledger
</span>
</Link>
<Link
to={`/checkout?receiver=${data.receiver}&amount=${amountValue}`}
className={`w-48 h-24 text-right ease-in-out transition-[box-shadow,transform] duration-200 aspect-[5/3] rounded-lg flex flex-col p-3 border-2
hover:scale-105 focus:scale-105 hover:bg-green-2 hover:border-green-2`}
>
<span className="h-6 flex justify-end text-[#222222]">
<Card />
</span>
<span className="text-md mt-6 font-semibold -tracking-wider text-green-1 text-xl">
Pay with card
</span>
</Link>

{/* If no amount is entered, disable the card checkout link */}
{hasAmount ? (
<Link
to={`/checkout?receiver=${encodedReceiver}&amount=${encodedAmount}`}
className={`w-48 h-24 text-right ease-in-out transition-[box-shadow,transform] duration-200 aspect-[5/3] rounded-lg flex flex-col p-3 border-2
hover:scale-105 focus:scale-105 hover:bg-green-2 hover:border-green-2`}
>
<span className="h-6 flex justify-end text-[#222222]">
<Card />
</span>
<span className="text-md mt-6 font-semibold -tracking-wider text-green-1 text-xl">
Pay with card
</span>
</Link>
) : (
<div
role="button"
aria-disabled="true"
className="w-48 h-24 text-right ease-in-out transition-[box-shadow,transform] duration-200 aspect-[5/3] rounded-lg flex flex-col p-3 border-2 opacity-50 cursor-not-allowed"
title="Enter an amount to enable this option"
>
<span className="h-6 flex justify-end text-[#222222]">
<Card />
</span>
<span className="text-md mt-6 font-semibold -tracking-wider text-green-1 text-xl">
Pay with card
</span>
</div>
)}
</div>
</div>
</>
Expand Down