Merge branch 'main' into '67-date-filtering-on-home-screen'

# Conflicts:
#   components/index.tsx

components/index.tsx

@@ -9,13 +9,13 @@ import CategorySelectorModal from "./expense/CategorySelectorModal"
 import DateSelectorButton from "./expense/DateSelectorButton"
 
 //common
+import AutoDecimalInput from "./common/AutoDecimalInput"
 import CustomCard from "./common/CustomCard"
+import RoundedButton from "./common/RoundedButton"
+import TextInputBar from "./common/TextInputBar"
 import NavigationButton from "./common/button"
 import LoadingSymbol from "./common/loadingSymbol"
 import Plus from "./common/plus"
-import TextInputBar from "./common/TextInputBar"
-import AutoDecimalInput from "./common/AutoDecimalInput"
-import RoundedButton from "./common/RoundedButton"
 import EmptyListCompenent from "./common/EmptyListCompenent"
 
 //login
@@ -27,26 +27,30 @@ import TypeSelectorSwitch from "./budget/typeSelectorSwitch"
 //login
 import Input from "./login/input"
 
+//stats
+import Graph from "./stats/Graph"
+
 export {
+  AutoDecimalInput,
   BudgetHeader,
   ButtonSetting,
-  CustomCard,
-  ExpenseItem,
-  Input,
-  LoadingSymbol,
-  Plus,
-  TextInputBar,
-  ToggleSetting,
-  Welcome,
-  AutoDecimalInput,
+  CategoryItem,
   CategorySelector,
   CategorySelectorModal,
-  DateSelectorButton,
-  RoundedButton,
-  CategoryItem,
-  TypeSelectorSwitch,
-  NavigationButton,
+  CustomCard,
   CustomColorPicker,
+  DateSelectorButton,
   EmptyListCompenent,
+  ExpenseItem,
+  Graph,
+  Input,
+  LoadingSymbol,
+  NavigationButton,
+  Plus,
+  RoundedButton,
+  TextInputBar,
+  ToggleSetting,
+  TypeSelectorSwitch,
+  Welcome
 }