Bug Fixing

This commit is contained in:
2022-02-03 16:39:05 +07:00
parent c63c1b961d
commit 32f33e6102
6 changed files with 74 additions and 18 deletions

View File

@@ -36,7 +36,7 @@ export const Profile = observer(() => {
const modalLoader = useContext(ModalLoaderContext);
const [filterStart, setFilterStart] = useState([]);
const [filterEnd, setFilterEnd] = useState([]);
const [action, setAction] = useState(false);
const [actionFilter, setAction] = useState(false);
const routeData = [
{
@@ -77,8 +77,14 @@ export const Profile = observer(() => {
form.resetFields();
setFilterStart([]);
setFilterEnd([]);
await store.transaction.getDataHistoryTransaction();
//await store.transaction.getDataHistoryTransaction();
actionFilter === true
? await store.transaction.getDataHistoryTopUpProfile(
store.authentication.profileData?.id
)
: await store.transaction.getDataHistoryTransaction();
store.transaction.visibleModalFilterTransaction = false;
setAction(false)
};
const handleCancelFilter = async () => {
@@ -86,7 +92,13 @@ export const Profile = observer(() => {
//form.resetFields();
store.transaction.filterEnd = null;
store.transaction.visibleModalFilterTransaction = false;
await store.transaction.getDataHistoryTransaction();
actionFilter === true
? await store.transaction.getDataHistoryTopUpProfile(
store.authentication.profileData?.id
)
: await store.transaction.getDataHistoryTransaction();
setAction(false)
//await store.transaction.getDataHistoryTransaction();
};
const handleSubmitFilter = async () => {
@@ -98,12 +110,17 @@ export const Profile = observer(() => {
"YYYY-MM-DD HH:mm:ss"
));
modalLoader.setLoading(true);
await store.transaction.getDataHistoryTransaction();
actionFilter === true
? await store.transaction.getDataHistoryTopUpProfile(
store.authentication.profileData?.id
)
: await store.transaction.getDataHistoryTransaction();
modalLoader.setLoading(false);
store.transaction.filterStart = null;
store.transaction.filterEnd = null;
//form.resetFields();
store.transaction.visibleModalFilterTransaction = false;
setAction(false)
};
const footerLayoutFilter = [
@@ -665,7 +682,11 @@ export const Profile = observer(() => {
store.transaction.filterStart = null;
store.transaction.filterEnd = null;
store.transaction.visibleModalFilterTransaction = false;
await store.transaction.getDataHistoryTransaction();
actionFilter === true
? await store.transaction.getDataHistoryTopUpProfile(
store.authentication.profileData?.id
)
: await store.transaction.getDataHistoryTransaction();
}}
>
<Row>