Skip to content

[TASK-14647] Fix/links feedback changes #1240

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

Merged
Zishan-7 merged 3 commits into from
Sep 19, 2025
Merged

[TASK-14647] Fix/links feedback changes #1240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a232775
Update cancel link button feedbacks
Zishan-7 Sep 18, 2025
ca39e24
fix: copy button bonked
Zishan-7 Sep 19, 2025
ac3ebaf
revert testing changes
Zishan-7 Sep 19, 2025
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
3 changes: 2 additions & 1 deletion src/components/Global/UnsupportedBrowserModal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ const UnsupportedBrowserModalContent = ({
toast.error('Failed to copy link.')
}
},
className: 'bg-primary-1 hover:bg-primary-2 text-black',
className: 'bg-primary-1 hover:bg-primary-2 text-black sm:py-3',
shadowSize: '4',
},
{
Expand All @@ -127,6 +127,7 @@ const UnsupportedBrowserModalContent = ({
modalPanelClassName="max-w-md"
contentContainerClassName="text-center"
descriptionClassName="mb-0"
ctaClassName="flex-col sm:flex-col"
/>
)
}
Expand Down
29 changes: 17 additions & 12 deletions src/components/Send/link/views/Success.link.send.view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { sendLinksApi } from '@/services/sendLinks'
import { captureException } from '@sentry/nextjs'
import { useQueryClient } from '@tanstack/react-query'
import { useRouter } from 'next/navigation'
import { useState } from 'react'
import { useEffect, useState } from 'react'

const LinkSendSuccessView = () => {
const dispatch = useAppDispatch()
Expand All @@ -27,13 +27,14 @@ const LinkSendSuccessView = () => {
const [isLoading, setIsLoading] = useState<boolean>(false)
const [showCancelLinkModal, setshowCancelLinkModal] = useState(false)

if (isLoading) {
return (
<div className="flex w-full items-center justify-center">
<PeanutLoading coverFullScreen />
</div>
)
}
const [cancelLinkText, setCancelLinkText] = useState<'Cancelling' | 'Cancelled' | 'Cancel link'>('Cancel link')

useEffect(() => {
return () => {
// clear state on unmount
dispatch(sendFlowActions.resetSendFlow())
}
}, [dispatch])

return (
<div className="flex w-full flex-col justify-start space-y-8">
Expand Down Expand Up @@ -67,7 +68,8 @@ const LinkSendSuccessView = () => {
variant={'primary-soft'}
className="flex w-full items-center gap-1"
shadowSize="4"
disabled={isLoading}
disabled={isLoading || cancelLinkText === 'Cancelled'}
loading={isLoading}
>
{!isLoading && (
<div className="flex items-center">
Expand All @@ -77,7 +79,7 @@ const LinkSendSuccessView = () => {
/>
</div>
)}
<span>Cancel link</span>
<span>{cancelLinkText}</span>
</Button>
</div>
)}
Expand All @@ -92,6 +94,7 @@ const LinkSendSuccessView = () => {
onClick={() => {
setIsLoading(true)
setshowCancelLinkModal(false)
setCancelLinkText('Cancelling')
sendLinksApi
.claim(user!.user.username!, link)
.then(() => {
Expand All @@ -102,17 +105,19 @@ const LinkSendSuccessView = () => {
.invalidateQueries({
queryKey: ['transactions'],
})
.then(() => {
.then(async () => {
setIsLoading(false)
setCancelLinkText('Cancelled')
await new Promise((resolve) => setTimeout(resolve, 2000))
router.push('/home')
dispatch(sendFlowActions.resetSendFlow())
})
}, 3000)
})
.catch((error) => {
captureException(error)
console.error('Error claiming link:', error)
setIsLoading(false)
setCancelLinkText('Cancel link')
})
}}
/>
Expand Down
11 changes: 8 additions & 3 deletions src/components/TransactionDetails/TransactionDetailsReceipt.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ export const TransactionDetailsReceipt = ({
const [isTokenDataLoading, setIsTokenDataLoading] = useState(true)
const { setIsSupportModalOpen } = useSupportModalContext()
const router = useRouter()
const [cancelLinkText, setCancelLinkText] = useState<'Cancelling' | 'Cancelled' | 'Cancel link'>('Cancel link')

useEffect(() => {
setIsModalOpen?.(showCancelLinkModal)
Expand Down Expand Up @@ -808,7 +809,7 @@ export const TransactionDetailsReceipt = ({
setIsLoading &&
onClose && (
<Button
disabled={isLoading}
disabled={isLoading || cancelLinkText === 'Cancelled'}
onClick={() => setShowCancelLinkModal(true)}
loading={isLoading}
variant={'primary-soft'}
Expand All @@ -823,7 +824,7 @@ export const TransactionDetailsReceipt = ({
/>
)}
</div>
<span>Cancel link</span>
<span>{cancelLinkText}</span>
</Button>
)}
</div>
Expand Down Expand Up @@ -1045,6 +1046,7 @@ export const TransactionDetailsReceipt = ({
amount={amountDisplay}
onClick={() => {
setIsLoading(true)
setCancelLinkText('Cancelling')
setShowCancelLinkModal(false)
sendLinksApi
.claim(user!.user.username!, transaction.extraDataForDrawer!.link!)
Expand All @@ -1056,8 +1058,10 @@ export const TransactionDetailsReceipt = ({
.invalidateQueries({
queryKey: [TRANSACTIONS],
})
.then(() => {
.then(async () => {
setIsLoading(false)
setCancelLinkText('Cancelled')
await new Promise((resolve) => setTimeout(resolve, 2000))
onClose()
})
}, 3000)
Expand All @@ -1066,6 +1070,7 @@ export const TransactionDetailsReceipt = ({
captureException(error)
console.error('Error claiming link:', error)
setIsLoading(false)
setCancelLinkText('Cancel link')
})
}}
/>
Expand Down
Loading