multiple personas clickable [Fixes ethereum#12645]

bhargavkakadiya · Apr 17, 2024 · 3b065ba · 3b065ba
1 parent b4aa175
commit 3b065ba
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 20 deletions.
diff --git a/src/components/FindWallet/WalletFilterPersona.tsx b/src/components/FindWallet/WalletFilterPersona.tsx
@@ -1,4 +1,4 @@
-import { MdCircle } from "react-icons/md"
+import { MdCheckBox } from "react-icons/md"
 import {
   Box,
   Flex,
@@ -19,11 +19,33 @@ import { useWalletPersonas } from "../../hooks/useWalletPersonas"
 type WalletFilterPersonaProps = {
   resetFilters: () => void
   setFilters: React.Dispatch<React.SetStateAction<WalletFilter>>
-  selectedPersona: number
-  setSelectedPersona: React.Dispatch<React.SetStateAction<number>>
+  selectedPersona: number[]
+  setSelectedPersona: React.Dispatch<React.SetStateAction<number[]>>
   showMobileSidebar: boolean
 }
 
+const computeFilters = (
+  selectedPersonas: number[],
+  personas: WalletPersonas[]
+) => {
+  if (selectedPersonas.length === 0) return {}
+
+  const firstPersona = personas[selectedPersonas[0]]
+  const initialFilters = firstPersona.presetFilters
+  return selectedPersonas
+    .slice(1)
+    .reduce((filters: { [key: string]: boolean }, personaId) => {
+      const persona = personas[personaId]
+      if (!persona) return filters
+
+      return Object.fromEntries(
+        Object.entries(filters).map(([key, value]) => {
+          return [key, value && persona.presetFilters[key]]
+        })
+      )
+    }, initialFilters)
+}
+
 const WalletFilterPersona = ({
   resetFilters,
   setFilters,
@@ -33,24 +55,25 @@ const WalletFilterPersona = ({
 }: WalletFilterPersonaProps) => {
   const personas = useWalletPersonas()
   const handleSelectPersona = (idx: number, persona: WalletPersonas) => {
-    if (idx === selectedPersona) {
-      resetFilters()
-
+    let newSelectedPersonas
+    if (selectedPersona.includes(idx)) {
+      newSelectedPersonas = selectedPersona.filter((persona) => persona !== idx)
       trackCustomEvent({
         eventCategory: "UserPersona",
         eventAction: `${persona.title}`,
         eventName: `${persona.title} false`,
       })
     } else {
-      setSelectedPersona(idx)
-      setFilters(persona.presetFilters)
-
+      newSelectedPersonas = [...selectedPersona, idx]
       trackCustomEvent({
         eventCategory: "UserPersona",
         eventAction: `${persona.title}`,
         eventName: `${persona.title} true`,
       })
     }
+    setSelectedPersona(newSelectedPersonas)
+    const newFilters = computeFilters(newSelectedPersonas, personas)
+    setFilters(newFilters as WalletFilter)
   }
 
   return (
@@ -95,16 +118,19 @@ const WalletFilterPersona = ({
               <Flex gap={2} mb={showMobileSidebar ? 0 : 1} px={1.5}>
                 <Box role="radio" aria-label={`${persona.title} filter`}>
                   <Icon
-                    as={MdCircle}
-                    borderRadius="full"
+                    as={MdCheckBox}
                     boxSize={2.5}
                     my={0}
                     mx={1}
                     fill={
-                      selectedPersona === idx ? "primary.base" : "transparent"
+                      selectedPersona.includes(idx)
+                        ? "primary.base"
+                        : "transparent"
                     }
                     background={
-                      selectedPersona === idx ? "primary.base" : "transparent"
+                      selectedPersona.includes(idx)
+                        ? "primary.base"
+                        : "transparent"
                     }
                     outline="1.5px solid"
                     outlineColor="primary.base"
@@ -135,7 +161,9 @@ const WalletFilterPersona = ({
               {!showMobileSidebar && (
                 <Text
                   p="0.4rem"
-                  color={selectedPersona === idx ? "body.base" : "body.medium"}
+                  color={
+                    selectedPersona.includes(idx) ? "body.base" : "body.medium"
+                  }
                   fontSize="sm"
                   fontWeight="normal"
                   transition="0.5s all"

diff --git a/src/components/FindWallet/WalletFilterSidebar.tsx b/src/components/FindWallet/WalletFilterSidebar.tsx
@@ -19,8 +19,8 @@ export type WalletFilterSidebarProps = Omit<BoxProps, "children"> & {
   resetWalletFilter: React.MutableRefObject<() => void>
   resetFilters: () => void
   setFilters: React.Dispatch<React.SetStateAction<WalletFilter>>
-  selectedPersona: number
-  setSelectedPersona: React.Dispatch<React.SetStateAction<number>>
+  selectedPersona: number[]
+  setSelectedPersona: React.Dispatch<React.SetStateAction<number[]>>
   updateFilterOption: (key: any) => void
   updateFilterOptions: (keys: any, value: any) => void
   showMobileSidebar?: boolean

diff --git a/src/hooks/useWalletPersonas.tsx b/src/hooks/useWalletPersonas.tsx
@@ -64,6 +64,7 @@ export const useWalletPersonas = () => {
         withdraw_crypto: false,
         multisig: false,
         social_recovery: false,
+        new_to_crypto: false,
       },
     },
     {
@@ -94,6 +95,7 @@ export const useWalletPersonas = () => {
         withdraw_crypto: false,
         multisig: false,
         social_recovery: false,
+        new_to_crypto: false,
       },
     },
     {
@@ -124,6 +126,7 @@ export const useWalletPersonas = () => {
         withdraw_crypto: false,
         multisig: false,
         social_recovery: false,
+        new_to_crypto: false,
       },
     },
     {
@@ -154,6 +157,7 @@ export const useWalletPersonas = () => {
         withdraw_crypto: false,
         multisig: false,
         social_recovery: false,
+        new_to_crypto: false,
       },
     },
   ]

diff --git a/src/lib/utils/wallets.ts b/src/lib/utils/wallets.ts
@@ -100,8 +100,11 @@ export const formatSupportedLanguages = (
 }
 
 // Get border custom color for Persona filter
-export const getPersonaBorderColor = (selectedPersona: number, idx: number) => {
-  return selectedPersona === idx ? "primary.base" : "transparent"
+export const getPersonaBorderColor = (
+  selectedPersona: number[],
+  idx: number
+) => {
+  return selectedPersona.includes(idx) ? "primary.base" : "transparent"
 }
 
 // Get total count of wallets that support a language

diff --git a/src/pages/wallets/find-wallet.tsx b/src/pages/wallets/find-wallet.tsx
@@ -82,7 +82,7 @@ const FindWalletPage = () => {
   const resetWalletFilter = useRef(() => {})
 
   const [filters, setFilters] = useState(WALLETS_FILTERS_DEFAULT)
-  const [selectedPersona, setSelectedPersona] = useState(NaN)
+  const [selectedPersona, setSelectedPersona] = useState<number[]>([])
   const [supportedLanguage, setSupportedLanguage] = useState(DEFAULT_LOCALE)
 
   const { isOpen: showMobileSidebar, onOpen, onClose } = useDisclosure()
@@ -120,7 +120,7 @@ const FindWalletPage = () => {
   }
 
   const resetFilters = () => {
-    setSelectedPersona(NaN)
+    setSelectedPersona([])
     setFilters(WALLETS_FILTERS_DEFAULT)
     setSupportedLanguage(DEFAULT_LOCALE)
   }