From a3979511e2e5875280e7efe2e3b15c6ec09b11ea Mon Sep 17 00:00:00 2001
From: Andrei Smirnov <andrei.smirnov@toptal.com>
Date: Tue, 20 Jul 2021 07:37:57 +0300
Subject: [PATCH] fix(@desktop/wallet): modal is not being closed when clicking
 Add Account

---
 ui/app/AppLayouts/Wallet/components/AddAccount.qml |  2 +-
 ui/shared/Input.qml                                |  4 ++--
 ui/shared/SVGImage.qml                             | 12 +++++-------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/ui/app/AppLayouts/Wallet/components/AddAccount.qml b/ui/app/AppLayouts/Wallet/components/AddAccount.qml
index e6573e1649..75f65bb41b 100644
--- a/ui/app/AppLayouts/Wallet/components/AddAccount.qml
+++ b/ui/app/AppLayouts/Wallet/components/AddAccount.qml
@@ -13,7 +13,7 @@ StatusRoundButton {
     width: 36
     height: 36
     readonly property var onAfterAddAccount: function() {
-        walletInfoContainer.changeSelectedAccount(walletModel.accounts.rowCount() - 1)
+        walletInfoContainer.changeSelectedAccount(walletModel.accountsView.accounts.rowCount() - 1)
     }
 
     onClicked: {
diff --git a/ui/shared/Input.qml b/ui/shared/Input.qml
index a0f135aff6..becb41a117 100644
--- a/ui/shared/Input.qml
+++ b/ui/shared/Input.qml
@@ -176,14 +176,14 @@ Item {
         visible: !!validationError
         id: validationErrorText
         text: validationError
-        anchors.top: inputRectangle.bottom
+        anchors.top: inputField.bottom
         anchors.topMargin: validationErrorTopMargin
         selectByMouse: true
         readOnly: true
         font.pixelSize: 12
         height: 16
         color: validationErrorColor
-        width: inputRectangle.width
+        width: inputField.width
         wrapMode: TextEdit.Wrap
     }
 }
diff --git a/ui/shared/SVGImage.qml b/ui/shared/SVGImage.qml
index cc895c4720..ec2d3b2702 100644
--- a/ui/shared/SVGImage.qml
+++ b/ui/shared/SVGImage.qml
@@ -1,11 +1,9 @@
 import QtQuick 2.13
 
 Image {
-  sourceSize.width: width
-  sourceSize.height: height
-
-  fillMode: Image.PreserveAspectFit
-
-  mipmap: true
-  antialiasing: true
+    sourceSize.width: width || undefined
+    sourceSize.height: height || undefined
+    fillMode: Image.PreserveAspectFit
+    mipmap: true
+    antialiasing: true
 }