From f299c9df3afb477be7b51ce2b63487900d6f4174 Mon Sep 17 00:00:00 2001
From: Boris Melnik <borismelnik@status.im>
Date: Mon, 21 Mar 2022 16:50:16 +0300
Subject: [PATCH] fix(StatusQ.Popups): Replace TextEdit to StatusBaseInput for
 SearchPopup

Closes: https://github.com/status-im/status-desktop/issues/5059
---
 src/StatusQ/Controls/StatusBaseInput.qml | 7 ++++++-
 src/StatusQ/Popups/StatusSearchPopup.qml | 7 +++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/StatusQ/Controls/StatusBaseInput.qml b/src/StatusQ/Controls/StatusBaseInput.qml
index bcdae7d2..d35e38a3 100644
--- a/src/StatusQ/Controls/StatusBaseInput.qml
+++ b/src/StatusQ/Controls/StatusBaseInput.qml
@@ -51,6 +51,7 @@ Item {
     property bool pending: false
     property bool leftIcon: true
     property bool isIconSelectable: false
+    property bool showBackground: true
 
     property StatusIconSettings icon: StatusIconSettings {
         width: 24
@@ -84,13 +85,17 @@ Item {
                                                     root.implicitHeight,
                                                     minimumHeight) : root.implicitHeight,
                                          maximumHeight) : parent.height
-        color: Theme.palette.baseColor2
+        color: root.showBackground ? Theme.palette.baseColor2
+                                              : "transparent"
         radius: 8
 
         clip: true
 
         border.width: 1
         border.color: {
+            if (!root.showBackground) {
+                return "transparent"
+            }
             if (!root.valid && root.dirty) {
                 return Theme.palette.dangerColor1
             }
diff --git a/src/StatusQ/Popups/StatusSearchPopup.qml b/src/StatusQ/Popups/StatusSearchPopup.qml
index 0eb6aa10..f8403ccb 100644
--- a/src/StatusQ/Popups/StatusSearchPopup.qml
+++ b/src/StatusQ/Popups/StatusSearchPopup.qml
@@ -55,7 +55,7 @@ StatusModal {
     }
 
     function forceActiveFocus() {
-        contentItem.searchInput.forceActiveFocus()
+        contentItem.searchInput.edit.forceActiveFocus()
     }
 
     onOpened: {
@@ -85,7 +85,8 @@ StatusModal {
                     icon: "search"
                     color: Theme.palette.baseColor1
                 }
-                TextEdit {
+
+                StatusBaseInput {
                     id: inputText
                     anchors.left: statusIcon.right
                     anchors.leftMargin: 15
@@ -94,6 +95,8 @@ StatusModal {
                     anchors.verticalCenter: parent.verticalCenter
                     focus: true
                     font.pixelSize: 28
+                    clearable: true
+                    showBackground: false
                     font.family: Theme.palette.baseFont.name
                     color: Theme.palette.directColor1
                     Keys.onPressed: {