From 2b0ca58c35c2fe74fe4898259dfa3547c244ca98 Mon Sep 17 00:00:00 2001
From: Alec Charbonneau <aleccharb21@gmail.com>
Date: Fri, 20 May 2022 14:55:33 -0700
Subject: [PATCH 1/3] use recommended transaction fee by default

---
 .../SendSettings/TransactionFee/index.tsx            |  3 ++-
 .../components/sendPayment/SendSettings/index.tsx    | 12 +++++++++++-
 extension/src/popup/ducks/transactionSubmission.ts   |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/extension/src/popup/components/sendPayment/SendSettings/TransactionFee/index.tsx b/extension/src/popup/components/sendPayment/SendSettings/TransactionFee/index.tsx
index 6dd94ce01d..6adfe58dad 100644
--- a/extension/src/popup/components/sendPayment/SendSettings/TransactionFee/index.tsx
+++ b/extension/src/popup/components/sendPayment/SendSettings/TransactionFee/index.tsx
@@ -58,7 +58,7 @@ export const SendSettingsFee = () => {
             navigateTo(ROUTES.sendPaymentSettings);
           }}
         >
-          {({ setFieldValue }) => (
+          {({ setFieldValue, dirty }) => (
             <Form>
               <FormRows>
                 <Field name="transactionFee">
@@ -74,6 +74,7 @@ export const SendSettingsFee = () => {
                 <div className="TransactionFee__row">
                   <TextLink
                     underline
+                    disabled={!dirty && transactionFee === recommendedFee}
                     variant={TextLink.variant.secondary}
                     onClick={() =>
                       setFieldValue("transactionFee", recommendedFee)
diff --git a/extension/src/popup/components/sendPayment/SendSettings/index.tsx b/extension/src/popup/components/sendPayment/SendSettings/index.tsx
index 61dd03acb5..a140df685b 100644
--- a/extension/src/popup/components/sendPayment/SendSettings/index.tsx
+++ b/extension/src/popup/components/sendPayment/SendSettings/index.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useEffect } from "react";
 import { useSelector, useDispatch } from "react-redux";
 import { Formik, Form, Field, FieldProps } from "formik";
 import {
@@ -10,6 +10,7 @@ import {
 
 import { Button } from "popup/basics/buttons/Button";
 import { navigateTo } from "popup/helpers/navigate";
+import { useNetworkFees } from "popup/helpers/useNetworkFees";
 import { ROUTES } from "popup/constants/routes";
 import { PopupWrapper } from "popup/basics/PopupWrapper";
 import { SubviewHeader } from "popup/components/SubviewHeader";
@@ -18,6 +19,7 @@ import {
   saveMemo,
   transactionDataSelector,
   isPathPaymentSelector,
+  saveTransactionFee,
 } from "popup/ducks/transactionSubmission";
 
 import "../styles.scss";
@@ -28,6 +30,14 @@ export const SendSettings = ({ previous }: { previous: ROUTES }) => {
     transactionDataSelector,
   );
   const isPathPayment = useSelector(isPathPaymentSelector);
+  const { recommendedFee } = useNetworkFees();
+
+  // use default transaction fee if unset
+  useEffect(() => {
+    if (!transactionFee) {
+      dispatch(saveTransactionFee(recommendedFee));
+    }
+  }, [dispatch, recommendedFee, transactionFee]);
 
   return (
     <PopupWrapper>
diff --git a/extension/src/popup/ducks/transactionSubmission.ts b/extension/src/popup/ducks/transactionSubmission.ts
index 0eb2d70932..b0b8939a91 100644
--- a/extension/src/popup/ducks/transactionSubmission.ts
+++ b/extension/src/popup/ducks/transactionSubmission.ts
@@ -192,7 +192,7 @@ const initialState: InitialState = {
     asset: "native",
     destination: "",
     federationAddress: "",
-    transactionFee: "0.00001",
+    transactionFee: "",
     memo: "",
     destinationAsset: "",
     destinationAmount: "",

From 3e05fd3f4a68ad503367270f6c77d5b56173d7b7 Mon Sep 17 00:00:00 2001
From: Alec Charbonneau <aleccharb21@gmail.com>
Date: Mon, 23 May 2022 09:31:50 -0700
Subject: [PATCH 2/3] better conditional

---
 .../SendSettings/TransactionFee/index.tsx     | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/extension/src/popup/components/sendPayment/SendSettings/TransactionFee/index.tsx b/extension/src/popup/components/sendPayment/SendSettings/TransactionFee/index.tsx
index 6adfe58dad..f3732dd716 100644
--- a/extension/src/popup/components/sendPayment/SendSettings/TransactionFee/index.tsx
+++ b/extension/src/popup/components/sendPayment/SendSettings/TransactionFee/index.tsx
@@ -58,32 +58,34 @@ export const SendSettingsFee = () => {
             navigateTo(ROUTES.sendPaymentSettings);
           }}
         >
-          {({ setFieldValue, dirty }) => (
+          {({ setFieldValue }) => (
             <Form>
               <FormRows>
                 <Field name="transactionFee">
                   {({ field }: FieldProps) => (
-                    <Input
-                      id="transaction-fee-input"
-                      className="SendTo__input"
-                      type="number"
-                      {...field}
-                    ></Input>
+                    <>
+                      <Input
+                        id="transaction-fee-input"
+                        className="SendTo__input"
+                        type="number"
+                        {...field}
+                      ></Input>
+                      <div className="TransactionFee__row">
+                        <TextLink
+                          underline
+                          disabled={field.value === recommendedFee}
+                          variant={TextLink.variant.secondary}
+                          onClick={() =>
+                            setFieldValue("transactionFee", recommendedFee)
+                          }
+                        >
+                          Set recommended
+                        </TextLink>
+                        <span>{networkCongestion} congestion</span>
+                      </div>
+                    </>
                   )}
                 </Field>
-                <div className="TransactionFee__row">
-                  <TextLink
-                    underline
-                    disabled={!dirty && transactionFee === recommendedFee}
-                    variant={TextLink.variant.secondary}
-                    onClick={() =>
-                      setFieldValue("transactionFee", recommendedFee)
-                    }
-                  >
-                    Set recommended
-                  </TextLink>
-                  <span>{networkCongestion} congestion</span>
-                </div>
               </FormRows>
               <div className="SendPayment__btn-continue">
                 <Button

From 6d7bc1ea93c7993820fbcfb674e5049bca4b63be Mon Sep 17 00:00:00 2001
From: Alec Charbonneau <aleccharb21@gmail.com>
Date: Mon, 23 May 2022 09:51:06 -0700
Subject: [PATCH 3/3] no children

---
 .../sendPayment/SendSettings/TransactionFee/index.tsx           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/src/popup/components/sendPayment/SendSettings/TransactionFee/index.tsx b/extension/src/popup/components/sendPayment/SendSettings/TransactionFee/index.tsx
index f3732dd716..8d859994c4 100644
--- a/extension/src/popup/components/sendPayment/SendSettings/TransactionFee/index.tsx
+++ b/extension/src/popup/components/sendPayment/SendSettings/TransactionFee/index.tsx
@@ -69,7 +69,7 @@ export const SendSettingsFee = () => {
                         className="SendTo__input"
                         type="number"
                         {...field}
-                      ></Input>
+                      />
                       <div className="TransactionFee__row">
                         <TextLink
                           underline