Skip to content

Commit

Permalink
Merge branch 'bugfix/crash-in-search-view' into feature/UIT-207-my-fa…
Browse files Browse the repository at this point in the history
…milies
  • Loading branch information
chennara committed Dec 11, 2023
2 parents bb0027c + 78413f3 commit a68f66f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "reactnative_uitpas",
"version": "2.0.0-beta.15",
"version": "2.0.0-beta.16",
"private": true,
"scripts": {
"android": "react-native run-android --variant=debug --appIdSuffix=debug",
Expand Down
12 changes: 8 additions & 4 deletions src/shop/search/Search.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -135,15 +135,19 @@ export const Search = ({ navigation, route }: TProps) => {
) : (
<>
<Styled.PopularItem key={`search-${user.address.city}`} onPress={() => onSearch(user.address.city)}>
<Styled.PopularItemIcon name="Popular" size={20} />
<Typography color="primary.800">{user.address.city}</Typography>
<>
<Styled.PopularItemIcon name="Popular" size={20} />
<Typography color="primary.800">{user.address.city}</Typography>
</>
</Styled.PopularItem>
<Styled.Separator />
{SEARCH_TERMS.map(({ keyword, label }) => (
<>
<Styled.PopularItem key={`search-${keyword}`} onPress={() => onSearch(keyword)}>
<Styled.PopularItemIcon name="Popular" size={20} />
<Typography color="primary.800">{t(label)}</Typography>
<>
<Styled.PopularItemIcon name="Popular" size={20} />
<Typography color="primary.800">{t(label)}</Typography>
</>
</Styled.PopularItem>
<Styled.Separator />
</>
Expand Down

0 comments on commit a68f66f

Please sign in to comment.