resolving merge conflicts

2 files changed, 0 insertions, 65 deletions

diff --git a/app_expo/components/local-button/local-button.story.tsx b/app_expo/components/local-button/local-button.story.tsx
deleted file mode 100644
index 0d35ab2..0000000
--- a/app_expo/components/local-button/local-button.story.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import * as React from 'react'
-import { storiesOf } from '@storybook/react-native'
-import { StoryScreen, Story, UseCase } from '../../../storybook/views'
-import { color } from '../../theme'
-import { LocalButton } from './local-button'
-
-storiesOf('LocalButton', module)
-  .addDecorator((fn) => <StoryScreen>{fn()}</StoryScreen>)
-  .add('Style Presets', () => (
-    <Story>
-      <UseCase text="Primary" usage="The primary.">
-        <LocalButton style={{ backgroundColor: color.error }} />
-      </UseCase>
-    </Story>
-  ))
diff --git a/app_expo/components/local-button/local-button.tsx b/app_expo/components/local-button/local-button.tsx
deleted file mode 100644
index c1021a3..0000000
--- a/app_expo/components/local-button/local-button.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import * as React from 'react'
-import { StyleProp, TextStyle, View, ViewStyle } from 'react-native'
-import { observer } from 'mobx-react-lite'
-import { color, typography } from '../../theme'
-import { Text } from '../'
-import { flatten } from 'ramda'
-import Icon from 'react-native-vector-icons/MaterialCommunityIcons'
-
-const CONTAINER: ViewStyle = {
-  justifyContent: 'center',
-}
-
-const TEXT: TextStyle = {
-  fontFamily: typography.primary,
-  fontSize: 14,
-  color: color.primary,
-}
-
-export interface LocalButtonProps {
-  /**
-   * An optional style override useful for padding & margin.
-   */
-  style?: StyleProp<ViewStyle>
-  local
-  setLocal
-}
-
-/**
- * Describe your component here
- */
-export const LocalButton = observer(function LocalButton(props: LocalButtonProps) {
-  const { style, local, setLocal } = props
-  const styles = flatten([CONTAINER, style])
-
-  return (
-    <View style={[style, { height: 50, width: 150 }]}>
-      <Icon.Button
-        name={!local ? 'graph-outline' : 'graph'}
-        backgroundColor="#a991f1"
-        onPress={() => {
-          setLocal(!local)
-        }}
-        size={30}
-        style={{ textAlign: 'center' }}
-      >
-        {!local ? 'Global Graph' : 'Local Graph'}
-      </Icon.Button>
-    </View>
-  )
-})