Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
removed warnings
  • Loading branch information
nandcoder committed Apr 15, 2023
commit 09de9aebaf579e3b060e230cf48130ebac56aa7e
4 changes: 2 additions & 2 deletions src/components/TransactionTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Table from 'react-bootstrap/Table';
// import Badge from 'react-bootstrap/Badge';
// import data from '../assets/TransactionData';
// import { db } from '../utils/firebase';
import { useContext, useEffect, useState } from 'react';
import { useContext } from 'react';
import { AuthContext } from './Authentication/AuthProvider';
import { DataContext } from './Authentication/DataProvider';
import { Avatar, AvatarGroup, Badge, Box, IconButton, useToast } from '@chakra-ui/react';
Expand Down Expand Up @@ -41,7 +41,7 @@ function TransactionTable(props) {
const { user } = useContext(AuthContext);
const { transactions, users, requestTransactions, setRequestTransactions } = useContext(DataContext)
// const [request, setRequest] = useState(true);
const [transactionData, setTransactionData] = useState([]);
// const [transactionData, setTransactionData] = useState([]);
// const [loading, setLoading] = useState(true);
// const [users, setUsers] = useState([]);
const toast = useToast();
Expand Down
5 changes: 1 addition & 4 deletions src/pages/Transaction/GroupTransaction/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { useContext, useEffect, useState } from "react";
import { FormControl, FormLabel, FormErrorMessage, Input, Box, Heading, Select, Stack, useToast } from "@chakra-ui/react";
import { Button, Container, Modal } from "react-bootstrap";
import firebase from "firebase";
import { useForm } from "react-hook-form";
import { addTransactionResolver } from "../../../utils/validator/addTransactionResolver";
import { db } from "../../../utils/firebase";
Expand All @@ -25,9 +24,7 @@ const GroupTransaction = () => {
const {
handleSubmit,
register,
formState: { errors, isSubmitting },
// setError,
// clearErrors,
formState: { errors },
} = useForm({ resolver: addTransactionResolver });
const addTransaction = (data) => {
const { title, desc, day, amount, payer } = data
Expand Down
34 changes: 3 additions & 31 deletions src/pages/Transaction/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React, { useContext, useEffect, useState } from "react";
import { FormControl, FormLabel, FormErrorMessage, Input, Box, Heading, useToast, Select, Checkbox, Stack, CheckboxGroup } from "@chakra-ui/react";
import { Button, Container, Form, Modal } from "react-bootstrap";
import firebase from "firebase";
import { FormControl, FormLabel, FormErrorMessage, Input, Box, Heading, useToast, Select, Stack } from "@chakra-ui/react";
import { Button, Container, Modal } from "react-bootstrap";
import TransactionTable from "../../components/TransactionTable";
import { useForm } from "react-hook-form";
import { addTransactionResolver } from "../../utils/validator/addTransactionResolver";
Expand All @@ -28,7 +27,7 @@ const Transaction = () => {
const {
handleSubmit,
register,
formState: { errors, isSubmitting },
formState: { errors },
// setError,
// clearErrors,
} = useForm({ resolver: addTransactionResolver });
Expand Down Expand Up @@ -263,33 +262,6 @@ const Transaction = () => {
))}

</Stack>
<CheckboxGroup colorScheme='green' value={involved} >
{/* <Form>
<Form.Group className="mb-3" controlId="exampleForm.ControlInput1">
<Form.Label>Email address</Form.Label>
{['checkbox', 'checkbox'].map((type) => (
<div key={`default-${type}`} className="mb-3">
<Form.Check
type={type}
id={`default-${type}`}
label={`default ${type}`}
/>
</div>
))}
</Form.Group>
</Form>


<CheckboxGroup defaultValue='Itachi'>
<Stack spacing='24px'>
<Checkbox name="involved" onSelect={handleInvolved} id="1" value='Sasuke'>Sasuke</Checkbox>
<Checkbox name="involved" onSelect={handleInvolved} id="2" value='Nagato'>Nagato</Checkbox>
<Checkbox name="involved" onSelect={handleInvolved} id="3" value='Itachi'>Itachi</Checkbox>
<Checkbox name="involved" onSelect={handleInvolved} id="4" value='Sage of the six Paths'>Sage of the six Paths</Checkbox>
</Stack>
</CheckboxGroup> */}

</CheckboxGroup>
<FormErrorMessage>
{errors.involved && errors.involved.message}
</FormErrorMessage>
Expand Down