diff --git a/ui/components/app/advanced-gas-controls/advanced-gas-controls.component.js b/ui/components/app/advanced-gas-controls/advanced-gas-controls.component.js
index cc2e09680..ce7d4463f 100644
--- a/ui/components/app/advanced-gas-controls/advanced-gas-controls.component.js
+++ b/ui/components/app/advanced-gas-controls/advanced-gas-controls.component.js
@@ -124,12 +124,12 @@ AdvancedGasControls.propTypes = {
   gasEstimateType: PropTypes.oneOf(Object.values(GAS_ESTIMATE_TYPES)),
   setMaxPriorityFee: PropTypes.func,
   setMaxFee: PropTypes.func,
-  maxPriorityFee: PropTypes.number,
-  maxFee: PropTypes.number,
+  maxPriorityFee: PropTypes.string,
+  maxFee: PropTypes.string,
   onManualChange: PropTypes.func,
   gasLimit: PropTypes.number,
   setGasLimit: PropTypes.func,
-  gasPrice: PropTypes.number,
+  gasPrice: PropTypes.string,
   setGasPrice: PropTypes.func,
   maxPriorityFeeFiat: PropTypes.string,
   maxFeeFiat: PropTypes.string,
diff --git a/ui/components/app/modals/nickname-popovers/nickname-popovers.component.js b/ui/components/app/modals/nickname-popovers/nickname-popovers.component.js
index 664358a66..adc2ae254 100644
--- a/ui/components/app/modals/nickname-popovers/nickname-popovers.component.js
+++ b/ui/components/app/modals/nickname-popovers/nickname-popovers.component.js
@@ -43,7 +43,7 @@ const NicknamePopovers = ({ address, onClose }) => {
       <UpdateNicknamePopover
         address={address}
         nickname={recipientNickname || null}
-        memo={addressBookEntryObject?.memo}
+        memo={addressBookEntryObject?.memo || null}
         onClose={() => setPopoverToDisplay(SHOW_NICKNAME_POPOVER)}
         onAdd={(recipient, nickname, memo) =>
           dispatch(addToAddressBook(recipient, nickname, memo))
diff --git a/ui/components/ui/update-nickname-popover/update-nickname-popover.js b/ui/components/ui/update-nickname-popover/update-nickname-popover.js
index 3396d4fdc..0c10b988c 100644
--- a/ui/components/ui/update-nickname-popover/update-nickname-popover.js
+++ b/ui/components/ui/update-nickname-popover/update-nickname-popover.js
@@ -20,8 +20,8 @@ export default function UpdateNicknamePopover({
 }) {
   const t = useContext(I18nContext);
 
-  const [nicknameInput, setNicknameInput] = useState(nickname);
-  const [memoInput, setMemoInput] = useState(memo);
+  const [nicknameInput, setNicknameInput] = useState(nickname === null ? "" : nickname);
+  const [memoInput, setMemoInput] = useState(memo === null ? "" : memo);
 
   const handleNicknameChange = (event) => {
     setNicknameInput(event.target.value);
diff --git a/ui/pages/asset/components/asset-options.js b/ui/pages/asset/components/asset-options.js
index c29f6f532..79583e7bc 100644
--- a/ui/pages/asset/components/asset-options.js
+++ b/ui/pages/asset/components/asset-options.js
@@ -21,9 +21,6 @@ const AssetOptions = ({
   );
   const [assetOptionsOpen, setAssetOptionsOpen] = useState(false);
 
-  if (props.onRemove === undefined) { props.onRemove = noop; }
-  if (props.onViewTokenDetails === undefined) { props.onViewTokenDetails = noop; }
-
   return (
     <>
       <button