Skip to content

Commit

Permalink
Merge pull request #4269 from tloncorp/po/tlon-3318-fix-welcome-sheet…
Browse files Browse the repository at this point in the history
…-image

desktop: fix welcome sheet image, remove duplicate web component for welcome sheet
  • Loading branch information
patosullivan authored Dec 9, 2024
2 parents 7ffce6b + eccc67b commit 22dd54b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 113 deletions.
8 changes: 6 additions & 2 deletions packages/ui/src/components/WelcomeSheet.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useCallback } from 'react';
import { Image } from 'react-native';
import { useSafeAreaInsets } from 'react-native-safe-area-context';
import { Text, View, XStack, YStack } from 'tamagui';
import { Text, View, XStack, YStack, isWeb } from 'tamagui';

import { Icon } from './Icon';
import { Sheet } from './Sheet';
Expand Down Expand Up @@ -41,7 +41,11 @@ function WelcomeSheetComponent({
<Image
style={{ width: '100%', height: 188 }}
resizeMode={'cover'}
source={require('../assets/raster/welcome_flowers.jpg')}
source={
isWeb
? './welcome_flowers.jpg'
: require('../assets/raster/welcome_flowers.jpg')
}
/>
</View>
<YStack gap="$xs">
Expand Down
111 changes: 0 additions & 111 deletions packages/ui/src/components/WelcomeSheet.web.tsx

This file was deleted.

0 comments on commit 22dd54b

Please sign in to comment.