Upgrade to Expo 49 (#1331)
* update to expo 49 * update expo-camera to fix console erorrs * run doctor again * fix ts errors * patch @sentry/react-native Getting `cannot read property 'ignoreLogs' of undefined` in this file. Ironically, this may be a cyclical imports problem. LogBox isn't enabled in production, so this patch should only affect dev/test. * fix type error * reinstall newer reanimated * pin expo-dev-client to fix reanimated dev-build issue * fix type errors, fix bad conflict res * Fix to notifications badge z-index on desktop --------- Co-authored-by: Paul Frazee <pfrazee@gmail.com>
This commit is contained in:
parent
9a3fa512eb
commit
e3e91816d1
21 changed files with 1133 additions and 1768 deletions
|
@ -1,5 +1,11 @@
|
|||
import React from 'react'
|
||||
import {StyleSheet, StyleProp, View, ViewStyle} from 'react-native'
|
||||
import {
|
||||
StyleSheet,
|
||||
StyleProp,
|
||||
View,
|
||||
ViewStyle,
|
||||
DimensionValue,
|
||||
} from 'react-native'
|
||||
import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
|
||||
import {HeartIcon} from 'lib/icons'
|
||||
import {s} from 'lib/styles'
|
||||
|
@ -11,8 +17,8 @@ export function LoadingPlaceholder({
|
|||
height,
|
||||
style,
|
||||
}: {
|
||||
width: string | number
|
||||
height: string | number
|
||||
width: DimensionValue
|
||||
height: DimensionValue
|
||||
style?: StyleProp<ViewStyle>
|
||||
}) {
|
||||
const theme = useTheme()
|
||||
|
|
|
@ -4,7 +4,10 @@
|
|||
|
||||
import React, {useState, useEffect} from 'react'
|
||||
import {StyleSheet, Text, View} from 'react-native'
|
||||
import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
|
||||
import {
|
||||
FontAwesomeIcon,
|
||||
FontAwesomeIconStyle,
|
||||
} from '@fortawesome/react-native-fontawesome'
|
||||
|
||||
const DURATION = 3500
|
||||
|
||||
|
@ -32,7 +35,11 @@ export const ToastContainer: React.FC<ToastContainerProps> = ({}) => {
|
|||
<>
|
||||
{activeToast && (
|
||||
<View style={styles.container}>
|
||||
<FontAwesomeIcon icon="check" size={24} style={styles.icon} />
|
||||
<FontAwesomeIcon
|
||||
icon="check"
|
||||
size={24}
|
||||
style={styles.icon as FontAwesomeIconStyle}
|
||||
/>
|
||||
<Text style={styles.text}>{activeToast.text}</Text>
|
||||
</View>
|
||||
)}
|
||||
|
@ -57,6 +64,7 @@ const styles = StyleSheet.create({
|
|||
position: 'absolute',
|
||||
left: 20,
|
||||
bottom: 20,
|
||||
// @ts-ignore web only
|
||||
width: 'calc(100% - 40px)',
|
||||
maxWidth: 350,
|
||||
padding: 20,
|
||||
|
|
|
@ -118,6 +118,7 @@ const styles = StyleSheet.create({
|
|||
contentContainer: {
|
||||
borderLeftWidth: 1,
|
||||
borderRightWidth: 1,
|
||||
// @ts-ignore web only
|
||||
minHeight: '100vh',
|
||||
},
|
||||
container: {
|
||||
|
@ -133,6 +134,7 @@ const styles = StyleSheet.create({
|
|||
marginRight: 'auto',
|
||||
},
|
||||
fixedHeight: {
|
||||
// @ts-ignore web only
|
||||
height: '100vh',
|
||||
},
|
||||
stableGutters: {
|
||||
|
|
|
@ -60,6 +60,7 @@ export const LoggedOutLayout = ({
|
|||
const styles = StyleSheet.create({
|
||||
container: {
|
||||
flexDirection: 'row',
|
||||
// @ts-ignore web only
|
||||
height: '100vh',
|
||||
},
|
||||
side: {
|
||||
|
|
|
@ -74,6 +74,7 @@ const styles = StyleSheet.create({
|
|||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
position: 'absolute',
|
||||
// @ts-ignore web only
|
||||
left: '50vw',
|
||||
// @ts-ignore web only -prf
|
||||
transform: 'translateX(-282px)',
|
||||
|
@ -92,6 +93,7 @@ const styles = StyleSheet.create({
|
|||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
position: 'absolute',
|
||||
// @ts-ignore web only
|
||||
left: '50vw',
|
||||
// @ts-ignore web only -prf
|
||||
transform: 'translateX(-50%)',
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue