Skip to content

Commit 7aee5b3

Browse files
committed
Pull request 726: Fix: fix telemetry events and migration buttons for different langs
Merge in SCITER/adguard-mini from telemetry-fixes to master Squashed commit of the following: commit e53bf89 Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com> Date: Thu Jan 29 18:37:44 2026 +0300 Consider issues commit 58dfb48 Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com> Date: Thu Jan 29 18:35:39 2026 +0300 Fix: fix telemetry events and migration buttons for different langs
1 parent fa6437b commit 7aee5b3

6 files changed

Lines changed: 23 additions & 10 deletions

File tree

AdguardMini/sciter-ui/modules/common/apis/callbacks/TrayCallbackServiceInternal.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@ import { store } from 'TrayStore';
33
import { ITrayCallbackServiceInternal } from './TrayCallbackService';
44
import { BoolValue, EmptyValue, FiltersStatus, SafariExtensionUpdate, LicenseOrError, EffectiveThemeValue } from '../types'
55
import { TrayRoute } from 'TrayStore/modules/TrayRouter';
6+
import { TrayPage } from 'Modules/tray/store/modules';
67

78
/* Service handles settings lists */
89
export class TrayCallbackServiceInternal implements ITrayCallbackServiceInternal {
910
async OnTrayWindowVisibilityChange(param: BoolValue): Promise<EmptyValue> {
1011
// Idk how it works, i will remain it as it is
1112
if (param.value) {
1213
store.settings.getSettings();
14+
store.telemetry.setPage(TrayPage.TrayMenu);
15+
store.telemetry.trackPageView();
1316
} else {
1417
store.router.changePath(TrayRoute.home);
1518
}

AdguardMini/sciter-ui/modules/common/components/Layout/Layout.module.pcss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
min-height: 632px;
2020
height: *;
2121
padding: 0;
22+
position: relative;
2223
}
2324

2425
&__settingsMenu {

AdguardMini/sciter-ui/modules/settings/components/Migration/Migration.module.pcss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,12 @@
2929
}
3030

3131
&_buttons {
32+
position: absolute;
33+
bottom: 40px;
3234
flow: horizontal;
3335
vertical-align: center;
34-
padding: 22px 74px 0;
35-
height: 78px;
36+
padding: 0 74px;
37+
height: 56px;
3638

3739
> button {
3840
margin: 0 var(--m-l);

AdguardMini/sciter-ui/modules/settings/components/UserRules/UserRules.tsx

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { useOpenUserRulesWindow } from 'SettingsLib/hooks/useOpenUserRulesWindow
1515
import { getNotificationSomethingWentWrongText, provideContactSupportParam } from 'SettingsLib/utils/translate';
1616
import { NotificationContext, NotificationsQueueIconType, NotificationsQueueType, NotificationsQueueVariant, RouteName, SettingsEvent } from 'SettingsStore/modules';
1717
import theme from 'Theme';
18-
import { Modal, ExternalLink, Input, Pagination, Icon, Text } from 'UILib';
18+
import { Modal, Input, Pagination, Icon, Text, Button } from 'UILib';
1919

2020
import { SettingsItemSwitch } from '../SettingsItem';
2121
import { SettingsTitle } from '../SettingsTitle';
@@ -180,15 +180,18 @@ function UserRulesComponent() {
180180
reportBug
181181
>
182182
{!isScrolling && (
183-
<ExternalLink
183+
<Button
184+
type="text"
184185
className={s.UserRules_howTo}
185-
href={getTdsLink(TDS_PARAMS.filterrules, RouteName.user_rules)}
186-
textType="t1"
187-
noUnderline
188-
onClick={() => telemetry.trackEvent(SettingsEvent.RuleSyntaxClick)}
186+
onClick={() => {
187+
window.OpenLinkInBrowser(getTdsLink(TDS_PARAMS.filterrules, RouteName.user_rules));
188+
telemetry.trackEvent(SettingsEvent.RuleSyntaxClick);
189+
}}
189190
>
190-
{translate('user.rules.how.create.rule')}
191-
</ExternalLink>
191+
<Text lineHeight="none" type="t1">
192+
{translate('user.rules.how.create.rule')}
193+
</Text>
194+
</Button>
192195
)}
193196
</SettingsTitle>
194197
{!isScrolling && (

AdguardMini/sciter-ui/modules/tray/components/App/App.pcss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@
66
html, body {
77
border-radius: 8px;
88
height: 582px;
9+
overflow: hidden;
10+
scroll: none;
911
}

AdguardMini/sciter-ui/modules/tray/components/Home/Home.module.pcss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
background: var(--fills-backgrounds-page-background-default);
1111
box-shadow: var(--bs-big);
1212
box-sizing: content-box;
13+
overflow: hidden;
14+
scroll: none;
1315

1416
&_header {
1517
flow: horizontal;

0 commit comments

Comments
 (0)