Add files via upload

This commit is contained in:
Egor
2026-01-19 00:53:18 +03:00
committed by GitHub
parent 2b57afbc4f
commit 981e33ecfa
2 changed files with 245 additions and 124 deletions

View File

@@ -145,55 +145,93 @@ function PaymentMethodModal({ paymentMethods, onSelect, onClose }: PaymentMethod
const { formatAmount, currencySymbol } = useCurrency() const { formatAmount, currencySymbol } = useCurrency()
return ( return (
<div className="fixed inset-0 bg-black/60 backdrop-blur-sm flex items-center justify-center z-50 p-4"> <div className="fixed inset-0 bg-black/60 backdrop-blur-sm z-50 flex items-end sm:items-center justify-center">
<div className="card max-w-lg w-full animate-slide-up max-h-[80vh] overflow-y-auto"> {/* Backdrop click to close */}
<div className="flex justify-between items-center mb-6"> <div className="absolute inset-0" onClick={onClose} />
<h2 className="text-lg font-semibold text-dark-100">{t('balance.selectPaymentMethod')}</h2>
<button onClick={onClose} className="btn-icon"> {/* Modal content - bottom sheet on mobile, centered on desktop */}
<svg className="w-5 h-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={1.5}> <div className="relative w-full sm:max-w-lg sm:mx-4 bg-dark-900 sm:rounded-2xl rounded-t-2xl border border-dark-700/50 shadow-2xl animate-slide-up max-h-[85vh] flex flex-col">
{/* Header */}
<div className="flex-shrink-0 flex justify-between items-center p-4 sm:p-5 border-b border-dark-800">
<div>
<h2 className="text-lg font-semibold text-dark-100">{t('balance.selectPaymentMethod')}</h2>
<p className="text-sm text-dark-400 mt-0.5">{t('balance.topUpBalance')}</p>
</div>
<button
onClick={onClose}
className="w-10 h-10 rounded-xl bg-dark-800 hover:bg-dark-700 flex items-center justify-center transition-colors"
>
<svg className="w-5 h-5 text-dark-400" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2}>
<path strokeLinecap="round" strokeLinejoin="round" d="M6 18L18 6M6 6l12 12" /> <path strokeLinecap="round" strokeLinejoin="round" d="M6 18L18 6M6 6l12 12" />
</svg> </svg>
</button> </button>
</div> </div>
{!paymentMethods ? ( {/* Scrollable content */}
<div className="flex items-center justify-center py-12"> <div className="flex-1 overflow-y-auto overscroll-contain p-4 sm:p-5">
<div className="w-8 h-8 border-2 border-accent-500 border-t-transparent rounded-full animate-spin" /> {!paymentMethods ? (
</div> <div className="flex items-center justify-center py-12">
) : paymentMethods.length === 0 ? ( <div className="w-8 h-8 border-2 border-accent-500 border-t-transparent rounded-full animate-spin" />
<div className="text-center py-8 text-dark-400"> </div>
{t('balance.noPaymentMethods')} ) : paymentMethods.length === 0 ? (
</div> <div className="text-center py-8 text-dark-400">
) : ( {t('balance.noPaymentMethods')}
<div className="grid grid-cols-1 sm:grid-cols-2 gap-3"> </div>
{paymentMethods.map((method) => { ) : (
const methodKey = method.id.toLowerCase().replace(/-/g, '_') <div className="space-y-2">
const translatedName = t(`balance.paymentMethods.${methodKey}.name`, { defaultValue: '' }) {paymentMethods.map((method) => {
const translatedDesc = t(`balance.paymentMethods.${methodKey}.description`, { defaultValue: '' }) const methodKey = method.id.toLowerCase().replace(/-/g, '_')
const translatedName = t(`balance.paymentMethods.${methodKey}.name`, { defaultValue: '' })
const translatedDesc = t(`balance.paymentMethods.${methodKey}.description`, { defaultValue: '' })
return ( return (
<button <button
key={method.id} key={method.id}
disabled={!method.is_available} disabled={!method.is_available}
onClick={() => method.is_available && onSelect(method)} onClick={() => method.is_available && onSelect(method)}
className={`p-4 rounded-xl border text-left transition-all ${ className={`w-full p-4 rounded-xl border text-left transition-all flex items-center gap-4 ${
method.is_available method.is_available
? 'border-dark-700/50 hover:border-accent-500/50 bg-dark-800/30 cursor-pointer hover:bg-dark-800/50' ? 'border-dark-700/50 hover:border-accent-500/50 bg-dark-800/30 cursor-pointer hover:bg-dark-800/50 active:bg-dark-700/50'
: 'border-dark-800/30 bg-dark-900/30 opacity-50 cursor-not-allowed' : 'border-dark-800/30 bg-dark-900/30 opacity-50 cursor-not-allowed'
}`} }`}
> >
<div className="font-semibold text-dark-100">{translatedName || method.name}</div> {/* Icon */}
{(translatedDesc || method.description) && ( <div className="w-12 h-12 rounded-xl bg-dark-800 flex items-center justify-center flex-shrink-0">
<div className="text-sm text-dark-500 mt-1">{translatedDesc || method.description}</div> <svg className="w-6 h-6 text-accent-400" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={1.5}>
)} <path strokeLinecap="round" strokeLinejoin="round" d="M2.25 8.25h19.5M2.25 9h19.5m-16.5 5.25h6m-6 2.25h3m-3.75 3h15a2.25 2.25 0 002.25-2.25V6.75A2.25 2.25 0 0019.5 4.5h-15a2.25 2.25 0 00-2.25 2.25v10.5A2.25 2.25 0 004.5 19.5z" />
<div className="text-xs text-dark-600 mt-2"> </svg>
{formatAmount(method.min_amount_kopeks / 100, 0)} {formatAmount(method.max_amount_kopeks / 100, 0)} {currencySymbol} </div>
</div> {/* Content */}
</button> <div className="flex-1 min-w-0">
) <div className="font-semibold text-dark-100">{translatedName || method.name}</div>
})} {(translatedDesc || method.description) && (
</div> <div className="text-sm text-dark-500 mt-0.5 truncate">{translatedDesc || method.description}</div>
)} )}
<div className="text-xs text-dark-600 mt-1">
{formatAmount(method.min_amount_kopeks / 100, 0)} {formatAmount(method.max_amount_kopeks / 100, 0)} {currencySymbol}
</div>
</div>
{/* Arrow */}
<svg className="w-5 h-5 text-dark-500 flex-shrink-0" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2}>
<path strokeLinecap="round" strokeLinejoin="round" d="M8.25 4.5l7.5 7.5-7.5 7.5" />
</svg>
</button>
)
})}
</div>
)}
</div>
{/* Footer */}
<div className="flex-shrink-0 px-4 sm:px-5 pt-4 sm:pt-5 safe-area-inset-bottom border-t border-dark-800 bg-dark-900">
<button
type="button"
onClick={onClose}
className="btn-secondary w-full h-12 text-base"
>
{t('common.cancel')}
</button>
</div>
</div> </div>
</div> </div>
) )

View File

@@ -1,4 +1,4 @@
import { useState, useRef } from 'react' import { useState, useRef, useEffect } from 'react'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import { useMutation } from '@tanstack/react-query' import { useMutation } from '@tanstack/react-query'
import { balanceApi } from '../api/balance' import { balanceApi } from '../api/balance'
@@ -45,6 +45,8 @@ interface TopUpModalProps {
export default function TopUpModal({ method, onClose, initialAmountRubles }: TopUpModalProps) { export default function TopUpModal({ method, onClose, initialAmountRubles }: TopUpModalProps) {
const { t } = useTranslation() const { t } = useTranslation()
const { formatAmount, currencySymbol, convertAmount, convertToRub, targetCurrency } = useCurrency() const { formatAmount, currencySymbol, convertAmount, convertToRub, targetCurrency } = useCurrency()
const formRef = useRef<HTMLFormElement>(null)
const inputRef = useRef<HTMLInputElement>(null)
// Calculate initial amount in user's currency // Calculate initial amount in user's currency
const getInitialAmount = (): string => { const getInitialAmount = (): string => {
@@ -73,6 +75,23 @@ export default function TopUpModal({ method, onClose, initialAmountRubles }: Top
const methodName = t(`balance.paymentMethods.${methodKey}.name`, { defaultValue: '' }) || method.name const methodName = t(`balance.paymentMethods.${methodKey}.name`, { defaultValue: '' }) || method.name
const isTelegramMiniApp = typeof window !== 'undefined' && Boolean(window.Telegram?.WebApp?.initData) const isTelegramMiniApp = typeof window !== 'undefined' && Boolean(window.Telegram?.WebApp?.initData)
// Handle visual viewport changes (keyboard appearance on mobile)
useEffect(() => {
const handleResize = () => {
// Scroll input into view when keyboard appears
if (document.activeElement === inputRef.current) {
setTimeout(() => {
inputRef.current?.scrollIntoView({ behavior: 'smooth', block: 'center' })
}, 100)
}
}
if (typeof window !== 'undefined' && window.visualViewport) {
window.visualViewport.addEventListener('resize', handleResize)
return () => window.visualViewport?.removeEventListener('resize', handleResize)
}
}, [])
// Stars payment using the same approach as Wheel.tsx // Stars payment using the same approach as Wheel.tsx
const starsPaymentMutation = useMutation({ const starsPaymentMutation = useMutation({
mutationFn: (amountKopeks: number) => balanceApi.createStarsInvoice(amountKopeks), mutationFn: (amountKopeks: number) => balanceApi.createStarsInvoice(amountKopeks),
@@ -140,7 +159,11 @@ export default function TopUpModal({ method, onClose, initialAmountRubles }: Top
}) })
const handleSubmit = (e: React.FormEvent) => { const handleSubmit = (e: React.FormEvent) => {
e.preventDefault(); setError(null) e.preventDefault()
setError(null)
// Hide keyboard on mobile
inputRef.current?.blur()
// Rate limit check: max 3 payment attempts per 30 seconds // Rate limit check: max 3 payment attempts per 30 seconds
if (!checkRateLimit(RATE_LIMIT_KEYS.PAYMENT, 3, 30000)) { if (!checkRateLimit(RATE_LIMIT_KEYS.PAYMENT, 3, 30000)) {
@@ -176,103 +199,163 @@ export default function TopUpModal({ method, onClose, initialAmountRubles }: Top
const minInputValue = targetCurrency === 'RUB' ? minRubles : targetCurrency === 'IRR' ? Math.round(convertAmount(minRubles)) : Number(convertAmount(minRubles).toFixed(currencyDecimals)) const minInputValue = targetCurrency === 'RUB' ? minRubles : targetCurrency === 'IRR' ? Math.round(convertAmount(minRubles)) : Number(convertAmount(minRubles).toFixed(currencyDecimals))
const maxInputValue = targetCurrency === 'RUB' ? maxRubles : targetCurrency === 'IRR' ? Math.round(convertAmount(maxRubles)) : Number(convertAmount(maxRubles).toFixed(currencyDecimals)) const maxInputValue = targetCurrency === 'RUB' ? maxRubles : targetCurrency === 'IRR' ? Math.round(convertAmount(maxRubles)) : Number(convertAmount(maxRubles).toFixed(currencyDecimals))
const isPending = topUpMutation.isPending || starsPaymentMutation.isPending
return ( return (
<div className="fixed inset-0 bg-black/60 backdrop-blur-sm flex items-center justify-center z-50 p-4"> <div className="fixed inset-0 bg-black/60 backdrop-blur-sm z-50 flex items-end sm:items-center justify-center">
<div className="card max-w-md w-full animate-slide-up"> {/* Backdrop click to close */}
<div className="flex justify-between items-center mb-6"> <div className="absolute inset-0" onClick={onClose} />
<h2 className="text-lg font-semibold text-dark-100">{t('balance.topUp')} - {methodName}</h2>
<button onClick={onClose} className="btn-icon"> {/* Modal content - bottom sheet on mobile, centered on desktop */}
<svg className="w-5 h-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={1.5}> <div className="relative w-full sm:max-w-md sm:mx-4 bg-dark-900 sm:rounded-2xl rounded-t-2xl border border-dark-700/50 shadow-2xl animate-slide-up max-h-[90vh] flex flex-col">
{/* Header - sticky */}
<div className="flex-shrink-0 flex justify-between items-center p-4 sm:p-5 border-b border-dark-800">
<div>
<h2 className="text-lg font-semibold text-dark-100">{t('balance.topUp')}</h2>
<p className="text-sm text-dark-400 mt-0.5">{methodName}</p>
</div>
<button
onClick={onClose}
className="w-10 h-10 rounded-xl bg-dark-800 hover:bg-dark-700 flex items-center justify-center transition-colors"
>
<svg className="w-5 h-5 text-dark-400" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2}>
<path strokeLinecap="round" strokeLinejoin="round" d="M6 18L18 6M6 6l12 12" /> <path strokeLinecap="round" strokeLinejoin="round" d="M6 18L18 6M6 6l12 12" />
</svg> </svg>
</button> </button>
</div> </div>
<form onSubmit={handleSubmit} className="space-y-4"> {/* Scrollable content */}
{hasOptions && method.options && ( <div className="flex-1 overflow-y-auto overscroll-contain">
<div> <form ref={formRef} onSubmit={handleSubmit} className="p-4 sm:p-5 space-y-4">
<label className="label">{t('balance.paymentOption', 'Способ оплаты')}</label> {/* Payment options */}
<div className="flex flex-wrap gap-2"> {hasOptions && method.options && (
{method.options.map((option) => ( <div>
<button <label className="block text-sm font-medium text-dark-300 mb-2">{t('balance.paymentOption', 'Способ оплаты')}</label>
key={option.id} <div className="grid grid-cols-2 gap-2">
type="button" {method.options.map((option) => (
onClick={() => setSelectedOption(option.id)} <button
className={`px-4 py-2.5 rounded-xl text-sm font-medium transition-all flex flex-col items-start ${ key={option.id}
selectedOption === option.id type="button"
? 'bg-accent-500 text-white ring-2 ring-accent-400 ring-offset-2 ring-offset-dark-900' onClick={() => setSelectedOption(option.id)}
: 'bg-dark-800 text-dark-300 hover:bg-dark-700' className={`p-3 rounded-xl text-sm font-medium transition-all text-left ${
}`} selectedOption === option.id
> ? 'bg-accent-500 text-white ring-2 ring-accent-400'
<span>{option.name}</span> : 'bg-dark-800 text-dark-300 hover:bg-dark-700 active:bg-dark-600'
{option.description && ( }`}
<span className={`text-xs mt-0.5 ${selectedOption === option.id ? 'text-white/70' : 'text-dark-500'}`}> >
{option.description} <span className="block">{option.name}</span>
</span> {option.description && (
)} <span className={`block text-xs mt-0.5 ${selectedOption === option.id ? 'text-white/70' : 'text-dark-500'}`}>
</button> {option.description}
))} </span>
)}
</button>
))}
</div>
</div> </div>
)}
{/* Amount input */}
<div>
<label className="block text-sm font-medium text-dark-300 mb-2">
{t('balance.amount')} ({currencySymbol})
</label>
<div className="relative">
<input
ref={inputRef}
type="number"
inputMode="decimal"
value={amount}
onChange={(e) => setAmount(e.target.value)}
placeholder={`${formatAmount(minRubles, currencyDecimals)} - ${formatAmount(maxRubles, currencyDecimals)}`}
min={minInputValue}
max={maxInputValue}
step={inputStep}
className="input text-lg pr-14 h-14"
autoComplete="off"
/>
<span className="absolute right-4 top-1/2 -translate-y-1/2 text-dark-500 font-medium">
{currencySymbol}
</span>
</div>
<p className="text-xs text-dark-500 mt-2">
{t('balance.minAmount')}: {formatAmount(minRubles, currencyDecimals)} {t('balance.maxAmount')}: {formatAmount(maxRubles, currencyDecimals)} {currencySymbol}
</p>
</div> </div>
)}
<div> {/* Quick amounts */}
<label className="label">{t('balance.amount')} ({currencySymbol})</label> {quickAmounts.length > 0 && (
<input <div>
type="number" <label className="block text-sm font-medium text-dark-300 mb-2">{t('balance.quickAmount', 'Быстрый выбор')}</label>
value={amount} <div className="grid grid-cols-4 gap-2">
onChange={(e) => setAmount(e.target.value)} {quickAmounts.map((a) => {
placeholder={`${formatAmount(minRubles, currencyDecimals)} - ${formatAmount(maxRubles, currencyDecimals)}`} const quickValue = getQuickAmountValue(a)
min={minInputValue} const isSelected = amount === quickValue
max={maxInputValue} return (
step={inputStep} <button
className="input" key={a}
/> type="button"
<div className="text-xs text-dark-500 mt-2"> onClick={() => {
{t('balance.minAmount')}: {formatAmount(minRubles, currencyDecimals)} {currencySymbol} | {t('balance.maxAmount')}: {formatAmount(maxRubles, currencyDecimals)} {currencySymbol} setAmount(quickValue)
</div> inputRef.current?.blur()
</div> }}
className={`py-3 px-2 rounded-xl text-sm font-medium transition-all ${
isSelected
? 'bg-accent-500 text-white'
: 'bg-dark-800 text-dark-300 hover:bg-dark-700 active:bg-dark-600'
}`}
>
{formatAmount(a, 0)}
</button>
)
})}
</div>
</div>
)}
{quickAmounts.length > 0 && ( {/* Error message */}
<div className="flex flex-wrap gap-2"> {error && (
{quickAmounts.map((a) => { <div className="bg-error-500/10 border border-error-500/30 text-error-400 p-3 rounded-xl text-sm">
const quickValue = getQuickAmountValue(a) {error}
return ( </div>
<button )}
key={a} </form>
type="button" </div>
onClick={() => setAmount(quickValue)}
className={`px-4 py-2 rounded-xl text-sm font-medium transition-all ${
amount === quickValue ? 'bg-accent-500 text-white' : 'bg-dark-800 text-dark-300 hover:bg-dark-700'
}`}
>
{formatAmount(a, currencyDecimals)} {currencySymbol}
</button>
)
})}
</div>
)}
{error && ( {/* Footer with buttons - sticky at bottom */}
<div className="bg-error-500/10 border border-error-500/30 text-error-400 p-3 rounded-xl text-sm">{error}</div> <div className="flex-shrink-0 px-4 sm:px-5 pt-4 sm:pt-5 safe-area-inset-bottom border-t border-dark-800 bg-dark-900">
)} <div className="flex gap-3">
<button
<div className="flex gap-3 pt-2"> type="button"
<button type="submit" disabled={topUpMutation.isPending || starsPaymentMutation.isPending || !amount} className="btn-primary flex-1"> onClick={onClose}
{topUpMutation.isPending || starsPaymentMutation.isPending ? ( className="btn-secondary flex-1 h-12 text-base"
>
{t('common.cancel')}
</button>
<button
type="submit"
onClick={handleSubmit}
disabled={isPending || !amount}
className="btn-primary flex-[2] h-12 text-base font-semibold"
>
{isPending ? (
<span className="flex items-center justify-center gap-2"> <span className="flex items-center justify-center gap-2">
<span className="w-4 h-4 border-2 border-white/30 border-t-white rounded-full animate-spin" /> <span className="w-5 h-5 border-2 border-white/30 border-t-white rounded-full animate-spin" />
{t('common.loading')}
</span> </span>
) : ( ) : (
t('balance.topUp') <>
{t('balance.topUp')}
{amount && (
<span className="ml-1 opacity-80">
{formatAmount(parseFloat(amount) || 0, currencyDecimals)} {currencySymbol}
</span>
)}
</>
)} )}
</button> </button>
<button type="button" onClick={onClose} className="btn-secondary">{t('common.cancel')}</button>
</div> </div>
</form> </div>
</div> </div>
</div> </div>
) )
} }