fix: clean small launchpad components, some fixes

TERITORI · Jun 30, 2024 · 4218321 · 4218321
1 parent 22c3d8b
commit 4218321
Show file tree

Hide file tree

Showing 18 changed files with 97 additions and 266 deletions.
diff --git a/packages/components/HeaderContent/HeaderContent.tsx b/packages/components/HeaderContent/HeaderContent.tsx
diff --git a/packages/components/applicationTable/CollectionNameCell.tsx b/packages/components/applicationTable/CollectionNameCell.tsx
diff --git a/packages/components/applicationTable/InnerCellText.tsx b/packages/components/applicationTable/InnerCellText.tsx
@@ -11,6 +11,7 @@ import { BrandText } from "../BrandText";
 import { SVG } from "../SVG";
 
 // TODO: Remove this component after correctly replaced its usage by packages/components/table
+// ==========> WAIT FOR PR 1235
 
 export const InnerCellText: React.FC<{
   style?: StyleProp<ViewStyle>;

diff --git a/packages/components/applicationTable/LinkIconAndRedirect.tsx b/packages/components/applicationTable/LinkIconAndRedirect.tsx
diff --git a/packages/components/applicationTable/PercentageVolumeCell.tsx b/packages/components/applicationTable/PercentageVolumeCell.tsx
diff --git a/.../LaunchpadAdmin/LaunchpadAdministrationOverview/LaunchpadAdministrationOverviewScreen.tsx b/.../LaunchpadAdmin/LaunchpadAdministrationOverview/LaunchpadAdministrationOverviewScreen.tsx
@@ -9,6 +9,7 @@ import { LaunchpadCollectionsTable } from "../LaunchpadApplications/component/La
 import { BrandText } from "@/components/BrandText";
 import { ScreenContainer } from "@/components/ScreenContainer";
 import { SecondaryBox } from "@/components/boxes/SecondaryBox";
+import { SpacerColumn } from "@/components/spacer";
 import { Tabs } from "@/components/tabs/Tabs";
 import { useAppNavigation } from "@/hooks/navigation/useAppNavigation";
 import { NetworkFeature } from "@/networks";
@@ -190,6 +191,8 @@ export const LaunchpadAdministrationOverviewScreen: React.FC = () => {
           <LaunchpadCollectionsTable rows={dummyData} />
         </View>
 
+        <SpacerColumn size={2} />
+
         <TouchableOpacity
           onPress={() => navigation.navigate("LaunchpadApplications")}
         >

diff --git a/...eens/Launchpad/LaunchpadAdmin/LaunchpadAdministrationOverview/component/GuardiansList.tsx b/...eens/Launchpad/LaunchpadAdmin/LaunchpadAdministrationOverview/component/GuardiansList.tsx
@@ -2,7 +2,7 @@ import React, { FC, useState } from "react";
 import { Image, TouchableOpacity, ViewStyle } from "react-native";
 import Popover from "react-native-popover-view";
 
-import { TooltipContant } from "./TooltipContant";
+import { TooltipContent } from "./TooltipContent";
 
 import avaPNG from "@/assets/default-images/ava.png";
 import checkBadgeSVG from "@/assets/icons/certified.svg";
@@ -47,7 +47,7 @@ export const GuardiansList: FC<{ index: number }> = ({ index }) => {
         popoverStyle={popoverStyle}
         backgroundStyle={{ opacity: 0 }}
       >
-        <TooltipContant />
+        <TooltipContent />
       </Popover>
     </>
   );

diff --git a/...tionOverview/component/TooltipContant.tsx → ...tionOverview/component/TooltipContent.tsx b/...tionOverview/component/TooltipContant.tsx → ...tionOverview/component/TooltipContent.tsx
@@ -5,19 +5,26 @@ import avaPNG from "@/assets/default-images/ava.png";
 import checkBadgeSVG from "@/assets/icons/certified.svg";
 import SolanaCircleSVG from "@/assets/icons/networks/solana-circle.svg";
 import { BrandText } from "@/components/BrandText";
-import { HeaderContent } from "@/components/HeaderContent/HeaderContent";
 import { SVG } from "@/components/SVG";
-import { InnerCellText } from "@/components/applicationTable/InnerCellText";
-import { lightblue, neutral00 } from "@/utils/style/colors";
-import { fontSemibold16 } from "@/utils/style/fonts";
+import { StateBadge } from "@/screens/Launchpad/LaunchpadAdmin/components/StateBadge";
+import { neutral77 } from "@/utils/style/colors";
+import { fontSemibold12, fontSemibold16 } from "@/utils/style/fonts";
 import { layout } from "@/utils/style/layout";
 
-export const TooltipContant = () => {
+export const TooltipContent = () => {
   return (
     <>
       <View style={flexRowCenter}>
         <View>
-          <HeaderContent header="Collection Name">
+          <View>
+            <BrandText
+              style={[
+                fontSemibold12,
+                { color: neutral77, marginBottom: layout.spacing_x1 },
+              ]}
+            >
+              Collection Name
+            </BrandText>
             <View style={listToggle}>
               <Image
                 style={{
@@ -39,27 +46,31 @@ export const TooltipContant = () => {
               </BrandText>
               <SVG source={checkBadgeSVG} width={18} height={18} />
             </View>
-          </HeaderContent>
-          <HeaderContent
-            style={{ marginTop: layout.spacing_x1_5 }}
-            header="Project Readiness for Mint"
-          >
-            <InnerCellText
-              style={{
-                backgroundColor: lightblue,
-                borderRadius: 100,
-                paddingHorizontal: 10,
-                paddingVertical: 5,
-                alignSelf: "flex-start",
-              }}
-              textStyle={{ color: neutral00 }}
+          </View>
+
+          <View style={{ marginTop: layout.spacing_x1_5 }}>
+            <BrandText
+              style={[
+                fontSemibold12,
+                { color: neutral77, marginBottom: layout.spacing_x1 },
+              ]}
             >
-              Complete and ready to mint
-            </InnerCellText>
-          </HeaderContent>
+              Project Readiness for Mint
+            </BrandText>
+            <StateBadge text="Complete and ready to mint" />
+          </View>
         </View>
+
         <View>
-          <HeaderContent header="Collection network">
+          <View>
+            <BrandText
+              style={[
+                fontSemibold12,
+                { color: neutral77, marginBottom: layout.spacing_x1 },
+              ]}
+            >
+              Collection network
+            </BrandText>
             <View style={listToggle}>
               <SVG
                 width={28}
@@ -73,24 +84,19 @@ export const TooltipContant = () => {
                 Solana
               </BrandText>
             </View>
-          </HeaderContent>
-          <HeaderContent
-            style={{ marginTop: layout.spacing_x1_5 }}
-            header="Basic marketing package"
-          >
-            <InnerCellText
-              style={{
-                backgroundColor: lightblue,
-                borderRadius: 100,
-                paddingHorizontal: 10,
-                paddingVertical: 5,
-                alignSelf: "flex-start",
-              }}
-              textStyle={{ color: neutral00 }}
+          </View>
+
+          <View style={{ marginTop: layout.spacing_x1_5 }}>
+            <BrandText
+              style={[
+                fontSemibold12,
+                { color: neutral77, marginBottom: layout.spacing_x1 },
+              ]}
             >
-              Yes
-            </InnerCellText>
-          </HeaderContent>
+              Basic marketing package
+            </BrandText>
+            <StateBadge text="Yes" />
+          </View>
         </View>
       </View>
     </>

diff --git a/...ages/screens/Launchpad/LaunchpadAdmin/LaunchpadAllProjects/LaunchpadAllProjectsScreen.tsx b/...ages/screens/Launchpad/LaunchpadAdmin/LaunchpadAllProjects/LaunchpadAllProjectsScreen.tsx
@@ -6,6 +6,7 @@ import { LaunchpadAllProjectsTable } from "./component/LaunchpadAllProjectsTable
 import { BrandText } from "@/components/BrandText";
 import { ScreenContainer } from "@/components/ScreenContainer";
 import { HighVolSortButton } from "@/components/sorts/HighVolSortButton";
+import { SpacerColumn } from "@/components/spacer";
 import { Tabs } from "@/components/tabs/Tabs";
 import { useAppNavigation } from "@/hooks/navigation/useAppNavigation";
 import { useIsMobile } from "@/hooks/useIsMobile";
@@ -155,6 +156,8 @@ export const LaunchpadAllProjectsScreen: React.FC = () => {
         >
           <LaunchpadAllProjectsTable rows={dummyData} />
         </View>
+
+        <SpacerColumn size={16} />
       </View>
     </ScreenContainer>
   );

diff --git a/...ens/Launchpad/LaunchpadAdmin/LaunchpadAllProjects/component/LaunchpadAllProjectsTable.tsx b/...ens/Launchpad/LaunchpadAdmin/LaunchpadAllProjects/component/LaunchpadAllProjectsTable.tsx
@@ -8,7 +8,6 @@ import downArrowSVG from "@/assets/icons/downArrow.svg";
 import upArrowSVG from "@/assets/icons/upArrow.svg";
 import { SVG } from "@/components/SVG";
 import { RoundedGradientImage } from "@/components/images/RoundedGradientImage";
-import { SpacerColumn } from "@/components/spacer";
 import { TableCell } from "@/components/table/TableCell";
 import { TableHeader } from "@/components/table/TableHeader";
 import { TableRow } from "@/components/table/TableRow";
@@ -73,7 +72,6 @@ export const LaunchpadAllProjectsTable: React.FC<{
           )}
           keyExtractor={(item) => item.id.toString()}
         />
-        <SpacerColumn size={16} />
       </TableWrapper>
     </View>
   );

diff --git a/...es/screens/Launchpad/LaunchpadAdmin/LaunchpadApplications/LaunchpadApplicationsScreen.tsx b/...es/screens/Launchpad/LaunchpadAdmin/LaunchpadApplications/LaunchpadApplicationsScreen.tsx
@@ -4,6 +4,7 @@ import { View } from "react-native";
 import { BrandText } from "@/components/BrandText";
 import { ScreenContainer } from "@/components/ScreenContainer";
 import { HighVolSortButton } from "@/components/sorts/HighVolSortButton";
+import { SpacerColumn } from "@/components/spacer";
 import { Tabs } from "@/components/tabs/Tabs";
 import { useAppNavigation } from "@/hooks/navigation/useAppNavigation";
 import { useIsMobile } from "@/hooks/useIsMobile";
@@ -111,6 +112,8 @@ export const LaunchpadApplicationsScreen: React.FC = () => {
         >
           <LaunchpadCollectionsTable rows={dummyData} />
         </View>
+
+        <SpacerColumn size={16} />
       </View>
     </ScreenContainer>
   );