Skip to content

fix(scan): keep outline clear of paste button on mobile browser #1078

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
orveth wants to merge 2 commits into
base: master
Choose a base branch
from
+13 −3
Open

fix(scan): keep outline clear of paste button on mobile browser #1078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08ac62f
fix(scan): keep outline clear of paste button on mobile browser
orveth May 15, 2026
7842628
fix(scan): switch paste button to canonical PageFooter pb-14 pattern
orveth May 15, 2026
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
11 changes: 9 additions & 2 deletions app/components/qr-scanner/qr-scanner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { useEffect, useRef, useState } from 'react';
import { useToast } from '~/hooks/use-toast';
import { useAnimatedQRDecoder } from '~/lib/cashu/animated-qr-code';
import { useThrottle } from '~/lib/use-throttle';
import { cn } from '~/lib/utils';

declare global {
interface Window {
Expand Down Expand Up @@ -44,6 +45,7 @@ const AnimatedScanProgress = ({ progress }: { progress: number }) => {

type QRScannerProps = {
onDecode: (decoded: string) => void | Promise<void>;
className?: string;
};

/**
Expand All @@ -56,7 +58,7 @@ type QRScannerProps = {
* spam) and toasts any errors that occur during decoding. To stop scanning,
* unmount the component (e.g. by navigating away).
*/
export const QRScanner = ({ onDecode }: QRScannerProps) => {
export const QRScanner = ({ onDecode, className }: QRScannerProps) => {
const videoRef = useRef<HTMLVideoElement>(null);
const [currentFragment, setCurrentFragment] = useState('');
const [cameraError, setCameraError] = useState<string | null>(null);
Expand Down Expand Up @@ -144,7 +146,12 @@ export const QRScanner = ({ onDecode }: QRScannerProps) => {
}, [throttledDecode]);

return (
<section className="fixed inset-0 h-screen w-screen sm:relative sm:aspect-square sm:h-[400px] sm:w-[400px] sm:overflow-hidden">
<section
className={cn(
'fixed inset-0 h-screen w-screen sm:relative sm:aspect-square sm:h-[400px] sm:w-[400px] sm:overflow-hidden',
className,
)}
>
<div className="relative h-full w-full">
{cameraError ? (
<div className="absolute inset-0 z-20 flex flex-col items-center justify-center bg-black p-6 text-center">
Expand Down
5 changes: 4 additions & 1 deletion app/routes/_protected.scan.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,10 @@ export default function ScanPage() {
<PageHeaderTitle>Scan</PageHeaderTitle>
</PageHeader>
<PageContent className="relative flex items-center justify-center">
<QRScanner onDecode={handleInput} />
<QRScanner
onDecode={handleInput}
className="relative inset-auto aspect-square h-auto w-full"
/>
</PageContent>
<PageFooter className="pb-14">
<Button type="button" onClick={handlePaste}>
Expand Down
Loading