Fix two factor auth notification: 'Approve' link is a primary action.

Signed-off-by: Camila <[email protected]>
nextcloud · Sep 21, 2022 · 5766d32 · 5766d32
1 parent c6c49c8
commit 5766d32
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/gui/tray/ActivityActionButton.qml b/src/gui/tray/ActivityActionButton.qml
@@ -18,10 +18,12 @@ Item {
     property color textColor: Style.ncTextColor
     property color textColorHovered: Style.ncSecondaryTextColor
 
+    property bool primaryButton: false
+
     signal clicked()
 
     Loader {
-        active: root.imageSource === ""
+        active: root.imageSource === "" && !primaryButton
 
         anchors.fill: parent
 
@@ -38,7 +40,7 @@ Item {
     }
 
     Loader {
-        active: root.imageSource !== ""
+        active: root.imageSource !== "" || primaryButton
 
         anchors.fill: parent
 

diff --git a/src/gui/tray/ActivityItemActions.qml b/src/gui/tray/ActivityItemActions.qml
@@ -34,7 +34,7 @@ RowLayout {
             id: activityActionButton
 
             readonly property string verb: model.modelData.verb
-            readonly property bool primary: model.index === 0 && verb !== "DELETE"
+            readonly property bool primary: (model.index === 0 && verb !== "DELETE") || model.modelData.primary
             readonly property bool isTalkReplyButton: verb === "REPLY"
 
             Layout.minimumWidth: primary ? Style.activityItemActionPrimaryButtonMinWidth : Style.activityItemActionSecondaryButtonMinWidth
@@ -46,10 +46,11 @@ RowLayout {
             imageSource: model.modelData.imageSource ? model.modelData.imageSource + root.adjustedHeaderColor : ""
             imageSourceHover: model.modelData.imageSourceHovered ? model.modelData.imageSourceHovered + UserModel.currentUser.headerTextColor : ""
 
-            textColor: imageSource !== "" ? root.adjustedHeaderColor : Style.ncTextColor
-            textColorHovered: imageSource !== "" ? UserModel.currentUser.headerTextColor : Style.ncTextColor
+            textColor: imageSource !== "" || primary ? root.adjustedHeaderColor : Style.ncTextColor
+            textColorHovered: imageSource !== "" || primary ? UserModel.currentUser.headerTextColor : Style.ncTextColor
 
             bold: primary
+            primaryButton: primary
 
             onClicked: !isTalkReplyButton ? root.triggerAction(model.index) : root.showReplyField()
         }