From fa2974c97f8b28bd93614d910f5f311407b274b8 Mon Sep 17 00:00:00 2001
From: Rickard Natt och Dag <rickard@hey.com>
Date: Tue, 9 Feb 2021 08:24:14 +0100
Subject: [PATCH 1/3] chore: use more icon instead of phone

---
 packages/app/components/contactMenu.component.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/app/components/contactMenu.component.js b/packages/app/components/contactMenu.component.js
index f9e42120f..10676c3f3 100644
--- a/packages/app/components/contactMenu.component.js
+++ b/packages/app/components/contactMenu.component.js
@@ -11,12 +11,12 @@ import {
 export const ContactMenu = ({contact, selected, setSelected}) => {
   const [visible, setVisible] = React.useState(selected)
 
-  const contactIcon = (props) => <Icon {...props} name="phone-outline" />
+  const moreIcon = (props) => <Icon {...props} name="more-horizontal-outline" />
   const renderToggleButton = () => (
     <Button
       onPress={() => setVisible(true)}
       appearance="ghost"
-      accessoryLeft={contactIcon}
+      accessoryLeft={moreIcon}
     />
   )
 

From 273f0597610d766d3a22e96653604cd3ae5cd3b0 Mon Sep 17 00:00:00 2001
From: Rickard Natt och Dag <rickard@hey.com>
Date: Tue, 9 Feb 2021 08:25:13 +0100
Subject: [PATCH 2/3] fix: hide contact option if not available

---
 packages/app/components/contactMenu.component.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/app/components/contactMenu.component.js b/packages/app/components/contactMenu.component.js
index 10676c3f3..a2819f517 100644
--- a/packages/app/components/contactMenu.component.js
+++ b/packages/app/components/contactMenu.component.js
@@ -40,25 +40,25 @@ export const ContactMenu = ({contact, selected, setSelected}) => {
         <MenuGroup key={i} title={`${parent.firstname} ${parent.lastname}`}>
           <MenuItem
             accessoryLeft={CallIcon}
-            visible={!parent.mobile}
+            style={{display: parent.mobile ? 'flex' : 'none'}}
             title="Ring"
             onPress={(e) => Linking.openURL(`tel:${parent.mobile}`)}
           />
           <MenuItem
             accessoryLeft={SMSIcon}
-            visible={!parent.mobile}
+            style={{display: parent.mobile ? 'flex' : 'none'}}
             title="SMS"
             onPress={(e) => Linking.openURL(`sms:${parent.mobile}`)}
           />
           <MenuItem
             accessoryLeft={EmailIcon}
-            visible={!parent.email}
+            style={{display: parent.email ? 'flex' : 'none'}}
             title="Maila"
             onPress={(e) => Linking.openURL(`mailto:${parent.email}`)}
           />
           <MenuItem
             accessoryLeft={MapIcon}
-            visible={!parent.address}
+            style={{display: parent.address ? 'flex' : 'none'}}
             title="Hem"
             onPress={(e) =>
               Linking.openURL(`http://maps.apple.com/?daddr=${parent.address}`)

From c758370074b7e10697855460ce23de45eed2bf99 Mon Sep 17 00:00:00 2001
From: Rickard Natt och Dag <rickard@hey.com>
Date: Tue, 9 Feb 2021 08:36:53 +0100
Subject: [PATCH 3/3] fix: contact menu closing on false clicks

---
 packages/app/components/contactMenu.component.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/app/components/contactMenu.component.js b/packages/app/components/contactMenu.component.js
index a2819f517..b2c21bc32 100644
--- a/packages/app/components/contactMenu.component.js
+++ b/packages/app/components/contactMenu.component.js
@@ -36,8 +36,11 @@ export const ContactMenu = ({contact, selected, setSelected}) => {
       anchor={renderToggleButton}
       backdropStyle={styles.backdrop}
       onBackdropPress={handleBackdropPress}>
-      {contact.guardians.map((parent, i) => (
-        <MenuGroup key={i} title={`${parent.firstname} ${parent.lastname}`}>
+      {contact.guardians.map((parent) => (
+        <MenuGroup
+          key={`${parent.firstname}-${parent.lastname}`}
+          title={`${parent.firstname} ${parent.lastname}`}
+          style={{position: 'relative', zIndex: 10}}>
           <MenuItem
             accessoryLeft={CallIcon}
             style={{display: parent.mobile ? 'flex' : 'none'}}