diff --git a/packages/mobile/src/core/Colectibles/Collectibles.tsx b/packages/mobile/src/core/Colectibles/Collectibles.tsx index cb6e4329c..7534a03a2 100644 --- a/packages/mobile/src/core/Colectibles/Collectibles.tsx +++ b/packages/mobile/src/core/Colectibles/Collectibles.tsx @@ -20,7 +20,7 @@ export const Collectibles = memo(() => { const dimensions = useWindowDimensions(); const size = useMemo(() => { - const width = (dimensions.width - 32) / numColumn - 4; + const width = (dimensions.width - 48) / numColumn; const height = width * heightRatio; return { width, height }; @@ -47,6 +47,7 @@ export const Collectibles = memo(() => { const styles = Steezy.create({ collectiblesContainer: { marginHorizontal: 16, + gap: 8, }, nftElements: { flexDirection: 'row', diff --git a/packages/mobile/src/core/Colectibles/NFTCardItem.tsx b/packages/mobile/src/core/Colectibles/NFTCardItem.tsx index 328b60adb..adade1249 100644 --- a/packages/mobile/src/core/Colectibles/NFTCardItem.tsx +++ b/packages/mobile/src/core/Colectibles/NFTCardItem.tsx @@ -100,7 +100,6 @@ const styles = Steezy.create(({ colors, corners }) => ({ container: { position: 'relative', flex: 1, - marginBottom: 8, backgroundColor: colors.backgroundContent, borderRadius: corners.medium, overflow: 'hidden', diff --git a/packages/mobile/src/core/HideableAmount/ShowBalance.tsx b/packages/mobile/src/core/HideableAmount/ShowBalance.tsx index abea7aa99..b6890c3c1 100644 --- a/packages/mobile/src/core/HideableAmount/ShowBalance.tsx +++ b/packages/mobile/src/core/HideableAmount/ShowBalance.tsx @@ -57,6 +57,6 @@ const styles = Steezy.create(({ colors }) => ({ borderRadius: 100, }, stars: { - paddingTop: 5.5, + paddingTop: 8, }, })); diff --git a/packages/mobile/src/core/InscriptionScreen.tsx b/packages/mobile/src/core/InscriptionScreen.tsx index ab0a3ec8e..5ffe31f52 100644 --- a/packages/mobile/src/core/InscriptionScreen.tsx +++ b/packages/mobile/src/core/InscriptionScreen.tsx @@ -1,6 +1,7 @@ import { useTonInscription } from '@tonkeeper/shared/query/hooks/useTonInscription'; import { useParams } from '@tonkeeper/router/src/imperative'; import { + ActionButtons, DEFAULT_TOKEN_LOGO, IconButton, IconButtonList, @@ -62,21 +63,24 @@ export const InscriptionScreen = memo(() => { - - - {!wallet.isWatchOnly ? ( - - ) : null} - - + + @@ -86,7 +90,7 @@ export const InscriptionScreen = memo(() => { const styles = Steezy.create(({ colors }) => ({ tokenContainer: { paddingTop: 16, - paddingBottom: 28, + paddingBottom: 24, flexDirection: 'row', justifyContent: 'space-between', marginHorizontal: 28, @@ -96,14 +100,6 @@ const styles = Steezy.create(({ colors }) => ({ height: 64, borderRadius: 64 / 2, }, - buttons: { - borderTopWidth: 1, - borderBottomWidth: 1, - borderTopColor: colors.backgroundContent, - borderBottomColor: colors.backgroundContent, - paddingTop: 16, - paddingBottom: 12, - }, tokenText: { paddingTop: 2, }, diff --git a/packages/mobile/src/core/Jetton/Jetton.tsx b/packages/mobile/src/core/Jetton/Jetton.tsx index 32724c355..fbbc998e5 100644 --- a/packages/mobile/src/core/Jetton/Jetton.tsx +++ b/packages/mobile/src/core/Jetton/Jetton.tsx @@ -218,7 +218,7 @@ export const Jetton: React.FC = ({ route }) => { ) } - title={jetton.metadata?.name || Address.toShort(jetton.jettonAddress)} + title={jetton.metadata?.symbol || Address.toShort(jetton.jettonAddress)} rightContent={ = (props) => { }, [props.closeOtherSwipeable]); return ( - + ({ listStyle: { marginBottom: 0, }, - containerStyle: { - marginBottom: 8, - }, leftContentStyle: { alignItems: 'flex-start', alignSelf: 'flex-start', diff --git a/packages/mobile/src/core/Notifications/NotificationsActivity.tsx b/packages/mobile/src/core/Notifications/NotificationsActivity.tsx index e02966c5a..0d79fb960 100644 --- a/packages/mobile/src/core/Notifications/NotificationsActivity.tsx +++ b/packages/mobile/src/core/Notifications/NotificationsActivity.tsx @@ -1,5 +1,5 @@ import React, { useCallback, useEffect, useMemo, useRef } from 'react'; -import { Button, Icon, Screen, Spacer, Text, View } from '$uikit'; +import { Button, Icon, Spacer, Text, View } from '$uikit'; import { Notification } from '$core/Notifications/Notification'; import { Steezy } from '$styles'; import { openNotifications } from '$navigation'; @@ -8,8 +8,7 @@ import { INotification, useDAppsNotifications } from '$store'; import { FlashList } from '@shopify/flash-list'; import { LayoutAnimation } from 'react-native'; import { useBottomTabBarHeight } from '@react-navigation/bottom-tabs'; -import { safeAreaInsets } from '$utils'; -import { useSafeAreaInsets } from 'react-native-safe-area-context'; +import { Screen } from '@tonkeeper/uikit'; export enum ActivityListItem { Notification = 'Notification', @@ -53,7 +52,6 @@ export const NotificationsActivity: React.FC = () => { const list = useRef | null>(null); const closeOtherSwipeable = useRef void)>(null); const lastSwipeableId = useRef(null); - const tabBarHeight = useBottomTabBarHeight(); const handleOpenNotificationSettings = useCallback(() => { openNotifications(); @@ -139,10 +137,10 @@ export const NotificationsActivity: React.FC = () => { ) : ( item.id} renderItem={renderNotificationsItem} - contentContainerStyle={{ paddingBottom: tabBarHeight + 8 }} data={flashListData} ListEmptyComponent={ListEmpty} /> @@ -156,6 +154,9 @@ const styles = Steezy.create({ marginVertical: 14, marginHorizontal: 16, }, + gap8: { + gap: 8, + }, emptyContainer: { paddingHorizontal: 32, flex: 1, diff --git a/packages/mobile/src/core/Settings/Settings.tsx b/packages/mobile/src/core/Settings/Settings.tsx index 33ba67538..fc497bed9 100644 --- a/packages/mobile/src/core/Settings/Settings.tsx +++ b/packages/mobile/src/core/Settings/Settings.tsx @@ -270,7 +270,7 @@ export const Settings: FC = () => { { const renderNotificationsHeader = notifications.length ? ( - {notifications.slice(0, Math.min(newNotificationsCount, 2)).map((notification) => ( - - ))} - - - - - } - rightContent={ - newNotificationsCount - 2 > 0 ? ( - - {newNotificationsCount - 2} + + {notifications + .slice(0, Math.min(newNotificationsCount, 2)) + .map((notification) => ( + + ))} + + + - ) : null - } - onPress={handleOpenNotificationsScreen} - title={t('notifications.notifications')} - subtitle={t('notifications.from_connected')} - chevron - /> - + } + rightContent={ + newNotificationsCount - 2 > 0 ? ( + + {newNotificationsCount - 2} + + ) : null + } + onPress={handleOpenNotificationsScreen} + title={t('notifications.notifications')} + subtitle={t('notifications.from_connected')} + chevron + /> + + ) : undefined; @@ -196,4 +200,7 @@ const styles = Steezy.create(({ colors }) => ({ listStyle: { marginBottom: 8, }, + gap8: { + gap: 8, + }, })); diff --git a/packages/mobile/src/tabs/Wallet/WalletScreen.tsx b/packages/mobile/src/tabs/Wallet/WalletScreen.tsx index 8afaf0968..ec8a7514a 100644 --- a/packages/mobile/src/tabs/Wallet/WalletScreen.tsx +++ b/packages/mobile/src/tabs/Wallet/WalletScreen.tsx @@ -99,7 +99,7 @@ export const WalletScreen = memo(({ navigation }) => { - + {!isWatchOnly && } {wallet && isConnected !== false ? ( diff --git a/packages/mobile/src/tabs/Wallet/components/WalletContentList.tsx b/packages/mobile/src/tabs/Wallet/components/WalletContentList.tsx index 793cbc1e6..c9d779857 100644 --- a/packages/mobile/src/tabs/Wallet/components/WalletContentList.tsx +++ b/packages/mobile/src/tabs/Wallet/components/WalletContentList.tsx @@ -106,16 +106,20 @@ interface WalletContentListProps { ListFooterComponent?: React.ReactElement | null; } +function ItemSeparatorComponent() { + return ( + + + + ); +} + export const WalletContentList = memo((props) => { const theme = useTheme(); return ( ( - - - - )} + ItemSeparatorComponent={ItemSeparatorComponent} ListHeaderComponent={props.ListHeaderComponent} ListFooterComponent={props.ListFooterComponent} renderItem={RenderItem} diff --git a/packages/shared/modals/ActivityActionModal/RechargeByPromoModal.tsx b/packages/shared/modals/ActivityActionModal/RechargeByPromoModal.tsx index 11241c130..5b7a0bf06 100644 --- a/packages/shared/modals/ActivityActionModal/RechargeByPromoModal.tsx +++ b/packages/shared/modals/ActivityActionModal/RechargeByPromoModal.tsx @@ -42,7 +42,6 @@ export const RechargeByPromoModal = memo(() => { />