From 63d88865e52ba86af29d5415fbba7a488e8e992b Mon Sep 17 00:00:00 2001
From: Mati Dastugue <matias.dastugue@altoros.com>
Date: Wed, 24 Mar 2021 05:44:20 -0300
Subject: [PATCH] Bugfix - Back button in modal resets form (#2075)

* Use initialValues on SendFunds modal

Co-authored-by: Daniel Sanchez <daniel.sanchez@gnosis.pm>
---
 .../safe/components/Balances/SendModal/index.tsx   |  1 +
 .../Balances/SendModal/screens/SendFunds/index.tsx | 14 +++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/routes/safe/components/Balances/SendModal/index.tsx b/src/routes/safe/components/Balances/SendModal/index.tsx
index 68a4e5ea..7623d9fa 100644
--- a/src/routes/safe/components/Balances/SendModal/index.tsx
+++ b/src/routes/safe/components/Balances/SendModal/index.tsx
@@ -133,6 +133,7 @@ const SendModal = ({
 
         {activeScreen === 'sendFunds' && (
           <SendFunds
+            initialValues={tx as ReviewTxProp}
             onClose={onClose}
             onReview={handleTxCreation}
             recipientAddress={recipientAddress}
diff --git a/src/routes/safe/components/Balances/SendModal/screens/SendFunds/index.tsx b/src/routes/safe/components/Balances/SendModal/screens/SendFunds/index.tsx
index f7f2b540..8a8db233 100644
--- a/src/routes/safe/components/Balances/SendModal/screens/SendFunds/index.tsx
+++ b/src/routes/safe/components/Balances/SendModal/screens/SendFunds/index.tsx
@@ -68,6 +68,7 @@ export type SendFundsTx = {
 }
 
 type SendFundsProps = {
+  initialValues: SendFundsTx
   onClose: () => void
   onReview: (txInfo: unknown) => void
   recipientAddress?: string
@@ -80,6 +81,7 @@ const InputAdornmentChildSymbol = ({ symbol }: { symbol?: string }): ReactElemen
 }
 
 const SendFunds = ({
+  initialValues,
   onClose,
   onReview,
   recipientAddress,
@@ -93,12 +95,14 @@ const SendFunds = ({
     const defaultEntry = { address: recipientAddress || '', name: '' }
 
     // if there's nothing to lookup for, we return the default entry
-    if (!recipientAddress) {
+    if (!initialValues?.recipientAddress && !recipientAddress) {
       return defaultEntry
     }
 
+    // if there's something to lookup for, `initialValues` has precedence over `recipientAddress`
+    const predefinedAddress = initialValues?.recipientAddress ?? recipientAddress
     const addressBookEntry = addressBook.find(({ address }) => {
-      return sameAddress(recipientAddress, address)
+      return sameAddress(predefinedAddress, address)
     })
 
     // if found in the Address Book, then we return the entry
@@ -170,7 +174,11 @@ const SendFunds = ({
       <Hairline />
       <GnoForm
         formMutators={formMutators}
-        initialValues={{ amount, recipientAddress, token: selectedToken }}
+        initialValues={{
+          amount: initialValues?.amount || amount,
+          recipientAddress: initialValues.recipientAddress || recipientAddress,
+          token: initialValues?.token || selectedToken,
+        }}
         onSubmit={handleSubmit}
         validation={sendFundsValidation}
       >