From 1a8dfde1b28e73213d4a5f37fa774e679a7232bc Mon Sep 17 00:00:00 2001
From: Alexandra Betouni <alexandra.betouni@protonmail.com>
Date: Thu, 7 Apr 2022 23:07:52 +0300
Subject: [PATCH] fix(SetProfilePicture): title was empty on second opening

Closes #5237
---
 .../popups/UploadProfilePicModal.qml          | 21 +++++++------------
 .../Onboarding/views/InsertDetailsView.qml    |  1 +
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/ui/app/AppLayouts/Onboarding/popups/UploadProfilePicModal.qml b/ui/app/AppLayouts/Onboarding/popups/UploadProfilePicModal.qml
index 4cc518560c..32599bb536 100644
--- a/ui/app/AppLayouts/Onboarding/popups/UploadProfilePicModal.qml
+++ b/ui/app/AppLayouts/Onboarding/popups/UploadProfilePicModal.qml
@@ -4,6 +4,7 @@ import QtQuick.Dialogs 1.3
 import utils 1.0
 
 import StatusQ.Controls 0.1
+import StatusQ.Popups 0.1
 
 import shared 1.0
 import shared.panels 1.0
@@ -11,10 +12,11 @@ import shared.popups 1.0
 
 import "../stores"
 
-// TODO: replace with StatusModal
-ModalPopup {
+StatusModal {
     id: popup
-    title: qsTr("Upload profile picture")
+    height: 510
+    header.title: qsTr("Upload profile picture")
+
     property string selectedImage
     property string uploadError
 
@@ -25,9 +27,8 @@ ModalPopup {
         cropImageModal.open();
     }
 
-    Item {
+    contentItem: Item {
         anchors.fill: parent
-
         RoundedImage {
             id: profilePic
             source: selectedImage
@@ -64,15 +65,10 @@ ModalPopup {
         }
     }
 
-    footer: Item {
-        width: parent.width
-        height: uploadBtn.height
-
+    rightButtons: [
         StatusButton {
             id: uploadBtn
             text: !!selectedImage ? qsTr("Done") : qsTr("Upload")
-            anchors.right: parent.right
-            anchors.bottom: parent.bottom
             onClicked: {
                 if (!!selectedImage) {
                     close();
@@ -80,7 +76,6 @@ ModalPopup {
                     imageDialog.open();
                 }
             }
-
             FileDialog {
                 id: imageDialog
                 title: qsTrId("please-choose-an-image")
@@ -93,6 +88,6 @@ ModalPopup {
                 }
             }
         }
-    }
+    ]
 }
 
diff --git a/ui/app/AppLayouts/Onboarding/views/InsertDetailsView.qml b/ui/app/AppLayouts/Onboarding/views/InsertDetailsView.qml
index 1376ef9961..caa1b622a4 100644
--- a/ui/app/AppLayouts/Onboarding/views/InsertDetailsView.qml
+++ b/ui/app/AppLayouts/Onboarding/views/InsertDetailsView.qml
@@ -178,6 +178,7 @@ Item {
 
         UploadProfilePicModal {
             id: uploadProfilePicPopup
+            anchors.centerIn: parent
         }
     }