Allow SharedToggleItem label to be undefined

tahowallet · Jun 19, 2023 · da343f7 · da343f7
1 parent 7886ead
commit da343f7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/background/lib/utils/index.ts b/background/lib/utils/index.ts
@@ -166,11 +166,7 @@ export function getEthereumNetwork(): EVMNetwork {
 }
 
 export function isProbablyEVMAddress(str: string): boolean {
-  if (
-    typeof str === "string" &&
-    str.length === 42 &&
-    normalizeHexAddress(str).startsWith("0x")
-  ) {
+  if (str.length === 42 && normalizeHexAddress(str).startsWith("0x")) {
     return true
   }
   return false

diff --git a/ui/components/Shared/SharedToggleItem.tsx b/ui/components/Shared/SharedToggleItem.tsx
@@ -8,7 +8,7 @@ import SharedToggleButton from "./SharedToggleButton"
 export const STARS_GREY_URL = "./images/stars_grey.svg"
 
 type SharedToggleItemProps = {
-  label: string
+  label?: string
   thumbnailURL?: string
   checked: boolean
   onChange: (toggleValue: boolean) => void
@@ -25,7 +25,9 @@ export default function SharedToggleItem({
       <div className="text_wrap">
         <div className="thumbnail" role="img" />
         <label className="label ellipsis">
-          {isProbablyEVMAddress(label) ? truncateAddress(label) : label ?? ""}
+          {typeof label === "string" && isProbablyEVMAddress(label)
+            ? truncateAddress(label)
+            : label ?? ""}
         </label>
       </div>
       <SharedToggleButton onChange={onChange} value={checked} />