fix(rn): circle dependencies

Signed-off-by: Godefroy Ponsinet <godefroy.ponsinet@outlook.com>
berty · Jul 3, 2019 · f758d20 · f758d20
1 parent 1416919
commit f758d20
Show file tree

Hide file tree

Showing 14 changed files with 89 additions and 246 deletions.
diff --git a/client/react-native/app/view/component/ContactIdentityActions/ActionsAdd.js b/client/react-native/app/view/component/ContactIdentityActions/ActionsAdd.js
@@ -3,32 +3,29 @@ import { withNavigation } from 'react-navigation'
 import React from 'react'
 
 import ActionList from './ActionList'
-import { withStoreContext } from '@berty/store/context'
 
-const ActionsAdd = withStoreContext(
-  ({ data, self, context, navigation, inModal, t }) => (
-    <ActionList inModal={inModal}>
-      <ActionList.Action
-        icon={'plus'}
-        title={t('contacts.add-action')}
-        dismissOnSuccess
-        action={async () => {
-          await context.node.service.contactRequest({
-            contactId: data.id,
-            contactOverrideDisplayName:
-              data.overrideDisplayName || data.displayName || '',
-            introText: '',
-          })
+const ActionsAdd = ({ data, self, context, navigation, inModal, t }) => (
+  <ActionList inModal={inModal}>
+    <ActionList.Action
+      icon={'plus'}
+      title={t('contacts.add-action')}
+      dismissOnSuccess
+      action={async () => {
+        await context.node.service.contactRequest({
+          contactId: data.id,
+          contactOverrideDisplayName:
+            data.overrideDisplayName || data.displayName || '',
+          introText: '',
+        })
 
-          const beforeDismiss = navigation.getParam('beforeDismiss')
-          if (beforeDismiss) {
-            beforeDismiss()
-          }
-        }}
-        successMessage={t('contacts.add-action-feedback')}
-      />
-    </ActionList>
-  )
+        const beforeDismiss = navigation.getParam('beforeDismiss')
+        if (beforeDismiss) {
+          beforeDismiss()
+        }
+      }}
+      successMessage={t('contacts.add-action-feedback')}
+    />
+  </ActionList>
 )
 
 export default withNamespaces()(withNavigation(ActionsAdd))
diff --git a/client/react-native/app/view/component/ContactIdentityActions/ActionsReceived.js b/client/react-native/app/view/component/ContactIdentityActions/ActionsReceived.js
@@ -2,29 +2,26 @@ import React from 'react'
 import { colors } from '@berty/common/constants'
 import ActionList from './ActionList'
 import { withNamespaces } from 'react-i18next'
-import { withStoreContext } from '@berty/store/context'
 
-const ReceivedActions = withStoreContext(
-  ({ data: { id }, inModal, t, context }) => (
-    <ActionList inModal={inModal}>
-      <ActionList.Action
-        icon={'check'}
-        color={colors.blue}
-        title={t('contacts.accept-action')}
-        action={() =>
-          context.node.service.contactAcceptRequest({ contactId: id })
-        }
-        successMessage={t('contacts.accept-action-feedback')}
-      />
-      <ActionList.Action
-        icon={'x'}
-        color={colors.white}
-        title={inModal ? t('contacts.decline-action') : null}
-        action={() => context.node.service.contactRemove({ id })}
-        successMessage={t('contacts.decline-action-feedback')}
-      />
-    </ActionList>
-  )
+const ReceivedActions = ({ data: { id }, inModal, t, context }) => (
+  <ActionList inModal={inModal}>
+    <ActionList.Action
+      icon={'check'}
+      color={colors.blue}
+      title={t('contacts.accept-action')}
+      action={() =>
+        context.node.service.contactAcceptRequest({ contactId: id })
+      }
+      successMessage={t('contacts.accept-action-feedback')}
+    />
+    <ActionList.Action
+      icon={'x'}
+      color={colors.white}
+      title={inModal ? t('contacts.decline-action') : null}
+      action={() => context.node.service.contactRemove({ id })}
+      successMessage={t('contacts.decline-action-feedback')}
+    />
+  </ActionList>
 )
 
 export default withNamespaces()(ReceivedActions)
diff --git a/client/react-native/app/view/component/ContactIdentityActions/ActionsSent.js b/client/react-native/app/view/component/ContactIdentityActions/ActionsSent.js
@@ -2,9 +2,8 @@ import React from 'react'
 import { colors } from '@berty/common/constants'
 import ActionList from './ActionList'
 import { withNamespaces } from 'react-i18next'
-import { withStoreContext } from '@berty/store/context'
 
-const ActionsSent = withStoreContext(({ data, context, inModal, t }) => (
+const ActionsSent = ({ data, context, inModal, t }) => (
   <ActionList inModal={inModal}>
     <ActionList.Action
       icon={'send'}
@@ -29,6 +28,6 @@ const ActionsSent = withStoreContext(({ data, context, inModal, t }) => (
       successMessage={t('contacts.cancel-request-action-feedback')}
     />
   </ActionList>
-))
+)
 
 export default withNamespaces()(ActionsSent)
diff --git a/client/react-native/app/view/component/ContactIdentityActions/ActionsUnknown.js b/client/react-native/app/view/component/ContactIdentityActions/ActionsUnknown.js
@@ -2,9 +2,8 @@ import React from 'react'
 import { colors } from '@berty/common/constants'
 import ActionList from './ActionList'
 import { withNamespaces } from 'react-i18next'
-import { withStoreContext } from '@berty/store/context'
 
-const ActionsUnknown = withStoreContext(({ data, inModal, t, context }) => (
+const ActionsUnknown = ({ data, inModal, t, context }) => (
   <ActionList inModal={inModal}>
     <ActionList.Action
       icon={'send'}
@@ -29,6 +28,6 @@ const ActionsUnknown = withStoreContext(({ data, inModal, t, context }) => (
       successMessage={t('contacts.cancel-request-action-feedback')}
     />
   </ActionList>
-))
+)
 
 export default withNamespaces()(ActionsUnknown)
diff --git a/client/react-native/app/view/component/ContactIdentityActions/index.js b/client/react-native/app/view/component/ContactIdentityActions/index.js
@@ -7,11 +7,18 @@ import ActionsShare from './ActionsShare'
 import ReceivedActions from './ActionsReceived'
 import ActionsSent from './ActionsSent'
 
-const Actions = ({ data, navigation }) => {
+const Actions = ({ data, context, navigation }) => {
   switch (data.status) {
     case null:
     case undefined:
-      return <ActionsAdd data={data} navigation={navigation} inModal />
+      return (
+        <ActionsAdd
+          data={data}
+          context={context}
+          navigation={navigation}
+          inModal
+        />
+      )
 
     case enums.BertyEntityContactInputStatus.Myself:
       return <ActionsShare data={data} self navigation={navigation} inModal />
@@ -21,10 +28,10 @@ const Actions = ({ data, navigation }) => {
       return <ActionsShare data={data} navigation={navigation} inModal />
 
     case enums.BertyEntityContactInputStatus.IsRequested:
-      return <ActionsSent data={data} inModal />
+      return <ActionsSent data={data} context={context} inModal />
 
     case enums.BertyEntityContactInputStatus.RequestedMe:
-      return <ReceivedActions data={data} inModal />
+      return <ReceivedActions data={data} context={context} inModal />
 
     case enums.BertyEntityContactInputStatus.IsBlocked:
       return <Text>Is blocked</Text>

diff --git a/client/react-native/app/view/component/DebugStateBar.js b/client/react-native/app/view/component/DebugStateBar.js
@@ -5,7 +5,6 @@ import Text from './Text'
 import { View, Platform } from 'react-native'
 import Icon from './Icon'
 import NavigationService from '@berty/common/helpers/NavigationService'
-import { withStoreContext } from '@berty/store/context'
 import promiseWithTimeout from '@berty/common/helpers/promiseWithTimeout'
 
 const daemonStateValues = {
@@ -14,7 +13,6 @@ const daemonStateValues = {
   connected: 2,
 }
 
-@withStoreContext
 class DebugStateBar extends PureComponent {
   constructor(props) {
     super(props)

diff --git a/client/react-native/app/view/component/Notifications.js b/client/react-native/app/view/component/Notifications.js
diff --git a/client/react-native/app/view/component/SelfAvatarIcon.js b/client/react-native/app/view/component/SelfAvatarIcon.js
diff --git a/client/react-native/app/view/component/index.js b/client/react-native/app/view/component/index.js
@@ -17,11 +17,9 @@ export Loader from './Loader'
 export Avatar from './Avatar'
 export ContactIdentity from './ContactIdentity'
 export ContactIdentityActions from './ContactIdentityActions'
-export SelfAvatarIcon from './SelfAvatarIcon'
 export EmptyList from './EmptyList'
 export Animation from './Animation'
 export MovableView from './MovableView'
 export DebugStateBar from './DebugStateBar'
 export Markdown from './Markdown'
 export OptimizedFlatList from './OptimizedFlatList'
-export Notifications from './Notifications'
diff --git a/client/react-native/app/view/component/package.json b/client/react-native/app/view/component/package.json
@@ -9,8 +9,6 @@
   "private": true,
   "dependencies": {
     "@berty/common": "^0.0.1",
-    "@berty/container": "^0.0.1",
-    "@berty/store": "^0.0.1",
     "@berty/update": "^0.0.1",
     "async-mutex": "^0.1.3",
     "react": "16.8.3",