From 402ea8fbd43c52ecbe64f79dd8bfc2d76649bf06 Mon Sep 17 00:00:00 2001
From: Piyal Basu <pbasu235@gmail.com>
Date: Tue, 12 Jul 2022 18:10:42 -0400
Subject: [PATCH] fix validation issues; fix typo; rm Add Asset btn

---
 .../manageAssets/ChooseAsset/index.tsx        | 16 +++++----
 .../manageAssets/ManageAssetRows/index.tsx    | 33 +++++++++++++------
 .../sendPayment/SendAmount/index.tsx          |  5 ++-
 .../src/popup/views/PinExtension/index.tsx    |  2 +-
 .../src/popup/views/RecoverAccount/index.tsx  | 24 ++++++++++----
 5 files changed, 54 insertions(+), 26 deletions(-)

diff --git a/extension/src/popup/components/manageAssets/ChooseAsset/index.tsx b/extension/src/popup/components/manageAssets/ChooseAsset/index.tsx
index 1234d97a68..20158513fd 100644
--- a/extension/src/popup/components/manageAssets/ChooseAsset/index.tsx
+++ b/extension/src/popup/components/manageAssets/ChooseAsset/index.tsx
@@ -120,13 +120,15 @@ export const ChooseAsset = ({
             />
           )}
         </div>
-        <div className="ChooseAsset__button">
-          <Link to={ROUTES.searchAsset}>
-            <Button fullWidth variant={Button.variant.tertiary}>
-              {t("Add another asset")}
-            </Button>
-          </Link>
-        </div>
+        {!selectingAssetType && (
+          <div className="ChooseAsset__button">
+            <Link to={ROUTES.searchAsset}>
+              <Button fullWidth variant={Button.variant.tertiary}>
+                {t("Add another asset")}
+              </Button>
+            </Link>
+          </div>
+        )}
       </div>
     </div>
   );
diff --git a/extension/src/popup/components/manageAssets/ManageAssetRows/index.tsx b/extension/src/popup/components/manageAssets/ManageAssetRows/index.tsx
index ee5f080b58..74652eac75 100644
--- a/extension/src/popup/components/manageAssets/ManageAssetRows/index.tsx
+++ b/extension/src/popup/components/manageAssets/ManageAssetRows/index.tsx
@@ -99,22 +99,27 @@ export const ManageAssetRows = ({
       .build()
       .toXDR();
 
+    const trackChangeTrustline = () => {
+      emitMetric(
+        addTrustline
+          ? METRIC_NAMES.manageAssetAddAsset
+          : METRIC_NAMES.manageAssetRemoveAsset,
+        { assetCode, assetIssuer },
+      );
+    };
+
     if (isHardwareWallet) {
       await dispatch(startHwSign({ transactionXDR }));
+      trackChangeTrustline();
     } else {
-      await signAndSubmit(transactionXDR);
-      dispatch(resetSubmission());
-      navigateTo(ROUTES.account);
+      await signAndSubmit(transactionXDR, trackChangeTrustline);
     }
-    emitMetric(
-      addTrustline
-        ? METRIC_NAMES.manageAssetAddAsset
-        : METRIC_NAMES.manageAssetRemoveAsset,
-      { assetCode, assetIssuer },
-    );
   };
 
-  const signAndSubmit = async (transactionXDR: string) => {
+  const signAndSubmit = async (
+    transactionXDR: string,
+    trackChangeTrustline: () => void,
+  ) => {
     const res = await dispatch(
       signFreighterTransaction({
         transactionXDR,
@@ -138,6 +143,14 @@ export const ManageAssetRows = ({
             networkDetails,
           }),
         );
+        trackChangeTrustline();
+        dispatch(resetSubmission());
+        navigateTo(ROUTES.account);
+      }
+
+      if (submitFreighterTransaction.rejected.match(submitResp)) {
+        setErrorAsset(assetSubmitting);
+        navigateTo(ROUTES.trustlineError);
       }
     }
   };
diff --git a/extension/src/popup/components/sendPayment/SendAmount/index.tsx b/extension/src/popup/components/sendPayment/SendAmount/index.tsx
index c2dc7db981..40ab2de218 100644
--- a/extension/src/popup/components/sendPayment/SendAmount/index.tsx
+++ b/extension/src/popup/components/sendPayment/SendAmount/index.tsx
@@ -416,7 +416,10 @@ export const SendAmount = ({
             <div className="SendAmount__btn-continue">
               <Button
                 disabled={
-                  loadingRate || formik.values.amount === "0" || !formik.isValid
+                  loadingRate ||
+                  formik.values.amount === "0" ||
+                  !formik.isValid ||
+                  !destinationAmount
                 }
                 fullWidth
                 variant={Button.variant.tertiary}
diff --git a/extension/src/popup/views/PinExtension/index.tsx b/extension/src/popup/views/PinExtension/index.tsx
index 91095a62d3..6001b501b1 100644
--- a/extension/src/popup/views/PinExtension/index.tsx
+++ b/extension/src/popup/views/PinExtension/index.tsx
@@ -30,7 +30,7 @@ export const PinExtension = () => {
             <img src={ExtensionsMenu} alt="Extensions Menu" />
           </div>
           <div className="PinExtension__caption">
-            2. {t("Click on Freighter’s pin button to have it always visibile")}
+            2. {t("Click on Freighter’s pin button to have it always visible")}
           </div>
           <div className="PinExtension__img">
             <img src={ExtensionsPin} alt="Extensions Pin" />
diff --git a/extension/src/popup/views/RecoverAccount/index.tsx b/extension/src/popup/views/RecoverAccount/index.tsx
index 2f03b54af9..c2500552cd 100644
--- a/extension/src/popup/views/RecoverAccount/index.tsx
+++ b/extension/src/popup/views/RecoverAccount/index.tsx
@@ -7,6 +7,11 @@ import { useTranslation } from "react-i18next";
 
 import { Button } from "popup/basics/buttons/Button";
 import { Onboarding } from "popup/components/Onboarding";
+import { FormError, FormRows, SubmitButtonWrapper } from "popup/basics/Forms";
+import { FullscreenStyle } from "popup/components/FullscreenStyle";
+import { Header } from "popup/components/Header";
+import { PasswordRequirements } from "popup/components/PasswordRequirements";
+
 import { ROUTES } from "popup/constants/routes";
 import { navigateTo } from "popup/helpers/navigate";
 import {
@@ -19,10 +24,6 @@ import {
   publicKeySelector,
   recoverAccount,
 } from "popup/ducks/accountServices";
-import { FormRows, SubmitButtonWrapper } from "popup/basics/Forms";
-import { FullscreenStyle } from "popup/components/FullscreenStyle";
-import { Header } from "popup/components/Header";
-import { PasswordRequirements } from "popup/components/PasswordRequirements";
 
 import "./styles.scss";
 
@@ -65,6 +66,9 @@ const PhraseInput = ({
   );
 };
 
+const buildMnemonicPhrase = (mnemonicPhraseArr: string[]) =>
+  mnemonicPhraseArr.join(" ").trim();
+
 export const RecoverAccount = () => {
   interface FormValues {
     password: string;
@@ -99,7 +103,7 @@ export const RecoverAccount = () => {
     await dispatch(
       recoverAccount({
         password,
-        mnemonicPhrase: mnemonicPhraseArr.join(" ").trim(),
+        mnemonicPhrase: buildMnemonicPhrase(mnemonicPhraseArr),
       }),
     );
   };
@@ -157,7 +161,7 @@ export const RecoverAccount = () => {
                       />
                     ))}
                   </div>
-                  <div>{authError}</div>
+                  <FormError>{authError}</FormError>
                 </div>
                 <div className="RecoverAccount__half-screen">
                   <FormRows>
@@ -218,7 +222,13 @@ export const RecoverAccount = () => {
                     <Button
                       fullWidth
                       isLoading={isSubmitting}
-                      disabled={!(dirty && isValid)}
+                      disabled={
+                        !(
+                          dirty &&
+                          isValid &&
+                          buildMnemonicPhrase(mnemonicPhraseArr).length
+                        )
+                      }
                     >
                       {t("IMPORT")}
                     </Button>