From 7c801eb0f255807f20fd2d8006a153d3ed4edd0c Mon Sep 17 00:00:00 2001
From: Jonathan Rainville <rainville.jonathan@gmail.com>
Date: Fri, 28 Jun 2024 14:13:02 -0400
Subject: [PATCH] fix(airdrop): fix lost info when closing password in airdrop
 flow

Fixes #15383
---
 ui/app/AppLayouts/Communities/panels/AirdropsSettingsPanel.qml | 1 -
 ui/app/AppLayouts/Communities/views/CommunitySettingsView.qml  | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/app/AppLayouts/Communities/panels/AirdropsSettingsPanel.qml b/ui/app/AppLayouts/Communities/panels/AirdropsSettingsPanel.qml
index 0713b59595..89a46a8658 100644
--- a/ui/app/AppLayouts/Communities/panels/AirdropsSettingsPanel.qml
+++ b/ui/app/AppLayouts/Communities/panels/AirdropsSettingsPanel.qml
@@ -123,7 +123,6 @@ StackView {
 
                 onAirdropClicked: {
                     root.airdropClicked(airdropTokens, addresses, feeAccountAddress)
-                    root.pop(StackView.Immediate)
                 }
 
                 onNavigateToMintTokenSettings: root.navigateToMintTokenSettings(isAssetType)
diff --git a/ui/app/AppLayouts/Communities/views/CommunitySettingsView.qml b/ui/app/AppLayouts/Communities/views/CommunitySettingsView.qml
index 1d858f9922..d724917ef0 100644
--- a/ui/app/AppLayouts/Communities/views/CommunitySettingsView.qml
+++ b/ui/app/AppLayouts/Communities/views/CommunitySettingsView.qml
@@ -712,6 +712,7 @@ StatusSectionLayout {
             case Constants.ContractTransactionStatus.InProgress:
                 title = qsTr("Airdrop on %1 in progress...").arg(chainName)
                 loading = true
+                airdropPanel.navigateBack()
                 break
             case Constants.ContractTransactionStatus.Completed:
                 title = qsTr("Airdrop on %1 in complete").arg(chainName)