resolving merge conflicts

1 files changed, 0 insertions, 61 deletions

diff --git a/app_expo/components/header/header.tsx b/app_expo/components/header/header.tsx
deleted file mode 100644
index 25e0914..0000000
--- a/app_expo/components/header/header.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-import React from 'react'
-import { View, ViewStyle, TextStyle } from 'react-native'
-import { HeaderProps } from './header.props'
-import { Button } from '../button/button'
-import { Text } from '../text/text'
-import { Icon } from '../icon/icon'
-import { spacing } from '../../theme'
-import { translate } from '../../i18n/'
-
-// static styles
-const ROOT: ViewStyle = {
-  flexDirection: 'row',
-  paddingHorizontal: spacing[4],
-  alignItems: 'center',
-  paddingTop: spacing[5],
-  paddingBottom: spacing[5],
-  justifyContent: 'flex-start',
-}
-const TITLE: TextStyle = { textAlign: 'center' }
-const TITLE_MIDDLE: ViewStyle = { flex: 1, justifyContent: 'center' }
-const LEFT: ViewStyle = { width: 32 }
-const RIGHT: ViewStyle = { width: 32 }
-
-/**
- * Header that appears on many screens. Will hold navigation buttons and screen title.
- */
-export function Header(props: HeaderProps) {
-  const {
-    onLeftPress,
-    onRightPress,
-    rightIcon,
-    leftIcon,
-    headerText,
-    headerTx,
-    style,
-    titleStyle,
-  } = props
-  const header = headerText || (headerTx && translate(headerTx)) || ''
-
-  return (
-    <View style={[ROOT, style]}>
-      {leftIcon ? (
-        <Button preset="link" onPress={onLeftPress}>
-          <Icon icon={leftIcon} />
-        </Button>
-      ) : (
-        <View style={LEFT} />
-      )}
-      <View style={TITLE_MIDDLE}>
-        <Text style={[TITLE, titleStyle]} text={header} />
-      </View>
-      {rightIcon ? (
-        <Button preset="link" onPress={onRightPress}>
-          <Icon icon={rightIcon} />
-        </Button>
-      ) : (
-        <View style={RIGHT} />
-      )}
-    </View>
-  )
-}