Fixing start time picker padding and margin

Vincit · Sep 12, 2024 · 88cc6c3 · 88cc6c3
1 parent f69c3ff
commit 88cc6c3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/frontend/src/components/AvailableRoomList/AvailableRoomList.test.tsx b/frontend/src/components/AvailableRoomList/AvailableRoomList.test.tsx
@@ -119,6 +119,7 @@ describe('AvailableRoomList', () => {
         },
         selectedRoom: fakeRooms[0]
     };
+
     it('renders room data', async () => {
         render(
             <AvailableRoomList

diff --git a/frontend/src/components/AvailableRoomList/AvailableRoomList.tsx b/frontend/src/components/AvailableRoomList/AvailableRoomList.tsx
@@ -20,7 +20,7 @@ const TimePickerButton = styled(ToggleButton)(() => ({
     }
 }));
 
-async function checkIfFavorited(room: Room, pref?: Preferences) {
+function checkIfFavorited(room: Room, pref?: Preferences) {
     if (pref && pref.fav_rooms) {
         room.favorited = pref.fav_rooms.includes(room.id);
     } else {
@@ -59,10 +59,10 @@ const AvailableRoomList = (props: BookingListProps) => {
 
     // Effect to update room favorited status
     useEffect(() => {
-        const updateFavoritedRooms = async () => {
+        const updateFavoritedRooms = () => {
             const roomsCopy = [...rooms]; // Make a shallow copy of rooms
             for (const room of roomsCopy) {
-                await checkIfFavorited(room, preferences);
+                checkIfFavorited(room, preferences);
             }
             setUpdatedRooms(roomsCopy); // Update state after processing all rooms
         };

diff --git a/frontend/src/components/BookingView/StartingTimePicker.tsx b/frontend/src/components/BookingView/StartingTimePicker.tsx
@@ -7,9 +7,7 @@ import { formatTimeToHalfAndFullHours } from '../util/Time';
 import AlertBox from '../util/alertBox';
 
 const StartingTimeButton = styled(ToggleButton)(() => ({}));
-const StartingTimePickerContent = styled(Box)(({ theme }) => ({
-    margin: '8px 0px'
-}));
+const StartingTimePickerContent = styled(Box)(({ theme }) => ({}));
 
 type StartingTimePickerProps = {
     startingTime: string;
@@ -81,7 +79,7 @@ const StartingTimePicker = (props: StartingTimePickerProps) => {
                     exclusive
                     onChange={handleChange}
                     aria-label="duration picker"
-                    sx={{ margin: '8px 0' }}
+                    sx={{ marginTop: '8px', paddingBottom: '8px' }}
                     fullWidth
                 >
                     <StartingTimeButton
-Original file line number
+Diff line change
@@ Expand Up / @@ -119,6 +119,7 @@ describe('AvailableRoomList', () => { @@
             },
             selectedRoom: fakeRooms[0]
         };
         it('renders room data', async () => {
             render(
                 <AvailableRoomList
@@ Expand Down @@