From cadeee9ced3f328067e3d99e4de18274336539e0 Mon Sep 17 00:00:00 2001
From: Aaron Sutula <hi@asutula.com>
Date: Tue, 5 Feb 2019 15:25:02 -0800
Subject: [PATCH] Add contact (#908)

* WIP on new add contact screen

* Wip on searching and displaying Textile contacts

* Increase wait time for now

* Render add contact search bar above list for now

* Local contacts search integration

* Mostly working Textile contact adding

* Clean up log statements

* WIP on MessageComposer

* Working on invite

* Move store link to .env

* Clean up Button usage

* Little clean up
---
 .env.example                                  |   4 +-
 App/Components/Button.tsx                     |  29 +-
 App/Components/LargeButton.tsx                |  39 ++
 App/Components/ListItem.tsx                   |  17 +-
 App/Components/OnboardingMessage.tsx          |   5 +-
 App/Components/ReferralCode.tsx               |   9 +-
 App/Components/RowSeparator.tsx               |   4 +-
 App/Components/SearchBar.tsx                  |   5 +-
 App/Components/SmallButton.tsx                |  34 ++
 App/Components/WaitListSignupScreen.tsx       |   9 +-
 App/Containers/AddContact.tsx                 | 217 +++++++++
 App/Containers/Contact.tsx                    |  17 +-
 App/Containers/Contacts.tsx                   |  32 +-
 App/Containers/Groups.tsx                     |   2 +-
 App/Containers/MailListSignupScreen.tsx       |   9 +-
 App/Containers/OnboardingUsername.tsx         |   9 +-
 App/Containers/SetAvatar.tsx                  |   9 +-
 App/NativeModules/MessageComposer/Api.ts      |   7 +
 App/NativeModules/MessageComposer/index.ts    |   1 +
 .../AppNavigation/Modal/AddContact/index.ts   |  21 +
 App/Navigation/AppNavigation/Modal/index.ts   |   2 +
 App/Redux/ContactsRedux.ts                    | 251 +++++++++-
 App/Sagas/Contacts/ContactsSagas.ts           | 198 ++++++++
 App/Sagas/Contacts/index.ts                   |  22 +
 App/Sagas/TextileSagas.ts                     |  15 -
 App/Sagas/index.ts                            |   7 +-
 App/Themes/Constants.ts                       |  14 +
 DEVELOPMENT.md                                |   2 +
 android/app/build.gradle                      |   1 +
 android/app/src/main/AndroidManifest.xml      |   3 +
 .../java/com/textile/MainApplication.java     |   2 +
 .../textile/textilenode/MessageComposer.java  |  35 ++
 .../textile/textilenode/TextilePackage.java   |   1 +
 android/settings.gradle                       |   2 +
 ios/NativeModules/Events.m                    |  81 ----
 ios/NativeModules/MessageComposer.h           |  14 +
 ios/NativeModules/MessageComposer.m           |  71 +++
 ios/NativeModules/TextileNode.m               | 442 ------------------
 ios/Textile.xcodeproj/project.pbxproj         |  44 ++
 ios/Textile/Info.plist                        |   2 +
 package.json                                  |   1 +
 yarn.lock                                     |   4 +
 42 files changed, 1074 insertions(+), 619 deletions(-)
 create mode 100644 App/Components/LargeButton.tsx
 create mode 100644 App/Components/SmallButton.tsx
 create mode 100644 App/Containers/AddContact.tsx
 create mode 100644 App/NativeModules/MessageComposer/Api.ts
 create mode 100644 App/NativeModules/MessageComposer/index.ts
 create mode 100644 App/Navigation/AppNavigation/Modal/AddContact/index.ts
 create mode 100644 App/Sagas/Contacts/ContactsSagas.ts
 create mode 100644 App/Sagas/Contacts/index.ts
 create mode 100644 android/app/src/main/java/com/textile/textilenode/MessageComposer.java
 delete mode 100644 ios/NativeModules/Events.m
 create mode 100644 ios/NativeModules/MessageComposer.h
 create mode 100644 ios/NativeModules/MessageComposer.m
 delete mode 100644 ios/NativeModules/TextileNode.m

diff --git a/.env.example b/.env.example
index 5de7870a3..46168483a 100644
--- a/.env.example
+++ b/.env.example
@@ -9,4 +9,6 @@ RN_MAILCHIMP_API_KEY="a-key"
 RN_MAILCHIMP_LIST_ID="a-list-id"
 RN_MAILCHIMP_WAITLIST_ID="a-list-id"
 RN_PEER_SWAP="https://<peer endpoint>"
-RN_RELEASE_TYPE="dev"
\ No newline at end of file
+RN_RELEASE_TYPE="dev"
+RN_IOS_STORE_LINK="https://<ios store link>"
+RN_ANDROID_STORE_LINK="https://<android store link>"
\ No newline at end of file
diff --git a/App/Components/Button.tsx b/App/Components/Button.tsx
index 38d28922e..9efa6b332 100644
--- a/App/Components/Button.tsx
+++ b/App/Components/Button.tsx
@@ -1,12 +1,13 @@
-import React from 'react'
+import React, { Component } from 'react'
 import { Text, TouchableOpacity, ViewStyle, TextStyle, ActivityIndicator } from 'react-native'
 
+import RoundedCornersView from './RoundedCornersView'
+
 const BUTTON: ViewStyle = {
-  backgroundColor: '#2625FF',
-  minWidth: 300,
-  paddingVertical: 18,
-  paddingHorizontal: 65,
-  borderRadius: 6
+  backgroundColor: '#2625FF'
+  // minWidth: 300,
+  // paddingVertical: 18,
+  // paddingHorizontal: 65
 }
 
 const BUTTON_TEXT: TextStyle = {
@@ -33,13 +34,15 @@ const button = (props: Props) => {
   const { onPress, disabled, text, style, textStyle, processing } = props
 
   return (
-    <TouchableOpacity disabled={disabled} style={[BUTTON, style, disabled && DISABLED]} onPress={onPress}>
-      {processing &&
-        <ActivityIndicator/>
-      }
-      {!processing &&
-        <Text style={[BUTTON_TEXT, textStyle]}>{text}</Text>
-      }
+    <TouchableOpacity disabled={disabled} onPress={onPress}>
+      <RoundedCornersView style={[BUTTON, style, disabled && DISABLED]}>
+        {processing &&
+          <ActivityIndicator />
+        }
+        {!processing &&
+          <Text style={[BUTTON_TEXT, textStyle]}>{text}</Text>
+        }
+      </RoundedCornersView>
     </TouchableOpacity>
   )
 }
diff --git a/App/Components/LargeButton.tsx b/App/Components/LargeButton.tsx
new file mode 100644
index 000000000..b7036653a
--- /dev/null
+++ b/App/Components/LargeButton.tsx
@@ -0,0 +1,39 @@
+import React from 'react'
+import { ViewStyle } from 'react-native'
+import Button from './Button'
+import * as s from '../Themes/Constants'
+
+interface Props {
+  text: string
+  style?: ViewStyle
+  disabled?: boolean
+  processing?: boolean
+  onPress?: () => void
+}
+
+const button = (props: Props) => {
+  const { text, onPress, style, processing } = props
+  return (
+    <Button
+      text={text}
+      textStyle={{
+        fontFamily: 'Biotif-Bold',
+        fontSize: 16,
+        letterSpacing: 3,
+        paddingLeft: 3,
+        textTransform: 'uppercase'
+      }}
+      style={{
+        ...style,
+        paddingHorizontal: s.SPACING_24,
+        paddingVertical: s.SPACING_12,
+        backgroundColor: s.COLOR_BRAND_BLUE
+      }}
+      processing={processing}
+      disabled={props.disabled}
+      onPress={onPress}
+    />
+  )
+}
+
+export default button
diff --git a/App/Components/ListItem.tsx b/App/Components/ListItem.tsx
index 869b405de..44ac4b7c6 100644
--- a/App/Components/ListItem.tsx
+++ b/App/Components/ListItem.tsx
@@ -4,22 +4,15 @@ import { View, Text, TouchableOpacity } from 'react-native'
 import * as s from '../Themes/Constants'
 
 interface Props {
-  id: string
   title: string
   subtitle?: string
   leftItem?: JSX.Element
   rightItems?: JSX.Element[]
-  onPress?: (id: string) => void
+  onPress?: () => void
 }
 
 class ListItem extends React.PureComponent<Props> {
 
-  onPress = () => {
-    if (this.props.onPress) {
-      this.props.onPress(this.props.id)
-    }
-  }
-
   spliceRightItems = (items: JSX.Element[]) => {
     const foo: JSX.Element[] = []
     return foo.concat.apply([], items.map((item, index) => [<View key={index} style={{ width: 8 }} />, item]))
@@ -27,15 +20,15 @@ class ListItem extends React.PureComponent<Props> {
 
   render() {
     return (
-      <TouchableOpacity delayPressIn={100} onPress={this.onPress}>
-        <View style={{ flex: 1, flexDirection: 'row', alignItems: 'center', paddingLeft: 20, paddingRight: 20, paddingTop: 11, paddingBottom: 11 }}>
+      <TouchableOpacity delayPressIn={100} onPress={this.props.onPress}>
+        <View style={{ flex: 1, flexDirection: 'row', alignItems: 'center', paddingLeft: 12, paddingRight: 12, paddingTop: 12, paddingBottom: 12 }}>
           {this.props.leftItem &&
             this.props.leftItem
           }
-          <View style={{ flex: 1, justifyContent: 'center', marginLeft: 11 }}>
+          <View style={{ flex: 1, justifyContent: 'center', marginLeft: this.props.leftItem ? 12 : 0 }}>
             <Text style={{ fontFamily: s.FONT_FAMILY_REGULAR, fontSize: s.FONT_SIZE_MEDIUM, color: s.COLOR_FONT_DARK_ON_LIGHT_MEDIUM }}>{this.props.title}</Text>
             {this.props.subtitle &&
-              <Text style={{ fontFamily: s.FONT_FAMILY_REGULAR, fontSize: s.FONT_SIZE_REGULAR, color: s.COLOR_FONT_DARK_ON_LIGHT_LIGHT }}>{this.props.subtitle}</Text>
+              <Text style={{ fontFamily: s.FONT_FAMILY_REGULAR, fontSize: s.FONT_SIZE_SMALL, color: s.COLOR_FONT_DARK_ON_LIGHT_LIGHT }}>{this.props.subtitle}</Text>
             }
           </View>
           {this.props.rightItems &&
diff --git a/App/Components/OnboardingMessage.tsx b/App/Components/OnboardingMessage.tsx
index c0b8c8774..232126d6a 100644
--- a/App/Components/OnboardingMessage.tsx
+++ b/App/Components/OnboardingMessage.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import { Image, ImageSourcePropType, ImageStyle, Text, TextStyle, View, ViewStyle } from 'react-native'
 import * as s from '../Themes/Constants'
-import Button from './Button'
+import Button from './LargeButton'
 
 const CONTAINER: ViewStyle = {
   flex: 1,
@@ -26,7 +26,8 @@ const SUBTITLE: TextStyle = {
 
 const BUTTON_WRAPPER: ViewStyle = {
   flex: 1,
-  justifyContent: 'center'
+  justifyContent: 'center',
+  alignSelf: 'center'
 }
 
 interface Props {
diff --git a/App/Components/ReferralCode.tsx b/App/Components/ReferralCode.tsx
index 7c6f56629..c68e6421a 100644
--- a/App/Components/ReferralCode.tsx
+++ b/App/Components/ReferralCode.tsx
@@ -4,7 +4,7 @@ import Toast from 'react-native-easy-toast'
 import Modal from 'react-native-modal'
 
 import Input from '../SB/components/Input'
-import Button from './Button'
+import Button from './LargeButton'
 import * as s from '../Themes/Constants'
 import WaitListSignupScreen from './WaitListSignupScreen'
 
@@ -43,6 +43,11 @@ const LABEL: TextStyle = {
   fontFamily: s.FONT_FAMILY_REGULAR
 }
 
+const BUTTON: ViewStyle = {
+  ...ITEM,
+  alignSelf: 'center'
+}
+
 const LINK: TextStyle = {
   fontFamily: s.FONT_FAMILY_REGULAR,
   fontSize: s.FONT_SIZE_REGULAR,
@@ -121,7 +126,7 @@ export default class ReferralCode extends React.Component<Props, State> {
               text='Next'
               disabled={!this.state.valid}
               onPress={this.props.onSuccess}
-              style={ITEM}
+              style={BUTTON}
             />
             <Text style={LINK} onPress={this.showWaitlistSignup}>Request a referral code</Text>
             <Toast
diff --git a/App/Components/RowSeparator.tsx b/App/Components/RowSeparator.tsx
index 7539db0c4..b02643468 100644
--- a/App/Components/RowSeparator.tsx
+++ b/App/Components/RowSeparator.tsx
@@ -1,11 +1,11 @@
 import React from 'react'
 import { Platform, Dimensions, View } from 'react-native'
-import { COLOR_GREY_MEDIUM, MARGIN_STANDARD } from '../Themes/Constants'
+import { COLOR_GREY_MEDIUM } from '../Themes/Constants'
 
 const separator = () => {
   const scale = Dimensions.get('screen').scale
   const height = scale > 1 ? 0.5 : 1
-  const margin = Platform.OS === 'ios' ? MARGIN_STANDARD : 0
+  const margin = Platform.OS === 'ios' ? 12 : 0
   return <View style={{ height, width: '100%', marginLeft: margin, backgroundColor: COLOR_GREY_MEDIUM }} />
 }
 
diff --git a/App/Components/SearchBar.tsx b/App/Components/SearchBar.tsx
index 582417c60..5e96e6bed 100644
--- a/App/Components/SearchBar.tsx
+++ b/App/Components/SearchBar.tsx
@@ -22,7 +22,10 @@ class SearchBar extends Component<Props, State> {
 
   static defaultProps: Props = {
     containerStyle: {
-      padding: 8,
+      paddingTop: 8,
+      paddingBottom: 8,
+      paddingLeft: 12,
+      paddingRight: 12,
       backgroundColor: 'lightgrey'
     },
     inputStyle: {
diff --git a/App/Components/SmallButton.tsx b/App/Components/SmallButton.tsx
new file mode 100644
index 000000000..e1caef2b4
--- /dev/null
+++ b/App/Components/SmallButton.tsx
@@ -0,0 +1,34 @@
+import React from 'react'
+import Button from './Button'
+import * as s from '../Themes/Constants'
+
+interface Props {
+  text: string
+  disabled?: boolean
+  onPress?: () => void
+}
+
+const button = (props: Props) => {
+  const { text, onPress } = props
+  return (
+    <Button
+      text={text}
+      textStyle={{
+        fontFamily: 'Biotif-Bold',
+        fontSize: 10,
+        letterSpacing: 2,
+        paddingLeft: 2,
+        textTransform: 'uppercase'
+      }}
+      style={{
+        paddingHorizontal: 8,
+        paddingVertical: 4,
+        backgroundColor: s.COLOR_BRAND_BLUE
+      }}
+      disabled={props.disabled}
+      onPress={onPress}
+    />
+  )
+}
+
+export default button
diff --git a/App/Components/WaitListSignupScreen.tsx b/App/Components/WaitListSignupScreen.tsx
index 24b7487f5..07423e267 100644
--- a/App/Components/WaitListSignupScreen.tsx
+++ b/App/Components/WaitListSignupScreen.tsx
@@ -5,7 +5,7 @@ import Config from 'react-native-config'
 import { Buffer } from 'buffer'
 
 import Input from '../SB/components/Input'
-import Button from '../Components/Button'
+import Button from '../Components/LargeButton'
 import * as s from '../Themes/Constants'
 
 const CONTAINER: ViewStyle = {
@@ -43,6 +43,11 @@ const LABEL: TextStyle = {
   fontFamily: s.FONT_FAMILY_REGULAR
 }
 
+const BUTTON: ViewStyle = {
+  ...ITEM,
+  alignSelf: 'center'
+}
+
 const LINK: TextStyle = {
   fontFamily: s.FONT_FAMILY_REGULAR,
   fontSize: s.FONT_SIZE_REGULAR,
@@ -124,7 +129,7 @@ export default class WaitListSignupScreen extends React.Component<Props, State>
               disabled={!this.state.valid}
               processing={this.state.processing}
               onPress={this.submit}
-              style={ITEM}
+              style={BUTTON}
             />
             <Text style={LINK} onPress={this.props.onSuccess}>Cancel</Text>
             <Toast
diff --git a/App/Containers/AddContact.tsx b/App/Containers/AddContact.tsx
new file mode 100644
index 000000000..f5663b8ba
--- /dev/null
+++ b/App/Containers/AddContact.tsx
@@ -0,0 +1,217 @@
+import React from 'react'
+import { connect } from 'react-redux'
+import { Dispatch } from 'redux'
+import {
+  View,
+  Text,
+  SectionList,
+  ViewStyle,
+  SectionListRenderItemInfo,
+  SectionListData,
+  ActivityIndicator
+} from 'react-native'
+import { NavigationScreenProps, NavigationActions } from 'react-navigation'
+import Icon from '@textile/react-native-icon'
+import { ContactInfo } from '@textile/react-native-sdk'
+import Contacts from 'react-native-contacts'
+
+import Button from '../Components/SmallButton'
+import SearchBar from '../Components/SearchBar'
+import RowSeparator from '../Components/RowSeparator'
+import ListItem from '../Components/ListItem'
+import { Item, TextileHeaderButtons } from '../Components/HeaderButtons'
+import Avatar from '../Components/Avatar'
+import { RootState, RootAction } from '../Redux/Types'
+import ContactsActions, { ContactsSelectors, SearchResultsSection, SearchResult } from '../Redux/ContactsRedux'
+import * as s from '../Themes/Constants'
+
+const CONTAINER: ViewStyle = {
+  flex: 1,
+  backgroundColor: '#FAFCFE'
+}
+
+interface StateProps {
+  searchResults: SearchResultsSection[]
+}
+
+interface NavProps {
+  clearSearch: () => void
+}
+
+interface DispatchProps {
+  search: (searchString: string) => void
+  clearSearch: () => void
+  addContact: (contactInfo: ContactInfo) => void
+  inviteContact: (contact: Contacts.Contact) => void
+}
+
+type Props = StateProps & DispatchProps & NavigationScreenProps<NavProps>
+
+class AddContact extends React.Component<Props> {
+
+  static navigationOptions = ({ navigation }: NavigationScreenProps<NavProps>) => {
+    const close = () => {
+      navigation.getParam('clearSearch')()
+      navigation.dispatch(NavigationActions.back())
+    }
+    const headerRight = (
+      <TextileHeaderButtons>
+        <Item title='Close' iconName='chevron-bottom' onPress={close} />
+      </TextileHeaderButtons>
+    )
+    return {
+      headerTitle: 'Add Contact',
+      headerRight
+    }
+  }
+
+  constructor(props: Props) {
+    super(props)
+    // this._headerComponent = this._headerComponent.bind(this)
+    // this.updateSearchString = this.updateSearchString.bind(this)
+  }
+
+  componentDidMount() {
+    this.props.navigation.setParams({
+      clearSearch: this.props.clearSearch
+    })
+  }
+
+  render () {
+    return (
+      <View style={CONTAINER}>
+        {this._headerComponent()}
+        <SectionList
+          sections={this.props.searchResults}
+          renderSectionHeader={this.renderSectionHeader}
+          renderItem={this.renderRow}
+          ItemSeparatorComponent={RowSeparator}
+          // ListHeaderComponent={this._headerComponent}
+          keyboardShouldPersistTaps='handled'
+          keyboardDismissMode='on-drag'
+        />
+      </View>
+    )
+  }
+
+  _headerComponent = () => (
+    <SearchBar
+      containerStyle={{ backgroundColor: s.COLOR_GREY_LIGHT }}
+      inputStyle={{ fontFamily: s.FONT_FAMILY_REGULAR, fontSize: s.FONT_SIZE_REGULAR, color: s.COLOR_FONT_DARK_ON_LIGHT_MEDIUM, backgroundColor: '#FAFCFE' }}
+      additionalInputProps={{ autoCapitalize: 'none', autoCorrect: false, spellCheck: false, autoFocus: true }}
+      iconColor={s.COLOR_GREY_MEDIUM}
+      onTextChanged={this.updateSearchString}
+    />
+  )
+
+  renderSectionHeader = ({section: { key, title }}: { section: SectionListData<SearchResultsSection> }) => {
+    return (
+      <Text
+        key={key}
+        style={{
+          paddingTop: 8,
+          paddingBottom: 8,
+          paddingLeft: 12,
+          paddingRight: 12,
+          fontFamily: s.FONT_FAMILY_BOLD,
+          fontSize: s.FONT_SIZE_SMALL,
+          color: s.COLOR_FONT_DARK_ON_LIGHT_MEDIUM,
+          backgroundColor: s.COLOR_GREY_LIGHT
+        }}
+      >
+        {title}
+      </Text>
+    )
+  }
+
+  renderRow = ({ item, index, section }: SectionListRenderItemInfo<SearchResult>) => {
+    switch (item.type) {
+      case 'loading':
+        return <ActivityIndicator size='small' style={{ padding: 11 }} />
+      case 'textile':
+        return (
+          <ListItem
+            leftItem={<Avatar style={{ width: 50 }} target={item.data.contactInfo.avatar} />}
+            title={item.data.contactInfo.username || item.data.contactInfo.id}
+            subtitle={item.data.contactInfo.id.substr(item.data.contactInfo.id.length - 8, 8)}
+            rightItems={[
+              <Button
+                key='add'
+                text={item.data.isContact ? 'added' : 'add'}
+                disabled={item.data.isContact || item.data.adding}
+                onPress={this.onAdd(item.data.contactInfo)}
+              />,
+              <Icon key='more' name='chevron-right' size={24} color={s.COLOR_GREY_MEDIUM} />
+            ]}
+            onPress={this.onPressTextile(item.data.contactInfo)}
+          />
+        )
+      case 'addressBook':
+        return (
+          <ListItem
+            title={`${item.data.givenName} ${item.data.familyName}`.trim()}
+            rightItems={[<Button key='invite' text='invite' onPress={this.onPressAddressBook(item.data)} />]}
+            onPress={this.onPressAddressBook(item.data)}
+          />
+        )
+      case 'empty':
+        return (
+          <ListItem
+            title='No results'
+          />
+        )
+      case 'error':
+        return (
+          <ListItem
+            title='Error'
+            subtitle={item.data}
+          />
+        )
+    }
+    // const leftItem = <Avatar style={{ width: 50 }} target={item.avatar} />
+    // const rightItems = [<Icon key='more' name='chevron-right' size={24} color={s.COLOR_GREY_MEDIUM} />]
+  }
+
+  updateSearchString = (string?: string) => {
+    if (string !== undefined && string.length > 0) {
+      this.props.search(string)
+    } else {
+      this.props.clearSearch()
+    }
+  }
+
+  onPressTextile = (contactInfo: ContactInfo) => {
+    return () => this.props.navigation.navigate('Contact', { contactInfo })
+  }
+
+  onAdd = (contactInfo: ContactInfo) => {
+    return () => this.props.addContact(contactInfo)
+  }
+
+  onPressAddressBook = (contact: Contacts.Contact) => {
+    return () => {
+      this.props.inviteContact(contact)
+    }
+  }
+
+  onPress = (id: string) => {
+    this.props.navigation.navigate('Contact', { peerId: id })
+  }
+}
+
+const mapStateToProps = (state: RootState): StateProps => {
+  return {
+    searchResults: ContactsSelectors.searchResults(state)
+  }
+}
+
+const mapDispatchToProps = (dispatch: Dispatch<RootAction>): DispatchProps => {
+  return {
+    search: (searchString: string) => dispatch(ContactsActions.searchRequest(searchString)),
+    clearSearch: () => dispatch(ContactsActions.clearSearch()),
+    addContact: (contactInfo: ContactInfo) => dispatch(ContactsActions.addContactRequest(contactInfo)),
+    inviteContact: (contact: Contacts.Contact) => dispatch(ContactsActions.authorInviteRequest(contact))
+  }
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(AddContact)
diff --git a/App/Containers/Contact.tsx b/App/Containers/Contact.tsx
index 28c005bd1..7b2b52c00 100644
--- a/App/Containers/Contact.tsx
+++ b/App/Containers/Contact.tsx
@@ -7,6 +7,7 @@ import {
   TouchableOpacity
 } from 'react-native'
 import { NavigationScreenProps } from 'react-navigation'
+import { ContactInfo } from '@textile/react-native-sdk'
 
 import Avatar from '../Components/Avatar'
 import PhotoWithTextBox from '../SB/components/PhotoWithTextBox'
@@ -20,12 +21,10 @@ import { ThreadThumbs } from '../Redux/PhotoViewingRedux'
 import { TextileHeaderButtons, Item } from '../Components/HeaderButtons'
 
 interface NavProps {
-  peerId: string
+  contactInfo: ContactInfo
 }
 
 interface StateProps {
-  username: string
-  avatar?: string
   threadThumbs: ReadonlyArray<ThreadThumbs>
 }
 
@@ -42,7 +41,7 @@ class ContactModal extends React.Component<Props> {
     )
     return {
       headerLeft,
-      headerTitle: 'Contact Info'
+      headerTitle: 'Contact Details'
     }
   }
 
@@ -53,11 +52,12 @@ class ContactModal extends React.Component<Props> {
   }
 
   render () {
+    const { avatar, username } = this.props.navigation.getParam('contactInfo')
     return (
       <View style={styles.container}>
         <View style={styles.profile}>
-          <Avatar style={{ width: 72, height: 72 }} target={this.props.avatar} />
-          <Text style={styles.username}>{this.props.username}</Text>
+          <Avatar style={{ width: 72, height: 72 }} target={avatar} />
+          <Text style={styles.username}>{username}</Text>
         </View>
         <ScrollView style={styles.threadsList}>
           <Text style={styles.threadsTitle}>
@@ -75,11 +75,8 @@ class ContactModal extends React.Component<Props> {
 }
 
 const mapStateToProps = (state: RootState, ownProps: NavigationScreenProps<NavProps>): StateProps => {
-  const peerId = ownProps.navigation.getParam('peerId')
-  const contact = ContactsSelectors.contactById(state, peerId)
+  const peerId = ownProps.navigation.getParam('contactInfo').id
   return {
-    username: contact !== undefined ? (contact.username || contact.id) : 'unknown',
-    avatar: contact !== undefined ? contact.avatar : undefined,
     threadThumbs: getThreadThumbs(state, peerId, 'name')
   }
 }
diff --git a/App/Containers/Contacts.tsx b/App/Containers/Contacts.tsx
index 931cefa81..82499d8ba 100644
--- a/App/Containers/Contacts.tsx
+++ b/App/Containers/Contacts.tsx
@@ -37,8 +37,7 @@ interface NavProps {
 type Props = StateProps & NavigationScreenProps<NavProps>
 
 interface State {
-  searchString?: string,
-  showInviteContactModal: boolean
+  searchString?: string
 }
 
 class Contacts extends React.Component<Props, State> {
@@ -58,7 +57,7 @@ class Contacts extends React.Component<Props, State> {
     )
     const headerRight = (
       <TextileHeaderButtons>
-        <Item iconName='plus' onPress={addContact} />
+        <Item title='Add Contact' iconName='plus' onPress={addContact} />
       </TextileHeaderButtons>
     )
     return {
@@ -70,9 +69,7 @@ class Contacts extends React.Component<Props, State> {
 
   constructor(props: Props) {
     super(props)
-    this.state = {
-      showInviteContactModal: false
-    }
+    this.state = {}
   }
 
   componentDidMount () {
@@ -101,8 +98,8 @@ class Contacts extends React.Component<Props, State> {
           ItemSeparatorComponent={RowSeparator}
           ListHeaderComponent={
             <SearchBar
-              containerStyle={{ backgroundColor: '#FAFCFE' }}
-              inputStyle={{ fontFamily: s.FONT_FAMILY_REGULAR, fontSize: s.FONT_SIZE_REGULAR, color: s.COLOR_FONT_DARK_ON_LIGHT_MEDIUM, backgroundColor: s.COLOR_GREY_LIGHT }}
+              containerStyle={{ backgroundColor: s.COLOR_GREY_LIGHT }}
+              inputStyle={{ fontFamily: s.FONT_FAMILY_REGULAR, fontSize: s.FONT_SIZE_REGULAR, color: s.COLOR_FONT_DARK_ON_LIGHT_MEDIUM, backgroundColor: '#FAFCFE' }}
               additionalInputProps={{ autoCapitalize: 'none', autoCorrect: false, spellCheck: false }}
               iconColor={s.COLOR_GREY_MEDIUM}
               onTextChanged={this.updateSearchString}
@@ -111,10 +108,6 @@ class Contacts extends React.Component<Props, State> {
           keyboardShouldPersistTaps='handled'
           keyboardDismissMode='on-drag'
         />
-        <InviteContactModal
-          isVisible={this.state.showInviteContactModal}
-          cancel={this.cancelInviteContact}
-        />
       </View>
     )
   }
@@ -127,11 +120,10 @@ class Contacts extends React.Component<Props, State> {
     const rightItems = [<Icon key='more' name='chevron-right' size={24} color={s.COLOR_GREY_MEDIUM} />]
     return (
       <ListItem
-        id={item.id}
         title={item.username || item.id}
         leftItem={leftItem}
         rightItems={rightItems}
-        onPress={this.onPress}
+        onPress={this.onPress(item)}
       />
     )
   }
@@ -142,16 +134,14 @@ class Contacts extends React.Component<Props, State> {
     })
   }
 
-  onPress = (id: string) => {
-    this.props.navigation.navigate('Contact', { peerId: id })
+  onPress = (contactInfo: ContactInfo) => {
+    return () => {
+      this.props.navigation.navigate('Contact', { contactInfo })
+    }
   }
 
   inviteContactRequest = () => {
-    this.setState({showInviteContactModal: true})
-  }
-
-  cancelInviteContact = () => {
-    this.setState({showInviteContactModal: false})
+    this.props.navigation.navigate('AddContact')
   }
 
   openDrawer = () => {
diff --git a/App/Containers/Groups.tsx b/App/Containers/Groups.tsx
index 4ce87e7b5..84aa0901b 100644
--- a/App/Containers/Groups.tsx
+++ b/App/Containers/Groups.tsx
@@ -65,7 +65,7 @@ class Groups extends React.Component<Props, State> {
 
     const headerRight = (
       <TextileHeaderButtons>
-        <Item iconName='plus' onPress={openThreadModal} />
+        <Item title='Add Group' iconName='plus' onPress={openThreadModal} />
       </TextileHeaderButtons>
     )
 
diff --git a/App/Containers/MailListSignupScreen.tsx b/App/Containers/MailListSignupScreen.tsx
index ebc78246b..5694d1fb8 100644
--- a/App/Containers/MailListSignupScreen.tsx
+++ b/App/Containers/MailListSignupScreen.tsx
@@ -5,7 +5,7 @@ import Config from 'react-native-config'
 import { Buffer } from 'buffer'
 
 import Input from '../SB/components/Input'
-import Button from '../Components/Button'
+import Button from '../Components/LargeButton'
 import * as s from '../Themes/Constants'
 
 const CONTAINER: ViewStyle = {
@@ -43,6 +43,11 @@ const LABEL: TextStyle = {
   fontFamily: s.FONT_FAMILY_REGULAR
 }
 
+const BUTTON: ViewStyle = {
+  ...ITEM,
+  alignSelf: 'center'
+}
+
 const LINK: TextStyle = {
   fontFamily: s.FONT_FAMILY_REGULAR,
   fontSize: s.FONT_SIZE_REGULAR,
@@ -124,7 +129,7 @@ export default class MailListSignupScreen extends React.Component<Props, State>
               disabled={!this.state.valid}
               processing={this.state.processing}
               onPress={this.submit}
-              style={ITEM}
+              style={BUTTON}
             />
             <Text style={LINK} onPress={this.props.onSuccess}>No thanks</Text>
             <Toast
diff --git a/App/Containers/OnboardingUsername.tsx b/App/Containers/OnboardingUsername.tsx
index 787bb9182..2f8bef3db 100644
--- a/App/Containers/OnboardingUsername.tsx
+++ b/App/Containers/OnboardingUsername.tsx
@@ -4,7 +4,7 @@ import { connect } from 'react-redux'
 import { KeyboardAvoidingView, Image, Text, ViewStyle, ImageStyle, TextStyle, View } from 'react-native'
 
 import Input from '../SB/components/Input'
-import Button from '../Components/Button'
+import Button from '../Components/LargeButton'
 import * as s from '../Themes/Constants'
 import { RootAction, RootState } from '../Redux/Types'
 import AccountActions from '../Redux/AccountRedux'
@@ -44,6 +44,11 @@ const LABEL: TextStyle = {
   fontFamily: s.FONT_FAMILY_REGULAR
 }
 
+const BUTTON: ViewStyle = {
+  ...ITEM,
+  alignSelf: 'center'
+}
+
 interface OwnProps {
   suggestion?: string
   onSuccess?: () => void
@@ -140,7 +145,7 @@ class OnboardingUsername extends React.Component<Props, State> {
               disabled={!this.state.valid || this.state.nextDisabled}
               processing={this.props.processing}
               onPress={this.submit}
-              style={ITEM}
+              style={BUTTON}
             />
           </View>
       </KeyboardAvoidingView>
diff --git a/App/Containers/SetAvatar.tsx b/App/Containers/SetAvatar.tsx
index a87b365c1..ba104e581 100644
--- a/App/Containers/SetAvatar.tsx
+++ b/App/Containers/SetAvatar.tsx
@@ -5,7 +5,7 @@ import { KeyboardAvoidingView, Image, Text, ViewStyle, ImageStyle, TextStyle, Vi
 import { NavigationScreenProps, NavigationScreenProp, NavigationRoute } from 'react-navigation'
 import Icon from '@textile/react-native-icon'
 
-import Button from '../Components/Button'
+import Button from '../Components/LargeButton'
 import * as s from '../Themes/Constants'
 import { RootAction, RootState } from '../Redux/Types'
 import UIActions from '../Redux/UIRedux'
@@ -57,6 +57,11 @@ const LABEL: TextStyle = {
   fontFamily: s.FONT_FAMILY_REGULAR
 }
 
+const BUTTON: ViewStyle = {
+  ...ITEM,
+  alignSelf: 'center'
+}
+
 const LINK: TextStyle = {
   fontFamily: s.FONT_FAMILY_REGULAR,
   fontSize: s.FONT_SIZE_REGULAR,
@@ -184,7 +189,7 @@ class SetAvatar extends React.Component<Props> {
             <Button
               text={this.props.buttonText}
               onPress={action}
-              style={ITEM}
+              style={BUTTON}
             />
             <Text style={[LINK, { opacity: this.props.displaySubButton ? 1 : 0 }]} onPress={this.props.displayPhotoChooser}>Choose Another</Text>
           </View>
diff --git a/App/NativeModules/MessageComposer/Api.ts b/App/NativeModules/MessageComposer/Api.ts
new file mode 100644
index 000000000..986cebe31
--- /dev/null
+++ b/App/NativeModules/MessageComposer/Api.ts
@@ -0,0 +1,7 @@
+import { NativeModules } from 'react-native'
+
+const { MessageComposer } = NativeModules
+
+export function composeMessage(number: string, message: string) {
+  MessageComposer.composeMessage(number, message)
+}
diff --git a/App/NativeModules/MessageComposer/index.ts b/App/NativeModules/MessageComposer/index.ts
new file mode 100644
index 000000000..52479a76a
--- /dev/null
+++ b/App/NativeModules/MessageComposer/index.ts
@@ -0,0 +1 @@
+export * from './Api'
diff --git a/App/Navigation/AppNavigation/Modal/AddContact/index.ts b/App/Navigation/AppNavigation/Modal/AddContact/index.ts
new file mode 100644
index 000000000..cec2508dc
--- /dev/null
+++ b/App/Navigation/AppNavigation/Modal/AddContact/index.ts
@@ -0,0 +1,21 @@
+import { createStackNavigator } from 'react-navigation'
+
+import AddContact from '../../../../Containers/AddContact'
+import Contact from '../../../../Containers/Contact'
+import styles, { headerTintColor } from '../../../Styles/NavigationStyles'
+
+const nav = createStackNavigator(
+  {
+    AddContact,
+    Contact
+  },
+  {
+    defaultNavigationOptions: {
+      headerStyle: styles.header,
+      headerTitleStyle: styles.headerTitle,
+      headerTintColor
+    }
+  }
+)
+
+export default nav
diff --git a/App/Navigation/AppNavigation/Modal/index.ts b/App/Navigation/AppNavigation/Modal/index.ts
index d8d965bde..3f201969c 100644
--- a/App/Navigation/AppNavigation/Modal/index.ts
+++ b/App/Navigation/AppNavigation/Modal/index.ts
@@ -1,11 +1,13 @@
 import { createStackNavigator } from 'react-navigation'
 
 import Primary from './Primary'
+import AddContact from './AddContact'
 import Settings from './Settings'
 
 const nav = createStackNavigator(
   {
     Primary,
+    AddContact,
     Settings
   },
   {
diff --git a/App/Redux/ContactsRedux.ts b/App/Redux/ContactsRedux.ts
index 4983955df..db3409862 100644
--- a/App/Redux/ContactsRedux.ts
+++ b/App/Redux/ContactsRedux.ts
@@ -1,37 +1,282 @@
 import { createAction, ActionType, getType } from 'typesafe-actions'
-import { RootState } from './Types'
+import { SectionListData } from 'react-native'
 import { ContactInfo } from '@textile/react-native-sdk'
+import Contacts from 'react-native-contacts'
+
+import { RootState } from './Types'
 
 const actions = {
   getContactsRequest: createAction('GET_CONTACTS_REQUEST'),
   getContactsSuccess: createAction('GET_CONTACT_SUCCESS', (resolve) => {
     return (contacts: ReadonlyArray<ContactInfo>) => resolve({contacts})
+  }),
+  searchRequest: createAction('@contacts/SEARCH_REQUEST', (resolve) => {
+    return (searchString: string) => resolve({ searchString })
+  }),
+  searchStarted: createAction('@contacts/SEARCH_STARTED'),
+  searchResultsTextile: createAction('@contacts/SEARCH_RESULTS_TEXTILE', (resolve) => {
+    return (results: ReadonlyArray<ContactInfo>) => resolve({ results })
+  }),
+  searchResultsAddressBook: createAction('@contacts/SEARCH_RESULTS_ADDRESS_BOOK', (resolve) => {
+    return (results: ReadonlyArray<Contacts.Contact>) => resolve({ results })
+  }),
+  searchErrorTextile: createAction('@contacts/SEARCH_ERROR_TEXTILE', (resolve) => {
+    return (error: any) => resolve({ error })
+  }),
+  searchErrorAddressBook: createAction('@contacts/SEARCH_ERROR_ADDRESS_BOOK', (resolve) => {
+    return (error: any) => resolve({ error })
+  }),
+  clearSearch: createAction('@contacts/CLEAR_SEARCH'),
+  addContactRequest: createAction('@contacts/ADD_CONTACT_REQUEST', (resolve) => {
+    return (contactInfo: ContactInfo) => resolve({ contactInfo })
+  }),
+  addContactSuccess: createAction('@contacts/ADD_CONTACT_SUCCESS', (resolve) => {
+    return (contactInfo: ContactInfo) => resolve({ contactInfo })
+  }),
+  addContactError: createAction('@contacts/ADD_CONTACT_ERROR', (resolve) => {
+    return (contactInfo: ContactInfo, error: any) => resolve({ contactInfo, error })
+  }),
+  clearAddContact: createAction('@contacts/CLEAR_ADD_CONTACT_ERROR', (resolve) => {
+    return (contactInfo: ContactInfo) => resolve({ contactInfo })
+  }),
+  authorInviteRequest: createAction('@contacts/AUTHOR_INVITE_REQUEST', (resolve) => {
+    return (contact: Contacts.Contact) => resolve({ contact })
   })
 }
 
 export type ContactsAction = ActionType<typeof actions>
 
+export interface AddingContact {
+  readonly error?: string
+}
+
+export interface AddingContacts {
+  readonly [key: string]: AddingContact
+}
+
 export interface ContactsState {
   readonly contacts: ReadonlyArray<ContactInfo>
+  readonly textileSearchResults: {
+    readonly processing: boolean
+    readonly results?: ReadonlyArray<ContactInfo>
+    readonly error?: string
+  }
+  readonly addressBookSearchResults: {
+    readonly processing: boolean
+    readonly results?: ReadonlyArray<Contacts.Contact>
+    readonly error?: string
+  }
+  readonly addingContacts: AddingContacts
 }
 
 export const initialState: ContactsState = {
-  contacts: []
+  contacts: [],
+  textileSearchResults: {
+    processing: false
+  },
+  addressBookSearchResults: {
+    processing: false
+  },
+  addingContacts: {}
 }
 
 export function reducer (state: ContactsState = initialState, action: ContactsAction): ContactsState {
   switch (action.type) {
     case getType(actions.getContactsSuccess):
       return { ...state, contacts: action.payload.contacts }
+    case getType(actions.searchRequest): {
+      return {
+        ...state,
+        textileSearchResults: {
+          processing: false
+        },
+        addressBookSearchResults: {
+          processing: false
+        }
+      }
+    }
+    case getType(actions.searchStarted): {
+      return {
+        ...state,
+        textileSearchResults: {
+          processing: true
+        },
+        addressBookSearchResults: {
+          processing: true
+        }
+      }
+    }
+    case getType(actions.searchResultsTextile): {
+      return {
+        ...state,
+        textileSearchResults: {
+          processing: false,
+          results: action.payload.results
+        }
+      }
+    }
+    case getType(actions.searchResultsAddressBook): {
+      return {
+        ...state,
+        addressBookSearchResults: {
+          processing: false,
+          results: action.payload.results
+        }
+      }
+    }
+    case getType(actions.searchErrorTextile): {
+      const { error } = action.payload
+      const message = error.message as string || error as string || 'unknown'
+      return {
+        ...state,
+        textileSearchResults: {
+          processing: false,
+          error: message
+        }
+      }
+    }
+    case getType(actions.searchErrorAddressBook): {
+      const { error } = action.payload
+      const message = error.message as string || error as string || 'unknown'
+      return {
+        ...state,
+        addressBookSearchResults: {
+          processing: false,
+          error: message
+        }
+      }
+    }
+    case getType(actions.clearSearch): {
+      return {
+        ...state,
+        textileSearchResults: {
+          processing: false
+        },
+        addressBookSearchResults: {
+          processing: false
+        }
+      }
+    }
+    case getType(actions.addContactRequest): {
+      return {
+        ...state,
+        addingContacts: {
+          ...state.addingContacts,
+          [action.payload.contactInfo.id]: {}
+        }
+      }
+    }
+    case getType(actions.addContactSuccess):
+    case getType(actions.clearAddContact): {
+      const { [action.payload.contactInfo.id]: removed, ...addingContacts } = state.addingContacts
+      return {
+        ...state,
+        addingContacts
+      }
+    }
+    case getType(actions.addContactError): {
+      const { contactInfo, error } = action.payload
+      const message = error.message as string || error as string || 'unknown'
+      return {
+        ...state,
+        addingContacts: {
+          ...state.addingContacts,
+          [contactInfo.id]: {
+            error: message
+          }
+        }
+      }
+    }
     default:
       return state
   }
 }
 
+export interface TextileSearchResult {
+  readonly key: string
+  readonly type: 'textile'
+  readonly data: {
+    contactInfo: ContactInfo,
+    isContact: boolean,
+    adding: boolean
+  }
+}
+
+export interface AddressBookSearchResult {
+  readonly key: string
+  readonly type: 'addressBook'
+  readonly data: Contacts.Contact
+}
+
+export interface ErrorSearchResult {
+  readonly key: string
+  readonly type: 'error'
+  readonly data: string
+}
+
+export interface LoadingSearchResult {
+  readonly key: string
+  readonly type: 'loading'
+}
+
+export interface EmptySearchResult {
+  readonly key: string
+  readonly type: 'empty'
+}
+
+export type SearchResult = TextileSearchResult | AddressBookSearchResult | ErrorSearchResult | LoadingSearchResult | EmptySearchResult
+
+export interface SearchResultsSection {
+  readonly key: string
+  readonly title: string
+  readonly data: SearchResult[]
+}
+
 export const ContactsSelectors = {
   isKnown: (state: RootState, id: string) => state.contacts.contacts.some((p) => p.id === id),
   byThreadId: (state: RootState, id: string) => state.contacts.contacts.filter((contact) => (contact.thread_ids || []).indexOf(id) > -1),
-  contactById: (state: RootState, id: string) => state.contacts.contacts.find((contact) => contact.id === id)
+  contactById: (state: RootState, id: string) => state.contacts.contacts.find((contact) => contact.id === id),
+  searchResults: (state: RootState) => {
+    const sections: SearchResultsSection[] = []
+
+    let textileData: SearchResult[] | undefined
+    if (state.contacts.textileSearchResults.processing) {
+      textileData = [{ key: 'textile_loading', type: 'loading' }]
+    } else if (state.contacts.textileSearchResults.error) {
+      textileData = [{ key: 'textile_error', type: 'error', data: state.contacts.textileSearchResults.error }]
+    } else if (state.contacts.textileSearchResults.results && state.contacts.textileSearchResults.results.length > 0) {
+      textileData = state.contacts.textileSearchResults.results.map((result) => {
+        const isContact = ContactsSelectors.isKnown(state, result.id)
+        const adding = Object.keys(state.contacts.addingContacts).indexOf(result.id) > -1
+        const textileResult: TextileSearchResult = { key: result.id, type: 'textile', data: { contactInfo: result, isContact, adding } }
+        return textileResult
+      })
+    } else if (state.contacts.textileSearchResults.results && state.contacts.textileSearchResults.results.length === 0) {
+      textileData = [{ key: 'textile_empty', type: 'empty' }]
+    }
+    if (textileData) {
+      sections.push({ key: 'textile', title: 'Textile Users', data: textileData })
+    }
+
+    let addressBookData: SearchResult[] | undefined
+    if (state.contacts.addressBookSearchResults.processing) {
+      addressBookData = [{ key: 'addressBook_loading', type: 'loading' }]
+    } else if (state.contacts.addressBookSearchResults.error) {
+      addressBookData = [{ key: 'addressBook_error', type: 'error', data: state.contacts.addressBookSearchResults.error }]
+    } else if (state.contacts.addressBookSearchResults.results && state.contacts.addressBookSearchResults.results.length > 0) {
+      addressBookData = state.contacts.addressBookSearchResults.results.map((result) => {
+        const addressBookResult: AddressBookSearchResult = { key: result.recordID, type: 'addressBook', data: result }
+        return addressBookResult
+      })
+    } else if (state.contacts.addressBookSearchResults.results && state.contacts.addressBookSearchResults.results.length === 0) {
+      addressBookData = [{ key: 'addressBook_empty', type: 'empty' }]
+    }
+    if (addressBookData) {
+      sections.push({ key: 'addressBook', title: 'Address Book', data: addressBookData })
+    }
+
+    return sections
+  }
 }
 
 export default actions
diff --git a/App/Sagas/Contacts/ContactsSagas.ts b/App/Sagas/Contacts/ContactsSagas.ts
new file mode 100644
index 000000000..05aa3a2f7
--- /dev/null
+++ b/App/Sagas/Contacts/ContactsSagas.ts
@@ -0,0 +1,198 @@
+import {
+  call,
+  put,
+  take,
+  takeLatest,
+  takeEvery,
+  cancelled,
+  all,
+  race,
+  select
+} from 'redux-saga/effects'
+import { delay } from 'redux-saga'
+import { ActionType, getType } from 'typesafe-actions'
+import { Platform, PermissionsAndroid } from 'react-native'
+import Contacts from 'react-native-contacts'
+import {
+  contacts,
+  findContact,
+  addContact,
+  ContactInfo,
+  ContactInfoQueryResult
+} from '@textile/react-native-sdk'
+import Config from 'react-native-config'
+
+import ContactsActions from '../../Redux/ContactsRedux'
+import { getPeerId, getUsername } from '../../Redux/AccountSelectors'
+import { composeMessage } from '../../NativeModules/MessageComposer'
+
+export function * addFriends() {
+  yield call(refreshContacts)
+}
+
+export function * refreshContacts() {
+  try {
+    const contactsResult: ReadonlyArray<ContactInfo> = yield call(contacts)
+    yield put(ContactsActions.getContactsSuccess(contactsResult))
+
+  } catch (error) {
+    // skip for now
+  }
+}
+
+export function * watchForAddContactRequests() {
+  yield takeEvery(getType(ContactsActions.addContactRequest), handleAddContactRequest)
+}
+
+function * handleAddContactRequest(action: ActionType<typeof ContactsActions.addContactRequest>) {
+  const { contactInfo } = action.payload
+  try {
+    yield call(addContact, contactInfo)
+    yield put(ContactsActions.addContactSuccess(contactInfo))
+    yield call(refreshContacts)
+  } catch (error) {
+    yield put(ContactsActions.addContactError(contactInfo, error))
+  }
+}
+
+function * searchTextile(searchString: string) {
+  try {
+    const result: ContactInfoQueryResult = yield call(findContact, searchString, 20, 3)
+    const isCancelled = yield cancelled()
+    if (!isCancelled) {
+      let results: ContactInfo[] = []
+      if (result.local) {
+        results = results.concat(result.local)
+      }
+      if (result.remote) {
+        results = results.concat(result.remote)
+      }
+      const distinct: ContactInfo[] = []
+      const map = new Map<string, boolean>()
+      for (const item of results) {
+        if (!map.has(item.id)) {
+          map.set(item.id, true)
+          distinct.push(item)
+        }
+      }
+      yield put(ContactsActions.searchResultsTextile(distinct))
+    }
+  } catch (error) {
+    yield put(ContactsActions.searchErrorTextile(error))
+  }
+}
+
+function * searchAddressBook(searchString: string) {
+  try {
+    const permissions = Platform.OS === 'ios' ? requestPermissionsIOS : requestPermissionsAndroid
+    const result: 'undefined' | 'authorized' | 'denied' = yield call(permissions)
+    if (result !== 'authorized') {
+      return
+    }
+    const contacts: Contacts.Contact[] = yield call(getContactsMatching, searchString)
+    const isCancelled = yield cancelled()
+    if (!isCancelled) {
+      yield put(ContactsActions.searchResultsAddressBook(contacts))
+    }
+  } catch (error) {
+    yield put(ContactsActions.searchErrorAddressBook(error))
+  }
+}
+
+function * executeSearchRequest(searchString: string) {
+  yield put(ContactsActions.searchStarted())
+  yield race({
+    search: all([call(searchTextile, searchString), call(searchAddressBook, searchString)]),
+    cancel: take(getType(ContactsActions.clearSearch))
+  })
+}
+
+function * handleSearchRequest(action: ActionType<typeof ContactsActions.searchRequest>) {
+  // debounce it, but cancel if we clear search
+  const { debounce } = yield race({
+    debounce: call(delay, 1000),
+    cancel: take(getType(ContactsActions.clearSearch))
+  })
+  if (debounce) {
+    yield call(executeSearchRequest, action.payload.searchString)
+  }
+}
+
+export function * watchForSearchRequest() {
+  yield takeLatest(getType(ContactsActions.searchRequest), handleSearchRequest)
+}
+
+export function * sendInviteMessage() {
+  while (true) {
+    const action: ActionType<typeof ContactsActions.authorInviteRequest> = yield take(getType(ContactsActions.authorInviteRequest))
+    const { phoneNumbers } = action.payload.contact
+    const iphone = phoneNumbers.find((number) => number.label.toLowerCase() === 'iphone')
+    const mobile = phoneNumbers.find((number) => number.label.toLowerCase() === 'mobile')
+    const home = phoneNumbers.find((number) => number.label.toLowerCase() === 'home')
+    const work = phoneNumbers.find((number) => number.label.toLowerCase() === 'work')
+    const sendTo = iphone || mobile || home || work
+    if (sendTo) {
+      const username: string | undefined = yield select(getUsername)
+      const peerId: string | undefined = yield select(getPeerId)
+      const url = Platform.OS === 'ios' ? Config.RN_IOS_STORE_LINK : Config.RN_ANDROID_STORE_LINK
+      let message = `Join me on Textile Photos: ${url}`
+      if (username) {
+        message = `${message}\nMy username: ${username}`
+      }
+      if (peerId) {
+        message = `${message}\nMy peer id snippet: ${peerId.substr(peerId.length - 8, 8)}`
+      }
+      yield call(composeMessage, sendTo.number, message)
+    }
+  }
+}
+
+async function requestPermissionsAndroid() {
+  const result = await PermissionsAndroid.request(
+    PermissionsAndroid.PERMISSIONS.READ_CONTACTS,
+    {
+      title: 'Contacts',
+      message: 'Authorizing access to your contacts makes it easy for you to invite others to Textile. None of you contact data is saved or transmitted in any way.'
+    }
+  )
+  if (result === PermissionsAndroid.RESULTS.GRANTED) {
+    return 'authorized'
+  } else {
+    return 'denied'
+  }
+}
+
+async function requestPermissionsIOS() {
+  return new Promise<'undefined' |  'authorized' | 'denied'>((resolve, reject) => {
+    Contacts.checkPermission((err, permission) => {
+      if (err) {
+        reject(err)
+        return
+      }
+      if (permission === 'undefined') {
+        Contacts.requestPermission((err, permission) => {
+          if (err) {
+            reject(err)
+            return
+          } else {
+            resolve(permission)
+          }
+        })
+      } else {
+        resolve(permission)
+      }
+    })
+  })
+}
+
+async function getContactsMatching(searchString: string) {
+  return new Promise<Contacts.Contact[]>((resolve, reject) => {
+    Contacts.getContactsMatchingString(searchString, (err, contacts) => {
+      if (err) {
+        reject(err)
+        return
+      }
+      resolve(contacts)
+    })
+  })
+}
diff --git a/App/Sagas/Contacts/index.ts b/App/Sagas/Contacts/index.ts
new file mode 100644
index 000000000..24452e6b4
--- /dev/null
+++ b/App/Sagas/Contacts/index.ts
@@ -0,0 +1,22 @@
+import { all, call, takeEvery } from 'redux-saga/effects'
+import { getType } from 'typesafe-actions'
+
+import {
+  addFriends,
+  refreshContacts,
+  watchForSearchRequest,
+  watchForAddContactRequests,
+  sendInviteMessage
+} from './ContactsSagas'
+import UIActions from '../../Redux/UIRedux'
+import ContactsActions from '../../Redux/ContactsRedux'
+
+export default function * contactsSaga () {
+  yield all([
+    takeEvery(getType(UIActions.addFriendRequest), addFriends),
+    takeEvery(getType(ContactsActions.getContactsRequest), refreshContacts),
+    call(watchForSearchRequest),
+    call(watchForAddContactRequests),
+    call(sendInviteMessage)
+  ])
+}
diff --git a/App/Sagas/TextileSagas.ts b/App/Sagas/TextileSagas.ts
index 763b7cd78..06bf11744 100644
--- a/App/Sagas/TextileSagas.ts
+++ b/App/Sagas/TextileSagas.ts
@@ -17,8 +17,6 @@ import Config from 'react-native-config'
 import {
   overview,
   Overview,
-  contacts,
-  ContactInfo,
   checkCafeMessages,
   addThreadIgnore,
   setAvatar,
@@ -101,19 +99,6 @@ export function * navigateToLikes ( action: ActionType<typeof UIActions.navigate
   yield call(NavigationService.navigate, 'LikesScreen')
 }
 
-export function * refreshContacts () {
-  try {
-    const contactsResult: ReadonlyArray<ContactInfo> = yield call(contacts)
-    yield put(ContactsActions.getContactsSuccess(contactsResult))
-  } catch (error) {
-    // skip for now
-  }
-}
-
-export function * addFriends ( action: ActionType<typeof UIActions.addFriendRequest> ) {
-  yield call(refreshContacts)
-}
-
 export function * initializeAppState () {
     yield take(getType(StartupActions.startup))
     const defaultAppState = yield select(TextileNodeSelectors.appState)
diff --git a/App/Sagas/index.ts b/App/Sagas/index.ts
index 82bbf7985..36f28b39e 100644
--- a/App/Sagas/index.ts
+++ b/App/Sagas/index.ts
@@ -20,6 +20,7 @@ import ContactsActions from '../Redux/ContactsRedux'
 /* ------------- Sagas ------------- */
 
 import accountSaga from './Account'
+import contactsSaga from './Contacts'
 
 import { startup } from './StartupSagas'
 
@@ -90,8 +91,6 @@ import {
   navigateToThread,
   navigateToComments,
   navigateToLikes,
-  refreshContacts,
-  addFriends,
   addPhotoLike,
   initializeAppState,
   refreshMessages,
@@ -110,6 +109,7 @@ import {
 export default function * root (dispatch: Dispatch) {
   yield all([
     call(accountSaga),
+    call(contactsSaga),
 
     call(manageNode),
     call(handleCreateNodeRequest, dispatch),
@@ -145,11 +145,8 @@ export default function * root (dispatch: Dispatch) {
     takeEvery(getType(UIActions.navigateToThreadRequest), navigateToThread),
     takeEvery(getType(UIActions.navigateToCommentsRequest), navigateToComments),
     takeEvery(getType(UIActions.navigateToLikesRequest), navigateToLikes),
-    takeEvery(getType(UIActions.addFriendRequest), addFriends),
     takeEvery(getType(UIActions.addLikeRequest), addPhotoLike),
 
-    takeEvery(getType(ContactsActions.getContactsRequest), refreshContacts),
-
     takeEvery(getType(PhotoViewingActions.addThreadRequest), addThread),
     takeEvery(getType(PhotoViewingActions.threadAddedNotification), monitorThreadAddedNotifications),
     takeEvery(getType(PhotoViewingActions.removeThreadRequest), removeThread),
diff --git a/App/Themes/Constants.ts b/App/Themes/Constants.ts
index 7deb6c39e..675d9704f 100644
--- a/App/Themes/Constants.ts
+++ b/App/Themes/Constants.ts
@@ -25,6 +25,20 @@ export const FONT_LINE_HEIGHT_SMALL = 15
 export const FONT_LINE_HEIGHT_REGULAR = 18
 export const FONT_LINE_HEIGHT_MEDIUM = 24
 
+// 4, 8, 12, 16, 24, 32, 48, 64, 96, 128, 192, 256
+export const SPACING_4 = 4
+export const SPACING_8 = 8
+export const SPACING_12 = 12
+export const SPACING_16 = 16
+export const SPACING_24 = 24
+export const SPACING_32 = 32
+export const SPACING_48 = 48
+export const SPACING_64 = 64
+export const SPACING_96 = 96
+export const SPACING_128 = 128
+export const SPACING_192 = 192
+export const SPACING_256 = 256
+
 export const MARGIN_EXTRA_SMALL = 8
 export const MARGIN_SMALL = 16
 export const MARGIN_STANDARD = 20
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 30357cfe1..94bead4fd 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -53,6 +53,8 @@ RN_TEXTILE_CAFE_API_PIN_PATH="/cafe/v0/pin"
 RN_TEXTILE_CAMERA_ROLL_THREAD_KEY="photos-camera_roll"
 RN_TEMPORARY_REFERRAL="SOMETHING"
 RN_URL_SCHEME="textile-dev"
+RN_IOS_STORE_LINK="https://<ios store link>"
+RN_ANDROID_STORE_LINK="https://<android store link>"
 ```
 
 You can find the values for `optional-cafe-url` in the Quick Start step above and the `gateway-address` (including port) should be found in the Cafe setup step above.
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 8c8c0f4fe..5a31b63b0 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -178,6 +178,7 @@ dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
     implementation "com.facebook.react:react-native:+"  // From node_modules
+    implementation project(':react-native-contacts')
     compile project(':react-native-background-fetch')
     compile project(':react-native-push-notification')
     compile project(':react-native-background-upload')
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 22e5e4ee0..b31b7c0d6 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -7,6 +7,9 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <!-- For API 22 and below, react-native-contacts -->
+    <uses-permission android:name="android.permission.READ_PROFILE" />
 
     <application
       android:name=".MainApplication"
diff --git a/android/app/src/main/java/com/textile/MainApplication.java b/android/app/src/main/java/com/textile/MainApplication.java
index e84eeacf5..ffb0c9684 100644
--- a/android/app/src/main/java/com/textile/MainApplication.java
+++ b/android/app/src/main/java/com/textile/MainApplication.java
@@ -19,6 +19,7 @@
 import com.lugg.ReactNativeConfig.ReactNativeConfigPackage;
 import com.ocetnik.timer.BackgroundTimerPackage;
 import com.rnfs.RNFSPackage;
+import com.rt2zz.reactnativecontacts.ReactNativeContacts;
 import com.smixx.fabric.FabricPackage;
 import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
 import com.swmansion.rnscreens.RNScreensPackage;
@@ -53,6 +54,7 @@ protected List<ReactPackage> getPackages() {
           new RNVersionNumberPackage(),
           new RNGestureHandlerPackage(),
           new RNScreensPackage(),
+          new ReactNativeContacts(),
           new TextilePackage()
       );
     }
diff --git a/android/app/src/main/java/com/textile/textilenode/MessageComposer.java b/android/app/src/main/java/com/textile/textilenode/MessageComposer.java
new file mode 100644
index 000000000..e63b69ab6
--- /dev/null
+++ b/android/app/src/main/java/com/textile/textilenode/MessageComposer.java
@@ -0,0 +1,35 @@
+package com.textile.textilenode;
+
+import android.content.Intent;
+import android.net.Uri;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+
+public class MessageComposer extends ReactContextBaseJavaModule {
+
+    public static final String REACT_CLASS = "MessageComposer";
+    private static ReactApplicationContext reactContext = null;
+
+    public MessageComposer(ReactApplicationContext reactContext) {
+        super(reactContext);
+        this.reactContext = reactContext;
+    }
+
+    @Override
+    public String getName() {
+        return REACT_CLASS;
+    }
+
+    @ReactMethod
+    public void composeMessage(String number, String message) {
+        Intent intent = new Intent(Intent.ACTION_SEND);
+        intent.setData(Uri.parse("smsto:" + number));
+        intent.putExtra("sms_body", message);
+        if (intent.resolveActivity(this.reactContext.getPackageManager()) != null) {
+            this.reactContext.startActivity(intent);
+        }
+
+    }
+}
diff --git a/android/app/src/main/java/com/textile/textilenode/TextilePackage.java b/android/app/src/main/java/com/textile/textilenode/TextilePackage.java
index 7953f3f30..805d53128 100644
--- a/android/app/src/main/java/com/textile/textilenode/TextilePackage.java
+++ b/android/app/src/main/java/com/textile/textilenode/TextilePackage.java
@@ -19,6 +19,7 @@ public List<NativeModule> createNativeModules(ReactApplicationContext reactConte
         List<NativeModule> modules = new ArrayList<>();
 
         modules.add(new FS(reactContext));
+        modules.add(new MessageComposer(reactContext));
 
         return modules;
     }
diff --git a/android/settings.gradle b/android/settings.gradle
index 8e2ecb815..a32d038e1 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -27,4 +27,6 @@ include ':react-native-gesture-handler'
 project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-gesture-handler/android')
 include ':react-native-screens'
 project(':react-native-screens').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-screens/android')
+include ':react-native-contacts'
+project(':react-native-contacts').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-contacts/android')
 include ':textilego'
diff --git a/ios/NativeModules/Events.m b/ios/NativeModules/Events.m
deleted file mode 100644
index f4a320658..000000000
--- a/ios/NativeModules/Events.m
+++ /dev/null
@@ -1,81 +0,0 @@
-// https://stackoverflow.com/questions/38818287/react-native-bridge-is-nil-when-i-call-method-from-another-method#answer-43543711
-
-#import "Events.h"
-
-// import RCTBridge
-#if __has_include(<React/RCTBridge.h>)
-#import <React/RCTBridge.h>
-#elif __has_include(“RCTBridge.h”)
-#import “RCTBridge.h”
-#else
-#import “React/RCTBridge.h” // Required when used as a Pod in a Swift project
-#endif
-
-// import RCTEventDispatcher
-#if __has_include(<React/RCTEventDispatcher.h>)
-#import <React/RCTEventDispatcher.h>
-#elif __has_include(“RCTEventDispatcher.h”)
-#import “RCTEventDispatcher.h”
-#else
-#import “React/RCTEventDispatcher.h” // Required when used as a Pod in a Swift project
-#endif
-
-@implementation Events
-
-RCT_EXPORT_MODULE();
-
-// The list of available events
-- (NSArray<NSString *> *)supportedEvents {
-  return @[@"newLocalPhoto",
-           @"onOnline",
-           @"onThreadAdded",
-           @"onThreadRemoved",
-           @"onThreadUpdate",
-           @"onAccountPeerAdded",
-           @"onAccountPeerRemoved",
-           @"onNotification"];
-}
-
-// This function listens for the events we want to send out and will then pass the
-// payload over to the emitEventInternal function for sending to Javascript
-- (void)startObserving
-{
-  [[NSNotificationCenter defaultCenter] addObserver:self
-                                           selector:@selector(emitEventInternal:)
-                                               name:@"event-emitted"
-                                             object:nil];
-}
-
-// This will stop listening if we require it
-- (void)stopObserving
-{
-  [[NSNotificationCenter defaultCenter] removeObserver:self];
-}
-
-// This will actually throw the event out to our Javascript
-- (void)emitEventInternal:(NSNotification *)notification
-{
-  // We will receive the dictionary here - we now need to extract the name
-  // and payload and throw the event
-  NSArray *eventDetails = [notification.userInfo valueForKey:@"detail"];
-  NSString *eventName = [eventDetails objectAtIndex:0];
-  NSDictionary *eventData = [eventDetails objectAtIndex:1];
-
-  [self sendEventWithName:eventName body:eventData];
-}
-
-// This is our static function that we call from our code
-+ (void)emitEventWithName:(NSString *)name andPayload:(NSString *)payload
-{
-  // userInfo requires a dictionary so we wrap out name and payload into an array and stick
-  // that into the dictionary with a key of 'detail'
-  NSData *data = [payload dataUsingEncoding:NSUTF8StringEncoding];
-  NSDictionary *json = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
-  NSDictionary *eventDetail = @{@"detail":@[name,json]};
-  [[NSNotificationCenter defaultCenter] postNotificationName:@"event-emitted"
-                                                      object:self
-                                                    userInfo:eventDetail];
-}
-
-@end
-
diff --git a/ios/NativeModules/MessageComposer.h b/ios/NativeModules/MessageComposer.h
new file mode 100644
index 000000000..b88d63d13
--- /dev/null
+++ b/ios/NativeModules/MessageComposer.h
@@ -0,0 +1,14 @@
+//
+//  MessageComposer.h
+//  Textile
+//
+//  Created by Aaron Sutula on 2/4/19.
+//  Copyright © 2019 Facebook. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <React/RCTBridgeModule.h>
+
+@interface MessageComposer : NSObject <RCTBridgeModule>
+
+@end
diff --git a/ios/NativeModules/MessageComposer.m b/ios/NativeModules/MessageComposer.m
new file mode 100644
index 000000000..ecca68042
--- /dev/null
+++ b/ios/NativeModules/MessageComposer.m
@@ -0,0 +1,71 @@
+//
+//  MessageComposer.m
+//  Textile
+//
+//  Created by Aaron Sutula on 2/4/19.
+//  Copyright © 2019 Facebook. All rights reserved.
+//
+
+#import "MessageComposer.h"
+#import <MessageUI/MessageUI.h>
+
+@interface MessageComposer () <MFMessageComposeViewControllerDelegate>
+
+@end
+
+@implementation MessageComposer
+
+RCT_EXPORT_MODULE();
+
+RCT_EXPORT_METHOD(composeMessage:(NSString *)number message:(NSString *)message) {
+  if (![MFMessageComposeViewController canSendText]) {
+    NSLog(@"Message services are not available.");
+    return;
+  }
+  dispatch_async(dispatch_get_main_queue(),^{
+    MFMessageComposeViewController* composeVC = [[MFMessageComposeViewController alloc] init];
+    composeVC.messageComposeDelegate = self;
+
+    // Configure the fields of the interface.
+    composeVC.recipients = @[number];
+    composeVC.body = message;
+
+    // Present the view controller modally.
+    UIViewController *topController = [self topMostController];
+    [topController presentViewController:composeVC animated:YES completion:nil];
+  });
+}
+
+- (void)messageComposeViewController:(MFMessageComposeViewController *)controller didFinishWithResult:(MessageComposeResult)result {
+  dispatch_async(dispatch_get_main_queue(),^{
+    [controller dismissViewControllerAnimated:YES completion:nil];
+  });
+}
+
+- (UIViewController*)topMostController {
+  return [UIApplication sharedApplication].keyWindow.rootViewController;
+//  return [self visibleControllerForController:[UIApplication sharedApplication].keyWindow.rootViewController];
+}
+
+- (UIViewController*)visibleControllerForController:(UIViewController*)controller {
+  // Determine last controller in navigation stack
+  UIViewController *topViewController = controller;
+  if ([controller isKindOfClass:[UITabBarController class]]) {
+    topViewController = ((UITabBarController*)controller).selectedViewController;
+  }
+  if ([controller isKindOfClass:[UINavigationController class]]) {
+    topViewController = ((UINavigationController*)controller).topViewController;
+  } else if (controller.navigationController) {
+    topViewController = controller.navigationController.topViewController;
+  }
+
+  // If last controller is presenting a modal recurse - find the last controller in that navigation stack
+  UIViewController *presentedViewController = topViewController.presentedViewController;
+  if (presentedViewController && ! presentedViewController.isBeingDismissed) {
+    return [[self class] visibleControllerForController:presentedViewController];
+  }
+
+  return topViewController;
+}
+
+@end
diff --git a/ios/NativeModules/TextileNode.m b/ios/NativeModules/TextileNode.m
deleted file mode 100644
index 75e191de9..000000000
--- a/ios/NativeModules/TextileNode.m
+++ /dev/null
@@ -1,442 +0,0 @@
-//  Created by react-native-create-bridge
-
-#import "TextileNode.h"
-#import "Events.h"
-#import <Mobile/Mobile.h>
-
-// import RCTBridge
-#if __has_include(<React/RCTBridge.h>)
-#import <React/RCTBridge.h>
-#elif __has_include(“RCTBridge.h”)
-#import “RCTBridge.h”
-#else
-#import “React/RCTBridge.h” // Required when used as a Pod in a Swift project
-#endif
-
-#define SYSTEM_VERSION_LESS_THAN(v) ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] == NSOrderedAscending)
-
-@interface Callback : NSObject<MobileCallback>
-@end
-
-@interface Callback()
-  @property (nonatomic, copy, nonnull) void (^completion)(NSData*, NSError*);
-@end
-
-@implementation Callback
-
-- (instancetype)initWithCompletion:(void (^)(NSData*, NSError*))completion {
-  self = [super init];
-  if (self) {
-    self.completion = completion;
-  }
-  return self;
-}
-
-- (void)call:(NSData *)payload err:(NSError *)err {
-  self.completion(payload, err);
-}
-
-@end
-
-@interface Messenger : NSObject<MobileMessenger>
-// Define class properties here with @property
-@end
-
-@interface Messenger()
-
-@end
-
-@implementation Messenger
-
-- (void) notify: (MobileEvent *)event {
-  [Events emitEventWithName:event.name andPayload:event.payload];
-}
-
-@end
-
-@interface TextileNode()
-
-@property (nonatomic, strong) MobileMobile *node;
-
-@end
-
-@implementation TextileNode
-
-// Export a native module
-// https://facebook.github.io/react-native/docs/native-modules-ios.html
-RCT_EXPORT_MODULE();
-
-- (dispatch_queue_t)methodQueue {
-  return dispatch_queue_create("io.textile.TextileNodeQueue", DISPATCH_QUEUE_SERIAL);
-}
-
-// Export methods to a native module
-// https://facebook.github.io/react-native/docs/native-modules-ios.html
-
-RCT_EXPORT_METHOD(acceptExternalThreadInvite:(NSString*)id_ key:(NSString*)key resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSString *result = [self.node acceptExternalThreadInvite:id_ key:key error:&error];
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(acceptThreadInviteViaNotification:(NSString*)id_ resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSString *result = [self.node acceptThreadInviteViaNotification:id_ error:&error];
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(addContact:(NSString*)contactJsonString resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  [self.node addContact:contactJsonString error:&error];
-  [self fulfillWithResult:nil error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(addExternalThreadInvite:(NSString*)threadId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSString *result = [self.node addExternalThreadInvite:threadId error:&error];
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(addSchema:(NSString*)jsonstr resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSString *result = [self.node addSchema:jsonstr error:&error];
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(addThread:(NSString*)key name:(NSString*)name shared:(BOOL)shared resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSString *result = [self.node addThread:key name:name shared:shared error:&error];
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(addThreadComment:(NSString*)blockId body:(NSString*)body resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSString *result = [self.node addThreadComment:blockId body:body error:&error];
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(addThreadFiles:(NSString*)dir threadId:(NSString*)threadId caption:(NSString*)caption resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSData *data = [[NSData alloc] initWithBase64EncodedString:dir options:0];
-  NSString *result = [self.node addThreadFiles:data threadId:threadId caption:caption error:&error];
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(addThreadFilesByTarget:(NSString*)target threadId:(NSString*)threadId caption:(NSString*)caption resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSString *result = [self.node addThreadFilesByTarget:target threadId:threadId caption:caption error:&error];
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(addThreadIgnore:(NSString*)blockId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSString *result = [self.node addThreadIgnore:blockId error:&error];
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(addThreadInvite:(NSString*)threadId inviteeId:(NSString*)inviteeId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSString *result = [self.node addThreadInvite:threadId inviteeId:inviteeId error:&error];
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(addThreadLike:(NSString*)blockId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSString *result = [self.node addThreadLike:blockId error:&error];
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(address:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSString *result = self.node.address;
-  resolve(result);
-}
-
-RCT_EXPORT_METHOD(avatar:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSString *result = [self.node avatar:&error];
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(cafeSession:(NSString*)peerId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSString *result = [self.node cafeSession:peerId error:&error];
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(cafeSessions:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSString *result = [self.node cafeSessions:&error];
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(checkCafeMessages:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  [self.node checkCafeMessages:&error];
-  [self fulfillWithResult:nil error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(contact:(NSString*)id_ resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSString *result = [self.node contact:id_ error:&error];
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(contactThreads:(NSString*)id_ resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSString *result = [self.node contactThreads:id_ error:&error];
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(contacts:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSString *result = [self.node contacts:&error];
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(countUnreadNotifications:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  long result = [self.node countUnreadNotifications];
-  [self fulfillWithResult:[NSNumber numberWithLong:result] error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(deregisterCafe:(NSString*)peerId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  [self.node deregisterCafe:peerId error:&error];
-  [self fulfillWithResult:nil error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(fileData:(NSString*)hash resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSString *result = [self _fileData:hash error:&error];
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(findContact:(NSString*)username limit:(NSInteger)limit wait:(NSInteger)wait resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSString *result = [self.node findContact:username limit:limit wait:wait error:&error];
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(ignoreThreadInviteViaNotification:(NSString*)id_ resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  [self.node ignoreThreadInviteViaNotification:id_ error:&error];
-  [self fulfillWithResult:nil error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(imageFileDataForMinWidth:(NSString*)pth minWidth:(NSInteger)minWidth resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSString *result = [self _imageFileDataForMinWidth:pth minWidth:minWidth error:&error];
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(notifications:(NSString*)offset limit:(NSInteger)limit resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSString *result = [self.node notifications:offset limit:limit error:&error];
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(overview:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSString *result = [self.node overview:&error];
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(peerId:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSString *result = [self.node peerId:&error];
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(prepareFiles:(NSString*)path threadId:(NSString*)threadId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSData *result = [self.node prepareFiles:path threadId:threadId error:&error];
-  NSString *base64 = [result base64EncodedStringWithOptions:0];
-  [self fulfillWithResult:base64 error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(prepareFilesAsync:(NSString*)path threadId:(NSString*)threadId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  [self.node prepareFilesAsync:path threadId:threadId cb:[[Callback alloc] initWithCompletion:^ (NSData *payload, NSError *error) {
-    if (error) {
-      reject(@(error.code).stringValue, error.localizedDescription, error);
-    } else {
-      NSString *base64 = [payload base64EncodedStringWithOptions:0];
-      resolve(base64);
-    }
-  }]];
-}
-
-RCT_EXPORT_METHOD(profile:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSString *result = [self.node profile:&error];
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(readAllNotifications:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  [self.node readAllNotifications:&error];
-  [self fulfillWithResult:nil error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(readNotification:(NSString*)id_ resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  [self.node readNotification:id_ error:&error];
-  [self fulfillWithResult:nil error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(refreshCafeSession:(NSString*)cafeId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSString *result = [self.node refreshCafeSession:cafeId error:&error];
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(registerCafe:(NSString*)peerId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  [self.node registerCafe:peerId error:&error];
-  [self fulfillWithResult:nil error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(removeThread:(NSString*)id_ resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSString *result = [self.node removeThread:id_ error:&error];
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(seed:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSString *result = self.node.seed;
-  resolve(result);
-}
-
-RCT_EXPORT_METHOD(setAvatar:(NSString*)id_ resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  [self.node setAvatar:id_ error:&error];
-  [self fulfillWithResult:nil error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(setUsername:(NSString*)username resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  [self.node setUsername:username error:&error];
-  [self fulfillWithResult:nil error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(start:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  [self.node start:&error];
-  [self fulfillWithResult:nil error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(stop:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  [self.node stop:&error];
-  [self fulfillWithResult:nil error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(threadFiles:(NSString*)offset limit:(NSInteger)limit threadId:(NSString*)threadId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSString *result = [self.node threadFiles:offset limit:limit threadId:threadId error:&error];
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(threadInfo:(NSString*)threadId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSString *result = [self.node threadInfo:threadId error:&error];
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(threads:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSString *result = [self.node threads:&error];
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(username:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSString *result = [self.node username:&error];
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(version:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSString *result = [self.node version];
-  [self fulfillWithResult:result error:nil resolver:resolve rejecter:reject];
-}
-
-// Order of things to init and create the repo:
-// MobileNewTextile If error, inspect it and run next steps or migration
-// MobileNewWallet returns recovery phrase
-// MobileWalletAccountAt returns seed and address
-// MobileInitRepo only run one time ever
-// MobileNewTextile
-
-RCT_EXPORT_METHOD(initRepo:(NSString*)seed repoPath:(NSString*)repoPath logToDisk:(BOOL)logToDisk resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  MobileInitConfig *config = [[MobileInitConfig alloc] init];
-  config.seed = seed;
-  config.repoPath = repoPath;
-  config.logToDisk = logToDisk;
-  NSError *error;
-  MobileInitRepo(config, &error); // only run one time ever
-  [self fulfillWithResult:nil error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(migrateRepo:(NSString*)repoPath resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  MobileMigrateConfig *config = [[MobileMigrateConfig alloc] init];
-  config.repoPath = repoPath;
-  NSError *error;
-  MobileMigrateRepo(config, &error);
-  [self fulfillWithResult:nil error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(newTextile:(NSString*)repoPath logLevels:(NSString*)logLevels resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  if (!self.node) {
-    MobileRunConfig *config = [[MobileRunConfig alloc] init];
-    config.repoPath = repoPath;
-    config.logLevels = logLevels;
-    self.node = MobileNewTextile(config, [[Messenger alloc] init], &error); // Returns the 'needs migration error'
-  }
-  [self fulfillWithResult:nil error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(newWallet:(NSInteger)wordCount resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSError *error;
-  NSString *result = MobileNewWallet(wordCount, &error); // returns recovery phrase
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-RCT_EXPORT_METHOD(walletAccountAt:(NSString*)phrase index:(NSInteger)index password:(NSString*)password resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-  NSString *p = password ? password : @"";
-  NSError *error;
-  NSString *result = MobileWalletAccountAt(phrase, index, p, &error); // return seed and address
-  [self fulfillWithResult:result error:error resolver:resolve rejecter:reject];
-}
-
-- (void)fulfillWithResult:(id)result error:(NSError*)error resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject {
-  if (!error) {
-    resolve(result);
-  } else {
-    reject(@(error.code).stringValue, error.localizedDescription, error);
-  }
-}
-
-// Couple methods that need to be available from RN and within Obj C
-
-- (NSString*)_fileData:(NSString*)hash error:(NSError**)error {
-  NSString *result = [self.node fileData:hash error:error];
-  // TODO: Parse this json string into a dictionary and pull base64 data from it
-  return result;
-}
-
-- (NSString*)_imageFileDataForMinWidth:(NSString*)pth minWidth:(long)minWidth error:(NSError**)error {
-  NSString *result = [self.node imageFileDataForMinWidth:pth minWidth:minWidth error:error];
-  // TODO: Parse this json string into a dictionary and pull base64 data from it
-  return result;
-}
-
-@end
-
-@implementation RCTBridge (TextileNode)
-
-- (TextileNode *)textileNode
-{
-  return [self moduleForClass:[TextileNode class]];
-}
-
-@end
diff --git a/ios/Textile.xcodeproj/project.pbxproj b/ios/Textile.xcodeproj/project.pbxproj
index ddf7096b6..fb14ff58a 100644
--- a/ios/Textile.xcodeproj/project.pbxproj
+++ b/ios/Textile.xcodeproj/project.pbxproj
@@ -52,6 +52,8 @@
 		93C00609216C3873007786A5 /* libRNVersionNumber.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 93C00606216C385D007786A5 /* libRNVersionNumber.a */; };
 		93C0060B216C4381007786A5 /* Mobile.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93C0060A216C4381007786A5 /* Mobile.framework */; };
 		93C00620216D3334007786A5 /* libRCTCameraRoll.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 93C0061F216D325D007786A5 /* libRCTCameraRoll.a */; };
+		93CCA014220135C700639B38 /* libRCTContacts.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 93CC9FE0220135A300639B38 /* libRCTContacts.a */; };
+		93D7697F2208C6FE00EEB573 /* MessageComposer.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D7697E2208C6FE00EEB573 /* MessageComposer.m */; };
 		93F1805921FD459700883267 /* Biotif-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 93F1805621FD459700883267 /* Biotif-Bold.ttf */; };
 		93F1805A21FD459700883267 /* Biotif-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 93F1805721FD459700883267 /* Biotif-Medium.ttf */; };
 		93F1805B21FD459700883267 /* Biotif-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 93F1805821FD459700883267 /* Biotif-Regular.ttf */; };
@@ -441,6 +443,13 @@
 			remoteGlobalIDString = 58B5115D1A9E6B3D00147676;
 			remoteInfo = RCTCameraRoll;
 		};
+		93CC9FDF220135A300639B38 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 93CC9FD5220135A300639B38 /* RCTContacts.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 1441618E1BD0A79300FA4F59;
+			remoteInfo = RCTContacts;
+		};
 		A2150F0621F3E0C30075B7FF /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 0817766337CD450883D10692 /* RNTextile.xcodeproj */;
@@ -525,6 +534,9 @@
 		93C0060A216C4381007786A5 /* Mobile.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Mobile.framework; path = "../node_modules/@textile/go-mobile/ios/Mobile.framework"; sourceTree = "<group>"; };
 		93C0061A216D325C007786A5 /* RCTCameraRoll.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTCameraRoll.xcodeproj; path = "../node_modules/react-native/Libraries/CameraRoll/RCTCameraRoll.xcodeproj"; sourceTree = "<group>"; };
 		93C00621216D385B007786A5 /* Textile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = Textile.entitlements; path = Textile/Textile.entitlements; sourceTree = "<group>"; };
+		93CC9FD5220135A300639B38 /* RCTContacts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTContacts.xcodeproj; path = "../node_modules/react-native-contacts/ios/RCTContacts.xcodeproj"; sourceTree = "<group>"; };
+		93D7697D2208C6FE00EEB573 /* MessageComposer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageComposer.h; sourceTree = "<group>"; };
+		93D7697E2208C6FE00EEB573 /* MessageComposer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageComposer.m; sourceTree = "<group>"; };
 		93F1805621FD459700883267 /* Biotif-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Biotif-Bold.ttf"; path = "../../App/Fonts/Biotif-Bold.ttf"; sourceTree = "<group>"; };
 		93F1805721FD459700883267 /* Biotif-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Biotif-Medium.ttf"; path = "../../App/Fonts/Biotif-Medium.ttf"; sourceTree = "<group>"; };
 		93F1805821FD459700883267 /* Biotif-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Biotif-Regular.ttf"; path = "../../App/Fonts/Biotif-Regular.ttf"; sourceTree = "<group>"; };
@@ -549,6 +561,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				93CCA014220135C700639B38 /* libRCTContacts.a in Frameworks */,
 				9356E2C921F905A200F6FACA /* libRNScreens.a in Frameworks */,
 				9356E1EA21F8FEFD00F6FACA /* libRNGestureHandler.a in Frameworks */,
 				93C00620216D3334007786A5 /* libRCTCameraRoll.a in Frameworks */,
@@ -734,6 +747,7 @@
 		832341AE1AAA6A7D00B99B32 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
+				93CC9FD5220135A300639B38 /* RCTContacts.xcodeproj */,
 				9356E28B21F9058F00F6FACA /* RNScreens.xcodeproj */,
 				9356E1AD21F8FEDA00F6FACA /* RNGestureHandler.xcodeproj */,
 				93C0061A216D325C007786A5 /* RCTCameraRoll.xcodeproj */,
@@ -776,6 +790,7 @@
 		83CBB9F61A601CBA00E9B192 = {
 			isa = PBXGroup;
 			children = (
+				93D769782208C69D00EEB573 /* NativeModules */,
 				A2588A0A21F3F7A0007A1B62 /* NativeViews */,
 				13B07FAE1A68108700A75B9A /* Textile */,
 				93C005D9216C1FB9007786A5 /* Resources */,
@@ -922,6 +937,23 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		93CC9FD6220135A300639B38 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				93CC9FE0220135A300639B38 /* libRCTContacts.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		93D769782208C69D00EEB573 /* NativeModules */ = {
+			isa = PBXGroup;
+			children = (
+				93D7697D2208C6FE00EEB573 /* MessageComposer.h */,
+				93D7697E2208C6FE00EEB573 /* MessageComposer.m */,
+			);
+			path = NativeModules;
+			sourceTree = "<group>";
+		};
 		A2150F0321F3E0C30075B7FF /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -1063,6 +1095,10 @@
 					ProductGroup = 93C0061B216D325C007786A5 /* Products */;
 					ProjectRef = 93C0061A216D325C007786A5 /* RCTCameraRoll.xcodeproj */;
 				},
+				{
+					ProductGroup = 93CC9FD6220135A300639B38 /* Products */;
+					ProjectRef = 93CC9FD5220135A300639B38 /* RCTContacts.xcodeproj */;
+				},
 				{
 					ProductGroup = 00C302B61ABCB90400DB3ED1 /* Products */;
 					ProjectRef = 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */;
@@ -1532,6 +1568,13 @@
 			remoteRef = 93C0061E216D325D007786A5 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		93CC9FE0220135A300639B38 /* libRCTContacts.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libRCTContacts.a;
+			remoteRef = 93CC9FDF220135A300639B38 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		A2150F0721F3E0C30075B7FF /* libRNTextile.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -1626,6 +1669,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				A2588A0F21F3F7A1007A1B62 /* TextileImageViewManager.m in Sources */,
+				93D7697F2208C6FE00EEB573 /* MessageComposer.m in Sources */,
 				A2588A1021F3F7A1007A1B62 /* TextileImageView.m in Sources */,
 				93C00487216B132E007786A5 /* RNBackgroundFetch+AppDelegate.m in Sources */,
 				13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */,
diff --git a/ios/Textile/Info.plist b/ios/Textile/Info.plist
index 987bd97fc..fde829200 100644
--- a/ios/Textile/Info.plist
+++ b/ios/Textile/Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSContactsUsageDescription</key>
+	<string>Authorizing access to your contacts makes it easy for you to invite others to Textile. None of you contact data is saved or transmitted in any way.</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
diff --git a/package.json b/package.json
index a06be2f05..1b77443fc 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
     "react-native-background-timer": "2.1.0-alpha.6",
     "react-native-background-upload": "https://github.com/textileio/react-native-background-upload#9dedcbae13815ce869e5d7809cf71e3c2d49cc0e",
     "react-native-config": "^0.11.7",
+    "react-native-contacts": "^3.1.2",
     "react-native-easy-toast": "^1.1.0",
     "react-native-elements": "1.0.0-beta7",
     "react-native-fabric": "https://github.com/corymsmith/react-native-fabric#523a4edab3b2bf55ea9eeea2cf0dde82c5c29dd4",
diff --git a/yarn.lock b/yarn.lock
index 6b3eba390..0f8205138 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4869,6 +4869,10 @@ react-native-config@^0.11.7:
   version "0.11.7"
   resolved "https://registry.yarnpkg.com/react-native-config/-/react-native-config-0.11.7.tgz#a2b323f2ecd76a4df88cbb6bc86eaa2ef9febee7"
 
+react-native-contacts@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/react-native-contacts/-/react-native-contacts-3.1.2.tgz#44ca24046d3ddfcaeba70da06e7e5c750fdbd7e4"
+
 react-native-easy-toast@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/react-native-easy-toast/-/react-native-easy-toast-1.1.0.tgz#7d3a34ed298d32c4827b8d43ddfab6a71b98a2e3"