fix: box children centered well

fix: box childreen centered well and git conflit resolved fix: lint and yarn.lock
TERITORI · Jan 26, 2024 · eb45356 · eb45356
1 parent 64b0367
commit eb45356
Show file tree

Hide file tree

Showing 7 changed files with 263 additions and 247 deletions.
diff --git a/packages/components/NetworkSelector/NetworkSelectorMenu.tsx b/packages/components/NetworkSelector/NetworkSelectorMenu.tsx
@@ -81,7 +81,7 @@ export const NetworkSelectorMenu: FC<{
         style,
         {
           paddingHorizontal: layout.spacing_x2,
-          paddingTop: layout.spacing_x2,
+          paddingVertical: layout.spacing_x2,
           backgroundColor: neutral17,
           alignItems: "flex-start",
           width: 172,

diff --git a/packages/components/TopMenu/TopMenuBox.tsx b/packages/components/TopMenu/TopMenuBox.tsx
@@ -31,13 +31,11 @@ export const TopMenuBox: FC<{
 
   return (
     <TertiaryBox
+      notched={false}
       style={[
         style,
         mainContainerStyle,
-        {
-          borderRadius: 8,
-          width: topMenuWidth,
-        },
+        { borderRadius: 8, width: topMenuWidth },
       ]}
     >
       <ScrollView

diff --git a/packages/components/boxes/TertiaryBox.tsx b/packages/components/boxes/TertiaryBox.tsx
@@ -9,17 +9,20 @@ import { neutral33 } from "../../utils/style/colors";
 export const TertiaryBox: React.FC<{
   children?: ReactNode;
   style?: StyleProp<BoxStyle>;
-}> = ({ style, children }) => {
+  notched?: boolean;
+}> = ({ style, children, notched = true }) => {
   return (
     <Box
-      notched
       style={[
         {
           borderWidth: 1,
           borderColor: neutral33,
+          justifyContent: "center",
+          alignItems: "center",
         },
         style,
       ]}
+      notched={notched}
     >
       {children}
     </Box>

diff --git a/packages/components/fileUploader/FileUploader.web.tsx b/packages/components/fileUploader/FileUploader.web.tsx
@@ -33,8 +33,8 @@ export const FileUploader: FC<FileUploaderProps> = ({
 
   const handleFiles = async (files: File[]) => {
     const _files = multiple ? files : [files[0]];
-    let supportedFiles = [...files].filter(
-      (file) => mimeTypes?.includes(file.type),
+    let supportedFiles = [...files].filter((file) =>
+      mimeTypes?.includes(file.type),
     );
 
     if (maxUpload && supportedFiles.length) {

diff --git a/packages/components/inputs/TextInputCustom.tsx b/packages/components/inputs/TextInputCustom.tsx
@@ -60,7 +60,7 @@ export interface TextInputCustomProps<T extends FieldValues>
   onPressChildren?: () => void;
   placeHolder?: string;
   squaresBackgroundColor?: string;
-  style?: StyleProp<ViewStyle & BoxStyle>;
+  style?: StyleProp<ViewStyle>;
   textInputStyle?: StyleProp<TextStyle & ViewStyle & BoxStyle>;
   onPressEnter?: () => void;
   currency?: Currency;

diff --git a/packages/components/socialFeed/NewsFeed/NewsFeedInput.tsx b/packages/components/socialFeed/NewsFeed/NewsFeedInput.tsx
@@ -508,12 +508,7 @@ export const NewsFeedInput = React.forwardRef<
             >
               {viewWidth < BREAKPOINT_S && <SpacerColumn size={1.5} />}
 
-              <View
-                style={{
-                  flexDirection: "row",
-                  alignItems: "center",
-                }}
-              >
+              <View style={{ flexDirection: "row", alignItems: "center" }}>
                 <EmojiSelector
                   onEmojiSelected={onEmojiSelected}
                   buttonStyle={{ marginRight: layout.spacing_x2 }}