code review changes

mozilla-mobile · Jan 4, 2024 · 5d0c10e · 5d0c10e
1 parent 51f5de7
commit 5d0c10e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/nebula/ui/components/MZMenu.qml b/nebula/ui/components/MZMenu.qml
@@ -103,11 +103,11 @@ Item {
 
         sourceComponent: menuBar.rightButtonComponent
         onItemChanged: {
-            //item.item is for right button components that might be inside a loder itself
-            if (item instanceof Text || item.item instanceof Text) {
+            //item.item is for right button components that might be inside a loader itself
+            if (item instanceof Text || (item instanceof Loader && item.item instanceof Text)) {
                 anchors.rightMargin = MZTheme.theme.windowMargin
             }
-            else if(item instanceof MZIconButton || item.item instanceof MZIconButton) {
+            else if(item instanceof MZIconButton || (item instanceof Loader && item.item instanceof MZIconButton)) {
                 anchors.rightMargin = MZTheme.theme.windowMargin / 2
             }
         }

diff --git a/src/constants.h b/src/constants.h
@@ -205,6 +205,9 @@ constexpr const char* APPLE_SUBSCRIPTIONS_URL =
 constexpr const char* GOOGLE_SUBSCRIPTIONS_URL =
     "https://play.google.com/store/account/subscriptions";
 
+constexpr const char* SUMO_DNS = "https://support.mozilla.org/en-US/kb/"
+    "how-do-i-change-my-dns-settings";
+
 #define PRODBETAEXPR(type, functionName, prod, beta) \
   inline type functionName() { return Constants::inProduction() ? prod : beta; }
 

diff --git a/src/mozillavpn.cpp b/src/mozillavpn.cpp
@@ -1383,8 +1383,7 @@ void MozillaVPN::registerUrlOpenerLabels() {
   });
 
   uo->registerUrlLabel("sumoDns", []() -> QString {
-    return "https://support.mozilla.org/en-US/kb/"
-           "how-do-i-change-my-dns-settings";
+    return Constants::SUMO_DNS;
   });
 }
 

diff --git a/src/ui/screens/settings/ViewDNSSettings.qml b/src/ui/screens/settings/ViewDNSSettings.qml
@@ -28,7 +28,6 @@ MZViewBase {
                 onClicked: helpSheetLoader.active = true
 
                 accessibleName: MZI18n.GlobalHelp
-                Accessible.ignored: !visible
 
                 Image {
                     anchors.centerIn: parent