From 30c5d9ae1154d3bcfa78d7afc96feeff907c9c55 Mon Sep 17 00:00:00 2001 From: 3252a8 <3252a8@proton.me> Date: Thu, 28 May 2026 10:06:10 +0300 Subject: [PATCH] fix: refine home tariff actions --- frontend/src/App.svelte | 4 +++- frontend/src/styles/webapp.css | 6 ++++++ frontend/src/webapp/screens/HomeScreen.svelte | 21 ++++++++++++------- locales/en.json | 1 + locales/ru.json | 1 + 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/frontend/src/App.svelte b/frontend/src/App.svelte index bd5f9c9..455c765 100644 --- a/frontend/src/App.svelte +++ b/frontend/src/App.svelte @@ -1825,7 +1825,9 @@ return t("wa_pay_full_subscription", {}, "Оплатить полную подписку"); } if (trafficMode || selectedPlan?.sale_mode === "traffic_package") return t("wa_buy_traffic"); - return subscription.active ? t("wa_renew") : t("wa_pay_subscription"); + return subscription.active + ? t("wa_renew_subscription", {}, "Продлить подписку") + : t("wa_pay_subscription"); } diff --git a/frontend/src/styles/webapp.css b/frontend/src/styles/webapp.css index 5baf8be..6b20b51 100644 --- a/frontend/src/styles/webapp.css +++ b/frontend/src/styles/webapp.css @@ -263,6 +263,12 @@ a { opacity: 1; } +.status-tariff-action { + margin-top: 10px; + min-height: 38px; + padding: 0 12px; +} + .traffic-top, .total-card { display: flex; diff --git a/frontend/src/webapp/screens/HomeScreen.svelte b/frontend/src/webapp/screens/HomeScreen.svelte index 579264b..c50b107 100644 --- a/frontend/src/webapp/screens/HomeScreen.svelte +++ b/frontend/src/webapp/screens/HomeScreen.svelte @@ -3,10 +3,11 @@ CheckCircle2, ChevronsUpDown, CircleX, + CreditCard, Database, Download, Gift, - RefreshCw, + Repeat2, } from "$components/ui/icons.js"; import BrandMark from "$lib/webapp/BrandMark.svelte"; @@ -118,6 +119,16 @@ ? t("wa_until_date", { date: subscription.end_date_text }) : subscription.remaining_text}

+ {#if canChangeTariff} + + {/if} {:else} @@ -271,18 +282,12 @@ onclick={openPaymentModal} > {#if subscription.active} - + {:else if trafficMode} {/if} {primaryPayActionLabel()} - {#if canChangeTariff} - - {/if} {#if regularTrafficTopupUnlocked}