@@ -20,7 +20,6 @@ import Ubuntu.Components 1.1
2020import Unity.Notifications 1.0
2121import QMenuModel 0.1
2222import Utils 0.1
23−import "../Components/Flickables" as Flickables
2423
2524import Ubuntu.Components.ListItems 0.1 as ListItem
2625
@@ -335,7 +334,7 @@ Item {
335334
336335 spacing: contentSpacing
337336
338− visible: notification.type == Notification.SnapDecision && oneOverTwoRepeaterTop.count == 3
337+ visible: notification.type === Notification.SnapDecision && oneOverTwoRepeaterTop.count === 3
339338
340339 Repeater {
341340 id: oneOverTwoRepeaterTop
@@ -406,6 +405,7 @@ Item {
406405 layoutDirection: Qt.RightToLeft
407406
408407 SwipeToAct {
408+ id: notifySwipeButton
409409 objectName: "notify_swipe_button"
410410 visible: notification.hints["x-canonical-snap-decisions-swipe"] === "true"
411411 leftIconName: "call-end"
@@ -424,7 +424,6 @@ Item {
424424 Repeater {
425425 id: actionRepeater
426426 model: notification.actions
427− visible: notification.hints["x-canonical-snap-decisions-swipe"] !== "true"
428427 delegate: Loader {
429428 id: loader
430429
@@ -437,6 +436,7 @@ Item {
437436 Button {
438437 objectName: "notify_button" + index
439438 width: buttonRow.width / 2 - spacing * 2
439+ visible: !notifySwipeButton.visible
440440 text: loader.actionLabel
441441 color: {
442442 var result = sdDarkGrey;
@@ -472,7 +472,7 @@ Item {
472472 onClicked: notification.notification.invokeAction(comboRepeater.itemAt(2).actionId)
473473 expanded: false
474474 expandedHeight: (comboRepeater.count - 2) * units.gu(4) + units.gu(.5)
475− comboList: Flickables.Flickable {
475+ comboList: Flickable {
476476 // this has to be wrapped inside a flickable
477477 // to work around a feature/bug? of the
478478 // ComboButton SDK-element, making a regular