Merge branch 'main' into kathy/supercharge-restrcit

valora-inc · Oct 12, 2023 · 02495fe · 02495fe
2 parents 1ed0117 + 88feb30
commit 02495fe
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/src/tokens/Assets.tsx b/src/tokens/Assets.tsx
@@ -269,7 +269,7 @@ function AssetsScreen({ navigation, route }: Props) {
       }
     })
 
-    const sections: SectionListData<TokenBalance | Position | Nft, SectionData>[] = []
+    const sections: SectionListData<TokenBalance | Position | Nft[], SectionData>[] = []
     positionsByDapp.forEach((positions, appName) => {
       sections.push({
         data: positions,
@@ -315,7 +315,7 @@ function AssetsScreen({ navigation, route }: Props) {
     }
   }
 
-  const NftItem = ({ item, index }: { item: Nft; index: number }) => {
+  const NftItem = ({ item }: { item: Nft }) => {
     return (
       <View testID="NftItem" style={styles.nftsTouchableContainer}>
         <Touchable
@@ -351,7 +351,7 @@ function AssetsScreen({ navigation, route }: Props) {
     return (
       <View style={styles.nftsPairingContainer}>
         {item.map((nft, index) => (
-          <NftItem key={index} item={nft} index={index} />
+          <NftItem key={index} item={nft} />
         ))}
       </View>
     )
@@ -396,7 +396,7 @@ function AssetsScreen({ navigation, route }: Props) {
         else if (nftsLoading) return null
         else
           return (
-            <View style={{ marginTop: listHeaderHeight }}>
+            <View style={[{ marginTop: listHeaderHeight }, styles.noNftsTextContainer]}>
               <Text style={styles.noNftsText}>{t('nftGallery.noNfts')}</Text>
             </View>
           )
@@ -432,10 +432,10 @@ function AssetsScreen({ navigation, route }: Props) {
             paddingBottom: insets.bottom,
             opacity: listHeaderHeight > 0 ? 1 : 0,
           },
-          activeTab === AssetTabType.Collectibles && styles.nftsContentContainer,
-          activeTab === AssetTabType.Collectibles && nftsError
-            ? { alignItems: 'center' }
-            : { paddingLeft: Spacing.Thick24 },
+          activeTab === AssetTabType.Collectibles &&
+            !nftsError &&
+            nfts.length > 0 &&
+            styles.nftsContentContainer,
         ]}
         // ensure header is above the scrollbar on ios overscroll
         scrollIndicatorInsets={{ top: listHeaderHeight }}
@@ -575,6 +575,7 @@ const styles = StyleSheet.create({
   },
   nftsContentContainer: {
     alignItems: 'flex-start',
+    paddingHorizontal: Spacing.Thick24,
   },
   nftsErrorView: {
     width: nftImageSize,
@@ -586,7 +587,7 @@ const styles = StyleSheet.create({
     borderRadius: Spacing.Regular16,
   },
   nftsNoMetadataText: {
-    ...typeScale.titleLarge,
+    ...typeScale.labelSmall,
     textAlign: 'center',
   },
   nftsTouchableContainer: {
@@ -597,10 +598,13 @@ const styles = StyleSheet.create({
     borderRadius: Spacing.Regular16,
   },
   noNftsText: {
-    ...typeScale.labelMedium,
+    ...typeScale.bodySmall,
     color: Colors.gray3,
     textAlign: 'center',
   },
+  noNftsTextContainer: {
+    paddingHorizontal: Spacing.Thick24,
+  },
 })
 
 export default AssetsScreen