etkr4k/bedolaga-cabinet
1
0
Fork 0
mirror of https://github.com/chillpadclub/bedolaga-cabinet.git synced 2026-07-29 18:13:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #118 from BEDOLAGA-DEV/dev

Browse Source 
Update Subscription.tsx
This commit is contained in:
Egor
2026-01-30 18:01:01 +03:00
committed by GitHub
parent 812b2210f6 dd5cb7789f
commit 3ff836d57e
1 changed files with 47 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/pages/Subscription.tsx
View File

@@ -31,13 +31,18 @@ const getErrorMessage = (error: unknown): string => {
// Helper to extract insufficient balance error details // Helper to extract insufficient balance error details
const getInsufficientBalanceError = ( const getInsufficientBalanceError = (
error: unknown, error: unknown,
): { required: number; balance: number } | null => { ): { required: number; balance: number; missingAmount?: number } | null => {
if (error instanceof AxiosError) { if (error instanceof AxiosError) {
const detail = error.response?.data?.detail; const detail = error.response?.data?.detail;
if (typeof detail === 'object' && detail?.code === 'insufficient_balance') { // Support both 'insufficient_balance' and 'insufficient_funds' codes
if (
typeof detail === 'object' &&
(detail?.code === 'insufficient_balance' || detail?.code === 'insufficient_funds')
) {
return { return {
required: detail.required || 0, required: detail.required || detail.total_price || 0,
balance: detail.balance || 0, balance: detail.balance || 0,
missingAmount: detail.missing_amount || detail.missingAmount || 0,
}; };
} }
} }
@@ -2118,7 +2123,7 @@ export default function Subscription() {
<button <button
onClick={() => tariffPurchaseMutation.mutate()} onClick={() => tariffPurchaseMutation.mutate()}
disabled={tariffPurchaseMutation.isPending || !hasEnoughBalance} disabled={tariffPurchaseMutation.isPending}
className="btn-primary w-full py-3" className="btn-primary w-full py-3"
> >
{tariffPurchaseMutation.isPending ? ( {tariffPurchaseMutation.isPending ? (
@@ -2133,11 +2138,25 @@ export default function Subscription() {
)} )}
</button> </button>
{tariffPurchaseMutation.isError && ( {tariffPurchaseMutation.isError &&
<div className="mt-3 text-center text-sm text-error-400"> !getInsufficientBalanceError(tariffPurchaseMutation.error) && (
{getErrorMessage(tariffPurchaseMutation.error)} <div className="mt-3 text-center text-sm text-error-400">
</div> {getErrorMessage(tariffPurchaseMutation.error)}
)} </div>
)}
{tariffPurchaseMutation.isError &&
getInsufficientBalanceError(tariffPurchaseMutation.error) && (
<div className="mt-3">
<InsufficientBalancePrompt
missingAmountKopeks={
getInsufficientBalanceError(tariffPurchaseMutation.error)
?.missingAmount ||
dailyPrice - (purchaseOptions?.balance_kopeks || 0)
}
compact
/>
</div>
)}
</div> </div>
); );
})()} })()}
@@ -2540,17 +2559,9 @@ export default function Subscription() {
</div> </div>
</div> </div>
{purchaseOptions && !hasEnoughBalance && (
<InsufficientBalancePrompt
missingAmountKopeks={totalPrice - purchaseOptions.balance_kopeks}
compact
className="mb-4"
/>
)}
<button <button
onClick={() => tariffPurchaseMutation.mutate()} onClick={() => tariffPurchaseMutation.mutate()}
disabled={tariffPurchaseMutation.isPending || !hasEnoughBalance} disabled={tariffPurchaseMutation.isPending}
className="btn-primary w-full py-3" className="btn-primary w-full py-3"
> >
{tariffPurchaseMutation.isPending ? ( {tariffPurchaseMutation.isPending ? (
@@ -2566,11 +2577,24 @@ export default function Subscription() {
); );
})()} })()}
{tariffPurchaseMutation.isError && ( {tariffPurchaseMutation.isError &&
<div className="mt-3 text-center text-sm text-error-400"> !getInsufficientBalanceError(tariffPurchaseMutation.error) && (
{getErrorMessage(tariffPurchaseMutation.error)} <div className="mt-3 text-center text-sm text-error-400">
</div> {getErrorMessage(tariffPurchaseMutation.error)}
)} </div>
)}
{tariffPurchaseMutation.isError &&
getInsufficientBalanceError(tariffPurchaseMutation.error) && (
<div className="mt-3">
<InsufficientBalancePrompt
missingAmountKopeks={
getInsufficientBalanceError(tariffPurchaseMutation.error)
?.missingAmount || 0
}
compact
/>
</div>
)}
</div> </div>
)} )}
</> </>