more design tweaks
This commit is contained in:
@@ -4,6 +4,7 @@ import {GeneratorView} from '@atproto/api/dist/client/types/app/bsky/feed/defs'
|
||||
import {msg} from '@lingui/macro'
|
||||
import {useLingui} from '@lingui/react'
|
||||
|
||||
import {DISCOVER_FEED_URI} from 'lib/constants'
|
||||
import {isWeb} from 'platform/detection'
|
||||
import {UserAvatar} from 'view/com/util/UserAvatar'
|
||||
import {WizardAction, WizardState} from '#/screens/StarterPack/Wizard/State'
|
||||
@@ -24,7 +25,10 @@ export function WizardFeedCard({
|
||||
const {_} = useLingui()
|
||||
const t = useTheme()
|
||||
|
||||
const includesFeed = state.feeds.some(f => f.uri === generator.uri)
|
||||
const isDiscover = generator.uri === DISCOVER_FEED_URI
|
||||
const includesFeed =
|
||||
isDiscover || state.feeds.some(f => f.uri === generator.uri)
|
||||
|
||||
const onPressAddRemove = () => {
|
||||
Keyboard.dismiss()
|
||||
if (includesFeed) {
|
||||
@@ -70,6 +74,7 @@ export function WizardFeedCard({
|
||||
: _(msg`Add ${generator.displayName} to starter pack`)
|
||||
}
|
||||
value={includesFeed}
|
||||
disabled={isDiscover}
|
||||
onChange={onPressAddRemove}>
|
||||
<Checkbox />
|
||||
</Toggle.Item>
|
||||
|
||||
@@ -4,7 +4,6 @@ import {KeyboardAwareScrollView} from 'react-native-keyboard-controller'
|
||||
import {GeneratorView} from '@atproto/api/dist/client/types/app/bsky/feed/defs'
|
||||
import debounce from 'lodash.debounce'
|
||||
|
||||
import {DISCOVER_FEED_URI} from 'lib/constants'
|
||||
import {
|
||||
useGetPopularFeedsQuery,
|
||||
useSearchPopularFeedsMutation,
|
||||
@@ -52,10 +51,6 @@ export function StepFeeds() {
|
||||
}
|
||||
}
|
||||
|
||||
const filterFeeds = (feeds?: GeneratorView[]) => {
|
||||
return feeds?.filter(feed => feed.uri !== DISCOVER_FEED_URI)
|
||||
}
|
||||
|
||||
const renderItem = ({item}: ListRenderItemInfo<GeneratorView>) => {
|
||||
return <WizardFeedCard generator={item} state={state} dispatch={dispatch} />
|
||||
}
|
||||
@@ -73,7 +68,7 @@ export function StepFeeds() {
|
||||
</View>
|
||||
</View>
|
||||
<List
|
||||
data={filterFeeds(query ? searchedFeeds : popularFeeds)}
|
||||
data={query ? searchedFeeds : popularFeeds}
|
||||
renderItem={renderItem}
|
||||
keyExtractor={keyExtractor}
|
||||
contentContainerStyle={{paddingTop: 6}}
|
||||
|
||||
@@ -679,7 +679,6 @@ function Footer({
|
||||
variant="solid"
|
||||
color="primary"
|
||||
size="small"
|
||||
style={{width: 70}}
|
||||
onPress={onNext}
|
||||
disabled={!state.canNext}>
|
||||
<ButtonText>{nextBtnText}</ButtonText>
|
||||
|
||||
Reference in New Issue
Block a user