fix: dropdown height for width screen & FAB round border (#875)

OneKeyHQ · Jun 13, 2022 · 6c5686a · 6c5686a
1 parent 808b3f5
commit 6c5686a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/packages/components/src/Layout/BottomBarModal/index.tsx b/packages/components/src/Layout/BottomBarModal/index.tsx
@@ -50,7 +50,10 @@ const BottomBarModal = forwardRef<TBottomBarRefAttr, TBottomBarModalProps>(
   (props, ref) => {
     const modalizeRef = useRef(null);
     const combinedRef = useCombinedRefs(ref, modalizeRef);
-    const [inactiveFontColor] = useThemeValue(['text-default']);
+    const [inactiveFontColor, defaultBgColor] = useThemeValue([
+      'text-default',
+      'background-default',
+    ]);
     return (
       <Modalize
         adjustToContentHeight
@@ -67,8 +70,11 @@ const BottomBarModal = forwardRef<TBottomBarRefAttr, TBottomBarModalProps>(
             duration: 150,
           },
         }}
+        modalStyle={{
+          backgroundColor: defaultBgColor,
+        }}
       >
-        <Box mb={props.tabBarHeight} p="16px" bgColor="background-default">
+        <Box mb={props.tabBarHeight} p="16px">
           {props.foldableList.map((foldable, index) => (
             <Pressable
               key={index}

diff --git a/packages/kit/src/components/Header/ChainSelector.tsx b/packages/kit/src/components/Header/ChainSelector.tsx
@@ -70,7 +70,10 @@ const ChainSelector: FC = () => {
         setPositionOnlyMounted
         positionTranslateY={-4}
         dropdownPosition="top-left"
-        dropdownProps={{ minW: '240px', height: '320px' }}
+        dropdownProps={{
+          minW: '240px',
+          height: isVerticalLayout ? '70%' : '320px',
+        }}
         value={activeNetwork ? activeNetwork?.id : undefined}
         onChange={handleActiveChainChange}
         title={intl.formatMessage({ id: 'network__networks' })}