From 908e807f0025145646c65d9306a91fe8e8cae66b Mon Sep 17 00:00:00 2001
From: Justin Edmund <justin@jedmund.com>
Date: Thu, 22 Dec 2022 21:28:57 -0800
Subject: [PATCH] Fix defaultValue in FilterBar

---
 components/FilterBar/index.tsx    | 5 ++---
 components/RaidDropdown/index.tsx | 4 +---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/components/FilterBar/index.tsx b/components/FilterBar/index.tsx
index 062437c1..edd28eca 100644
--- a/components/FilterBar/index.tsx
+++ b/components/FilterBar/index.tsx
@@ -69,8 +69,7 @@ const FilterBar = (props: Props) => {
     <div className={classes}>
       {props.children}
       <Select
-        defaultValue="-1"
-        trigger={'All elements'}
+        defaultValue={`${props.element}`}
         open={elementOpen}
         onChange={elementSelectChanged}
         onClick={openElementSelect}
@@ -110,7 +109,7 @@ const FilterBar = (props: Props) => {
       />
 
       <Select
-        defaultValue="-1"
+        defaultValue={`${props.recency}`}
         trigger={'All time'}
         open={recencyOpen}
         onChange={recencySelectChanged}
diff --git a/components/RaidDropdown/index.tsx b/components/RaidDropdown/index.tsx
index 79af2f64..e0de7ca2 100644
--- a/components/RaidDropdown/index.tsx
+++ b/components/RaidDropdown/index.tsx
@@ -91,7 +91,6 @@ const RaidDropdown = React.forwardRef<HTMLSelectElement, Props>(
 
     // Enable changing select value
     function handleChange(value: string) {
-      console.log(value)
       if (props.onChange) props.onChange(value)
 
       if (raids) {
@@ -128,8 +127,7 @@ const RaidDropdown = React.forwardRef<HTMLSelectElement, Props>(
 
     return (
       <Select
-        defaultValue={props.defaultRaid}
-        trigger={'Select a raid...'}
+        defaultValue={props.currentRaid}
         placeholder={'Select a raid...'}
         open={open}
         onClick={openRaidSelect}