Merge branch 'CW-394-mac-auth' of https://github.com/cake-tech/cake_wallet into breez-latest-flutter

2024-12-22 19:49:22 +00:00 · 2024-04-16 15:53:16 -07:00 · 2024-04-16 15:53:16 -07:00 · a54ab674db
commit a54ab674db
parent 9f927d1af5 6fbbfce702
40 changed files with 634 additions and 522 deletions
--- a/assets/text/Monerocom_Release_Notes.txt
+++ b/assets/text/Monerocom_Release_Notes.txt
@ -1,2 +1,2 @@
-Exchange flow enhancements and fixes
-Generic enhancements and bug fixes
+UI enhancements
+Bug fixes
--- a/assets/text/Release_Notes.txt
+++ b/assets/text/Release_Notes.txt
@ -1,6 +1,7 @@
-Exchange flow enhancements and fixes
-Add MoonPay to Buy options
-Add THORChain to Exchange providers
-Improve Bitcoin fee calculations
-Fixes and enhancements for Solana
-Generic enhancements and bug fixes
+Add Replace-By-Fee to boost pending Bitcoin transactions
+Enable WalletConnect for Solana
+WalletConnect Enhancements
+Enhancements for ERC-20 tokens and Solana tokens
+Enhancements for Nano wallet
+UI enhancements
+Bug fixes
--- a/lib/locales/hausa_intl.dart
+++ b/lib/locales/hausa_intl.dart
@ -1002,21 +1002,21 @@ class HaCupertinoLocalizations extends GlobalCupertinoLocalizations {

  @override
  // TODO: implement clearButtonLabel
-  String get clearButtonLabel => throw UnimplementedError();
+  String get clearButtonLabel => "clearButtonLabel";

  @override
  // TODO: implement lookUpButtonLabel
-  String get lookUpButtonLabel => throw UnimplementedError();
+  String get lookUpButtonLabel => "lookUpButtonLabel";

  @override
  // TODO: implement menuDismissLabel
-  String get menuDismissLabel => throw UnimplementedError();
+  String get menuDismissLabel => "menuDismissLabel";

  @override
  // TODO: implement searchWebButtonLabel
-  String get searchWebButtonLabel => throw UnimplementedError();
+  String get searchWebButtonLabel => "searchWebButtonLabel";

  @override
  // TODO: implement shareButtonLabel
-  String get shareButtonLabel => throw UnimplementedError();
+  String get shareButtonLabel => "shareButtonLabel";
 }
--- a/lib/locales/yoruba_intl.dart
+++ b/lib/locales/yoruba_intl.dart
@ -1,4 +1,3 @@
-
 import 'dart:async';

 import 'package:flutter/cupertino.dart';
@ -754,47 +753,47 @@ String get keyboardKeyMetaWindows => 'Windows';

  @override
  // TODO: implement collapsedHint
-  String get collapsedHint => throw UnimplementedError();
+  String get collapsedHint => "collapsedHint";

  @override
  // TODO: implement expandedHint
-  String get expandedHint => throw UnimplementedError();
+  String get expandedHint => "expandedHint";

  @override
  // TODO: implement expansionTileCollapsedHint
-  String get expansionTileCollapsedHint => throw UnimplementedError();
+  String get expansionTileCollapsedHint => "expansionTileCollapsedHint";

  @override
  // TODO: implement expansionTileCollapsedTapHint
-  String get expansionTileCollapsedTapHint => throw UnimplementedError();
+  String get expansionTileCollapsedTapHint => "expansionTileCollapsedTapHint";

  @override
  // TODO: implement expansionTileExpandedHint
-  String get expansionTileExpandedHint => throw UnimplementedError();
+  String get expansionTileExpandedHint => "expansionTileExpandedHint";

  @override
  // TODO: implement expansionTileExpandedTapHint
-  String get expansionTileExpandedTapHint => throw UnimplementedError();
+  String get expansionTileExpandedTapHint => "expansionTileExpandedTapHint";

  @override
  // TODO: implement scanTextButtonLabel
-  String get scanTextButtonLabel => throw UnimplementedError();
+  String get scanTextButtonLabel => "scanTextButtonLabel";

  @override
  // TODO: implement lookUpButtonLabel
-  String get lookUpButtonLabel => throw UnimplementedError();
+  String get lookUpButtonLabel => "lookUpButtonLabel";

  @override
  // TODO: implement menuDismissLabel
-  String get menuDismissLabel => throw UnimplementedError();
+  String get menuDismissLabel => "menuDismissLabel";

  @override
  // TODO: implement searchWebButtonLabel
-  String get searchWebButtonLabel => throw UnimplementedError();
+  String get searchWebButtonLabel => "searchWebButtonLabel";

  @override
  // TODO: implement shareButtonLabel
-  String get shareButtonLabel => throw UnimplementedError();
+  String get shareButtonLabel => "shareButtonLabel";
 }

 /// Cupertino Support
--- a/lib/src/screens/dashboard/dashboard_page.dart
+++ b/lib/src/screens/dashboard/dashboard_page.dart
@ -51,14 +51,25 @@ class DashboardPage extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
+    final screenHeight = MediaQuery.of(context).size.height;
    return Scaffold(
      body: Observer(
        builder: (_) {
-          final dashboardPageView = _DashboardPageView(
+          final dashboardPageView = RefreshIndicator(
+            displacement: screenHeight * 0.1,
+            onRefresh: () async => await dashboardViewModel.refreshDashboard(),
+            child: SingleChildScrollView(
+              physics: AlwaysScrollableScrollPhysics(),
+              child: Container(
+                height: screenHeight,
+                child: _DashboardPageView(
                  balancePage: balancePage,
                  bottomSheetService: bottomSheetService,
                  dashboardViewModel: dashboardViewModel,
                  addressListViewModel: addressListViewModel,
+                ),
+              ),
+            ),
          );

          if (DeviceInfo.instance.isDesktop) {
@ -106,10 +117,10 @@ class _DashboardPageView extends BasePage {
  Widget leading(BuildContext context) {
    return Observer(
      builder: (context) {
-        if (dashboardViewModel.isEnabledBulletinAction) {
-          return ServicesUpdatesWidget(dashboardViewModel.getServicesStatus());
-        }
-        return const SizedBox();
+        return ServicesUpdatesWidget(
+          dashboardViewModel.getServicesStatus(),
+          enabled: dashboardViewModel.isEnabledBulletinAction,
+        );
      },
    );
  }
--- a/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar_wrapper.dart
+++ b/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar_wrapper.dart
@ -107,7 +107,10 @@ class DesktopSidebarWrapper extends BasePage {
                      : unselectedIconPath,
                ),
                SideMenuItem(
-                  widget: ServicesUpdatesWidget(dashboardViewModel.getServicesStatus()),
+                  widget: ServicesUpdatesWidget(
+                    dashboardViewModel.getServicesStatus(),
+                    enabled: dashboardViewModel.isEnabledBulletinAction,
+                  ),
                  isSelected: desktopSidebarViewModel.currentPage == SidebarItem.status,
                  onTap: () {},
                ),
--- a/lib/src/screens/dashboard/pages/transactions_page.dart
+++ b/lib/src/screens/dashboard/pages/transactions_page.dart
@ -2,6 +2,7 @@ import 'package:cake_wallet/src/screens/dashboard/widgets/anonpay_transaction_ro
 import 'package:cake_wallet/src/screens/dashboard/widgets/order_row.dart';
 import 'package:cake_wallet/themes/extensions/placeholder_theme.dart';
 import 'package:cake_wallet/src/widgets/dashboard_card_widget.dart';
+import 'package:cake_wallet/utils/device_info.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/view_model/dashboard/anonpay_transaction_list_item.dart';
 import 'package:cake_wallet/view_model/dashboard/order_list_item.dart';
@ -20,6 +21,7 @@ import 'package:cake_wallet/view_model/dashboard/date_section_item.dart';
 import 'package:intl/intl.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/generated/i18n.dart';
+import 'package:url_launcher/url_launcher.dart';

 class TransactionsPage extends StatelessWidget {
  TransactionsPage({required this.dashboardViewModel});
@ -46,11 +48,17 @@ class TransactionsPage extends StatelessWidget {
                return Padding(
                  padding: const EdgeInsets.fromLTRB(24, 0, 24, 8),
                  child: DashBoardRoundedCardWidget(
-                    onTap: () => Navigator.of(context).pushNamed(Routes.webViewPage, arguments: [
-                      '',
-                      Uri.parse(
-                          'https://guides.cakewallet.com/docs/FAQ/why_are_my_funds_not_appearing/')
-                    ]),
+                    onTap: () {
+                      try {
+                        final uri = Uri.parse(
+                            "https://guides.cakewallet.com/docs/FAQ/why_are_my_funds_not_appearing/");
+                        if (DeviceInfo.instance.isMobile) {
+                          Navigator.of(context).pushNamed(Routes.webViewPage, arguments: ['', uri]);
+                        } else {
+                          launchUrl(uri);
+                        }
+                      } catch (_) {}
+                    },
                    title: S.of(context).syncing_wallet_alert_title,
                    subTitle: S.of(context).syncing_wallet_alert_content,
                  ),
--- a/lib/src/widgets/services_updates_widget.dart
+++ b/lib/src/widgets/services_updates_widget.dart
@ -1,10 +1,13 @@
 import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/entities/preferences_key.dart';
 import 'package:cake_wallet/entities/service_status.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/service_status_tile.dart';
 import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
 import 'package:cake_wallet/themes/extensions/wallet_list_theme.dart';
+import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@ -12,8 +15,9 @@ import 'package:url_launcher/url_launcher.dart';

 class ServicesUpdatesWidget extends StatefulWidget {
  final Future<ServicesResponse> servicesResponse;
+  final bool enabled;

-  const ServicesUpdatesWidget(this.servicesResponse, {super.key});
+  const ServicesUpdatesWidget(this.servicesResponse, {super.key, required this.enabled});

  @override
  State<ServicesUpdatesWidget> createState() => _ServicesUpdatesWidgetState();
@ -24,6 +28,27 @@ class _ServicesUpdatesWidgetState extends State<ServicesUpdatesWidget> {

  @override
  Widget build(BuildContext context) {
+    if (!widget.enabled) {
+      return InkWell(
+        onTap: () async {
+          await showPopUp<void>(
+              context: context,
+              builder: (BuildContext context) {
+                return AlertWithOneAction(
+                  alertTitle: S.current.service_health_disabled,
+                  alertContent: S.current.service_health_disabled_message,
+                  buttonText: S.current.ok,
+                  buttonAction: () => Navigator.of(context).pop(),
+                );
+              });
+        },
+        child: SvgPicture.asset(
+          "assets/images/notification_icon.svg",
+          color: Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
+          width: 30,
+        ),
+      );
+    }
    return Padding(
      padding: const EdgeInsets.all(8.0),
      child: FutureBuilder<ServicesResponse>(
--- a/lib/view_model/dashboard/dashboard_view_model.dart
+++ b/lib/view_model/dashboard/dashboard_view_model.dart
@ -574,4 +574,8 @@ abstract class DashboardViewModelBase with Store {
      return ServicesResponse([], false, '');
    }
  }
+
+  Future<void> refreshDashboard() async {
+    reconnect();
+  }
 }
--- a/lib/view_model/wallet_keys_view_model.dart
+++ b/lib/view_model/wallet_keys_view_model.dart
@ -1,3 +1,4 @@
+import 'package:cake_wallet/bitcoin/bitcoin.dart';
 import 'package:cake_wallet/reactions/wallet_connect.dart';
 import 'package:cake_wallet/store/app_store.dart';
 import 'package:cw_core/transaction_direction.dart';
@ -105,7 +106,15 @@ abstract class WalletKeysViewModelBase with Store {
        _appStore.wallet!.type == WalletType.lightning ||
        _appStore.wallet!.type == WalletType.litecoin ||
        _appStore.wallet!.type == WalletType.bitcoinCash) {
+      // final keys = bitcoin!.getWalletKeys(_appStore.wallet!);
+
      items.addAll([
+        // if (keys['wif'] != null)
+        //   StandartListItem(title: "WIF", value: keys['wif']!),
+        // if (keys['privateKey'] != null)
+        //   StandartListItem(title: S.current.private_key, value: keys['privateKey']!),
+        // if (keys['publicKey'] != null)
+        //   StandartListItem(title: S.current.public_key, value: keys['publicKey']!),
        StandartListItem(title: S.current.wallet_seed, value: _appStore.wallet!.seed!),
      ]);
    }
--- a/pubspec_base.yaml
+++ b/pubspec_base.yaml
@ -104,7 +104,7 @@ dependencies:
 #      ref: main
  socks5_proxy: ^1.0.4
  flutter_svg: ^2.0.9
-  polyseed: ^0.0.2
+  polyseed: ^0.0.4
  nostr_tools: ^1.0.9
  solana: ^0.30.1
  bitcoin_base:
--- a/res/values/strings_ar.arb
+++ b/res/values/strings_ar.arb
@ -592,6 +592,8 @@
  "send_your_wallet": "محفظتك",
  "sending": "يتم الإرسال",
  "sent": "تم الأرسال",
+  "service_health_disabled": "تم تعطيل نشرة صحة الخدمة",
+  "service_health_disabled_message": "هذه هي صفحة نشرة صحة الخدمة ، يمكنك تمكين هذه الصفحة ضمن الإعدادات -> الخصوصية",
  "settings": "إعدادات",
  "settings_all": "الكل",
  "settings_allow_biometrical_authentication": "السماح بالمصادقة البيومترية",
--- a/res/values/strings_bg.arb
+++ b/res/values/strings_bg.arb
@ -592,6 +592,8 @@
  "send_your_wallet": "Вашият портфейл",
  "sending": "Изпращане",
  "sent": "Изпратени",
+  "service_health_disabled": "Service Health Bulletin е деактивиран",
+  "service_health_disabled_message": "Това е страницата на Bulletin на Service Health, можете да активирате тази страница в Настройки -> Поверителност",
  "settings": "Настройки",
  "settings_all": "Всичко",
  "settings_allow_biometrical_authentication": "Позволяване на биометрично удостоверяване.",
--- a/res/values/strings_cs.arb
+++ b/res/values/strings_cs.arb
@ -592,6 +592,8 @@
  "send_your_wallet": "Vaše peněženka",
  "sending": "Odesílání",
  "sent": "Odesláno",
+  "service_health_disabled": "Bulletin zdraví služeb je deaktivován",
+  "service_health_disabled_message": "Toto je stránka Bulletin Service Health Bulletin, můžete tuto stránku povolit v rámci nastavení -> Ochrana osobních údajů",
  "settings": "Nastavení",
  "settings_all": "VŠE",
  "settings_allow_biometrical_authentication": "Povolit biometrické ověření",
--- a/res/values/strings_de.arb
+++ b/res/values/strings_de.arb
@ -593,6 +593,8 @@
  "send_your_wallet": "Ihre Wallet",
  "sending": "Senden",
  "sent": "Versendet",
+  "service_health_disabled": "Service Health Bulletin ist behindert",
+  "service_health_disabled_message": "Dies ist die Seite \"Service Health Bulletin\", können Sie diese Seite unter Einstellungen -> Privatsphäre aktivieren",
  "settings": "Einstellungen",
  "settings_all": "ALLE",
  "settings_allow_biometrical_authentication": "Biometrische Authentifizierung zulassen",
--- a/res/values/strings_en.arb
+++ b/res/values/strings_en.arb
@ -592,6 +592,8 @@
  "send_your_wallet": "Your wallet",
  "sending": "Sending",
  "sent": "Sent",
+  "service_health_disabled": "Service Health Bulletin is disabled",
+  "service_health_disabled_message": "This is the service health bulletin page, you can enable this page under Settings -> Privacy",
  "settings": "Settings",
  "settings_all": "ALL",
  "settings_allow_biometrical_authentication": "Allow biometrical authentication",
--- a/res/values/strings_es.arb
+++ b/res/values/strings_es.arb
@ -593,6 +593,8 @@
  "send_your_wallet": "Tu billetera",
  "sending": "Enviando",
  "sent": "Expedido",
+  "service_health_disabled": "El boletín de salud del servicio está deshabilitado",
+  "service_health_disabled_message": "Esta es la página del Boletín de Salud del Servicio, puede habilitar esta página en Configuración -> Privacidad",
  "settings": "Configuraciones",
  "settings_all": "TODOS",
  "settings_allow_biometrical_authentication": "Permitir autenticación biométrica",
--- a/res/values/strings_fr.arb
+++ b/res/values/strings_fr.arb
@ -592,6 +592,8 @@
  "send_your_wallet": "Votre portefeuille (wallet)",
  "sending": "Envoi",
  "sent": "Envoyés",
+  "service_health_disabled": "Le bulletin de santé du service est handicapé",
+  "service_health_disabled_message": "Ceci est la page du Bulletin de santé du service, vous pouvez activer cette page sous Paramètres -> Confidentialité",
  "settings": "Paramètres",
  "settings_all": "TOUT",
  "settings_allow_biometrical_authentication": "Autoriser l'authentification biométrique",
--- a/res/values/strings_ha.arb
+++ b/res/values/strings_ha.arb
@ -594,6 +594,8 @@
  "send_your_wallet": "Walat ɗin ku",
  "sending": "Aika",
  "sent": "Aika",
+  "service_health_disabled": "Ba a kashe Bayar da Kiwon Lafiya",
+  "service_health_disabled_message": "Wannan shafin yanar gizo mai kula da sabis ne, zaka iya kunna wannan shafin a karkashin saiti -> Sirri",
  "settings": "Saiti",
  "settings_all": "DUK",
  "settings_allow_biometrical_authentication": "Bada izinin tantance sawun yatsa",
--- a/res/values/strings_hi.arb
+++ b/res/values/strings_hi.arb
@ -594,6 +594,8 @@
  "send_your_wallet": "आपका बटुआ",
  "sending": "भेजना",
  "sent": "भेज दिया",
+  "service_health_disabled": "सेवा स्वास्थ्य बुलेटिन अक्षम है",
+  "service_health_disabled_message": "यह सेवा स्वास्थ्य बुलेटिन पृष्ठ है, आप इस पृष्ठ को सेटिंग्स के तहत सक्षम कर सकते हैं -> गोपनीयता",
  "settings": "समायोजन",
  "settings_all": "सब",
  "settings_allow_biometrical_authentication": "बायोमेट्रिक प्रमाणीकरण की अनुमति दें",
--- a/res/values/strings_hr.arb
+++ b/res/values/strings_hr.arb
@ -592,6 +592,8 @@
  "send_your_wallet": "Tvoj novčanik",
  "sending": "Slanje",
  "sent": "Poslano",
+  "service_health_disabled": "Zdravstveni bilten usluge je onemogućen",
+  "service_health_disabled_message": "Ovo je stranica zdravstvenog biltena o usluzi, možete omogućiti ovu stranicu pod postavkama -> privatnost",
  "settings": "Postavke",
  "settings_all": "SVE",
  "settings_allow_biometrical_authentication": "Dopusti biometrijsku autentifikaciju",
--- a/res/values/strings_id.arb
+++ b/res/values/strings_id.arb
@ -595,6 +595,8 @@
  "send_your_wallet": "Dompetmu",
  "sending": "Mengirim",
  "sent": "Dikirim",
+  "service_health_disabled": "Buletin Kesehatan Layanan dinonaktifkan",
+  "service_health_disabled_message": "Ini adalah halaman Buletin Kesehatan Layanan, Anda dapat mengaktifkan halaman ini di bawah Pengaturan -> Privasi",
  "settings": "Pengaturan",
  "settings_all": "SEMUA",
  "settings_allow_biometrical_authentication": "Izinkan otentikasi biometrik",
--- a/res/values/strings_it.arb
+++ b/res/values/strings_it.arb
@ -594,6 +594,8 @@
  "send_your_wallet": "Il tuo portafoglio",
  "sending": "Invio",
  "sent": "Inviato",
+  "service_health_disabled": "Il Bollettino sanitario di servizio è disabilitato",
+  "service_health_disabled_message": "Questa è la pagina del Bollettino sanitario del servizio, è possibile abilitare questa pagina in Impostazioni -> Privacy",
  "settings": "Impostazioni",
  "settings_all": "TUTTO",
  "settings_allow_biometrical_authentication": "Consenti autenticazione biometrica",
--- a/res/values/strings_ja.arb
+++ b/res/values/strings_ja.arb
@ -592,6 +592,8 @@
  "send_your_wallet": "あなたの財布",
  "sending": "送信",
  "sent": "送信済み",
+  "service_health_disabled": "サービスヘルス速報は無効です",
+  "service_health_disabled_message": "これはService Health Bulletinページです。設定の下でこのページを有効にすることができます - >プライバシー",
  "settings": "設定",
  "settings_all": "すべて",
  "settings_allow_biometrical_authentication": "生体認証を許可する",
--- a/res/values/strings_ko.arb
+++ b/res/values/strings_ko.arb
@ -593,6 +593,8 @@
  "send_your_wallet": "지갑",
  "sending": "배상",
  "sent": "보냄",
+  "service_health_disabled": "서비스 건강 게시판이 장애가되었습니다",
+  "service_health_disabled_message": "이것은 서비스 건강 게시판 페이지입니다. 설정 에서이 페이지를 활성화 할 수 있습니다 -> 개인 정보",
  "settings": "설정",
  "settings_all": "모든",
  "settings_allow_biometrical_authentication": "생체 인증 허용",
--- a/res/values/strings_my.arb
+++ b/res/values/strings_my.arb
@ -592,6 +592,8 @@
  "send_your_wallet": "သင့်ပိုက်ဆံအိတ်",
  "sending": "ပေးပို့ခြင်း။",
  "sent": "ပို့လိုက်ပါတယ်။",
+  "service_health_disabled": "ဝန်ဆောင်မှုကျန်းမာရေးစာစောင်အားပိတ်ထားသည်",
+  "service_health_disabled_message": "ဤသည်မှာ 0 န်ဆောင်မှုကျန်းမာရေးစာစောင်စာမျက်နှာတွင်ဤစာမျက်နှာကို Settings အောက်တွင်ဖွင့်ထားနိုင်သည်",
  "settings": "ဆက်တင်များ",
  "settings_all": "အားလုံး",
  "settings_allow_biometrical_authentication": "ဇီဝဗေဒဆိုင်ရာ အထောက်အထားစိစစ်ခြင်းကို ခွင့်ပြုပါ။",
--- a/res/values/strings_nl.arb
+++ b/res/values/strings_nl.arb
@ -592,6 +592,8 @@
  "send_your_wallet": "Uw portemonnee",
  "sending": "Bezig met verzenden",
  "sent": "Verzonden",
+  "service_health_disabled": "Service Health Bulletin is uitgeschakeld",
+  "service_health_disabled_message": "Dit is de Service Health Bulletin -pagina, u kunt deze pagina instellingen inschakelen -> Privacy",
  "settings": "Instellingen",
  "settings_all": "ALLE",
  "settings_allow_biometrical_authentication": "Biometrische authenticatie toestaan",
--- a/res/values/strings_pl.arb
+++ b/res/values/strings_pl.arb
@ -592,6 +592,8 @@
  "send_your_wallet": "Twój portfel",
  "sending": "Wysyłanie",
  "sent": "Wysłano",
+  "service_health_disabled": "Biuletyn zdrowia usług jest wyłączony",
+  "service_health_disabled_message": "To jest strona Biuletynu Zdrowie Service, możesz włączyć tę stronę w Ustawieniach -> Prywatność",
  "settings": "Ustawienia",
  "settings_all": "Wszystkie",
  "settings_allow_biometrical_authentication": "Zezwalaj na uwierzytelnianie biometryczne",
--- a/res/values/strings_pt.arb
+++ b/res/values/strings_pt.arb
@ -594,6 +594,8 @@
  "send_your_wallet": "Sua carteira",
  "sending": "Enviando",
  "sent": "Enviada",
+  "service_health_disabled": "O Boletim de Saúde de Serviço está desativado",
+  "service_health_disabled_message": "Esta é a página do Boletim de Saúde de Serviço, você pode ativar esta página em Configurações -> Privacidade",
  "settings": "Configurações",
  "settings_all": "Tudo",
  "settings_allow_biometrical_authentication": "Permitir autenticação biométrica",
--- a/res/values/strings_ru.arb
+++ b/res/values/strings_ru.arb
@ -593,6 +593,8 @@
  "send_your_wallet": "Ваш кошелёк",
  "sending": "Отправка",
  "sent": "Отправленные",
+  "service_health_disabled": "Бюллетень для здоровья обслуживания инвалид",
+  "service_health_disabled_message": "Это страница бюллетени обслуживания услуг, вы можете включить эту страницу в соответствии с настройками -> Конфиденциальность",
  "settings": "Настройки",
  "settings_all": "ВСЕ",
  "settings_allow_biometrical_authentication": "Включить биометрическую аутентификацию",
--- a/res/values/strings_th.arb
+++ b/res/values/strings_th.arb
@ -592,6 +592,8 @@
  "send_your_wallet": "กระเป๋าของคุณ",
  "sending": "กำลังส่ง",
  "sent": "ส่ง",
+  "service_health_disabled": "Service Health Bulletin ถูกปิดใช้งาน",
+  "service_health_disabled_message": "นี่คือหน้า Service Health Bulletin คุณสามารถเปิดใช้งานหน้านี้ภายใต้การตั้งค่า -> ความเป็นส่วนตัว",
  "settings": "การตั้งค่า",
  "settings_all": "ทั้งหมด",
  "settings_allow_biometrical_authentication": "อนุญาตให้ใช้การยืนยันตัวตนทางระบบชีวภาพ",
--- a/res/values/strings_tl.arb
+++ b/res/values/strings_tl.arb
@ -592,6 +592,8 @@
  "send_your_wallet": "Iyong pitaka",
  "sending": "Pagpapadala",
  "sent": "Ipinadala",
+  "service_health_disabled": "Hindi pinagana ang Bulletin ng Serbisyo sa Kalusugan",
+  "service_health_disabled_message": "Ito ang pahina ng Bulletin ng Serbisyo ng Bulletin, maaari mong paganahin ang pahinang ito sa ilalim ng Mga Setting -> Pagkapribado",
  "settings": "Mga setting",
  "settings_all": "Lahat",
  "settings_allow_biometrical_authentication": "Payagan ang pagpapatunay ng biometrical",
--- a/res/values/strings_tr.arb
+++ b/res/values/strings_tr.arb
@ -592,6 +592,8 @@
  "send_your_wallet": "Cüzdanın",
  "sending": "Gönderiliyor",
  "sent": "Gönderildi",
+  "service_health_disabled": "Service Health Bülten devre dışı bırakıldı",
+  "service_health_disabled_message": "Bu Hizmet Sağlığı Bülten Sayfası, bu sayfayı Ayarlar -> Gizlilik altında etkinleştirebilirsiniz",
  "settings": "ayarlar",
  "settings_all": "HEPSİ",
  "settings_allow_biometrical_authentication": "Biyometrik doğrulamaya izin ver",
--- a/res/values/strings_uk.arb
+++ b/res/values/strings_uk.arb
@ -593,6 +593,8 @@
  "send_your_wallet": "Ваш гаманець",
  "sending": "Відправлення",
  "sent": "Відправлені",
+  "service_health_disabled": "Вісник охорони здоров'я інвалідів",
+  "service_health_disabled_message": "Це сторінка бюлетеня Health Service, ви можете включити цю сторінку в налаштуваннях -> конфіденційність",
  "settings": "Налаштування",
  "settings_all": "ВСІ",
  "settings_allow_biometrical_authentication": "Включити біометричну аутентифікацію",
--- a/res/values/strings_ur.arb
+++ b/res/values/strings_ur.arb
@ -594,6 +594,8 @@
  "send_your_wallet": "آپ کا بٹوہ",
  "sending": "بھیج رہا ہے۔",
  "sent": "بھیجا",
+  "service_health_disabled": "سروس ہیلتھ بلیٹن غیر فعال ہے",
+  "service_health_disabled_message": "یہ سروس ہیلتھ بلیٹن پیج ہے ، آپ اس صفحے کو ترتیبات کے تحت اہل بنا سکتے ہیں -> رازداری",
  "settings": "ترتیبات",
  "settings_all": "تمام",
  "settings_allow_biometrical_authentication": "بایومیٹریکل تصدیق کی اجازت دیں۔",
--- a/res/values/strings_yo.arb
+++ b/res/values/strings_yo.arb
@ -593,6 +593,8 @@
  "send_your_wallet": "Àpamọ́wọ́ yín",
  "sending": "Ó ń ránṣẹ́",
  "sent": "Owó t'á ti ránṣẹ́",
+  "service_health_disabled": "IPỌRỌ IWE TI AGBARA TI O LE RẸ",
+  "service_health_disabled_message": "Eyi ni oju-iwe Iwe itẹlera Iṣẹ Ile-iṣẹ Iṣẹ: O le mu oju-iwe yii ṣiṣẹ labẹ Eto -> Asiri",
  "settings": "Awọn aseṣe",
  "settings_all": "Gbogbo",
  "settings_allow_biometrical_authentication": "Fi àyè gba ìfẹ̀rílàdí biometrical",
--- a/res/values/strings_zh.arb
+++ b/res/values/strings_zh.arb
@ -592,6 +592,8 @@
  "send_your_wallet": "你的钱包",
  "sending": "正在发送",
  "sent": "已发送",
+  "service_health_disabled": "服务健康公告被禁用",
+  "service_health_disabled_message": "这是服务健康公告页面，您可以在设置 - >隐私下启用此页面",
  "settings": "设置",
  "settings_all": "全部",
  "settings_allow_biometrical_authentication": "允许生物识别认证",
--- a/scripts/android/app_env.sh
+++ b/scripts/android/app_env.sh
@ -15,15 +15,15 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
 APP_ANDROID_TYPE=$1

 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="1.12.1"
-MONERO_COM_BUILD_NUMBER=80
+MONERO_COM_VERSION="1.12.2"
+MONERO_COM_BUILD_NUMBER=82
 MONERO_COM_BUNDLE_ID="com.monero.app"
 MONERO_COM_PACKAGE="com.monero.app"
 MONERO_COM_SCHEME="monero.com"

 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="4.15.3"
-CAKEWALLET_BUILD_NUMBER=202
+CAKEWALLET_VERSION="4.15.4"
+CAKEWALLET_BUILD_NUMBER=204
 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
 CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
 CAKEWALLET_SCHEME="cakewallet"
--- a/scripts/ios/app_env.sh
+++ b/scripts/ios/app_env.sh
@ -13,13 +13,13 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
 APP_IOS_TYPE=$1

 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="1.12.1"
-MONERO_COM_BUILD_NUMBER=77
+MONERO_COM_VERSION="1.12.2"
+MONERO_COM_BUILD_NUMBER=79
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"

 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="4.16.0"
-CAKEWALLET_BUILD_NUMBER=226
+CAKEWALLET_VERSION="4.15.4"
+CAKEWALLET_BUILD_NUMBER=228
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"

 HAVEN_NAME="Haven"
--- a/scripts/macos/app_env.sh
+++ b/scripts/macos/app_env.sh
@ -16,13 +16,13 @@ if [ -n "$1" ]; then
 fi

 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="1.2.1"
-MONERO_COM_BUILD_NUMBER=11
+MONERO_COM_VERSION="1.2.2"
+MONERO_COM_BUILD_NUMBER=13
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"

 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="1.8.3"
-CAKEWALLET_BUILD_NUMBER=61
+CAKEWALLET_VERSION="1.8.4"
+CAKEWALLET_BUILD_NUMBER=63
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"

 if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then