diff --git a/src/langs/fa.json b/src/langs/fa.json
index 35d805c..7cac3fb 100644
--- a/src/langs/fa.json
+++ b/src/langs/fa.json
@@ -237,7 +237,7 @@
"service": "سرویس",
"status": "وضعیت ",
"status_paid": "وضعیت پرداخت",
- "PENDING": "در انتظار ",
+ "PENDING": "در انتظار تایید ",
"PAID": "پرداخت شده",
"CANCELED": "لغو شده",
"EXPIRED": "منقضی شده",
diff --git a/src/pages/annoncement/List.tsx b/src/pages/annoncement/List.tsx
index 82ac9e8..02c445f 100644
--- a/src/pages/annoncement/List.tsx
+++ b/src/pages/annoncement/List.tsx
@@ -21,7 +21,7 @@ const AnnouncementtList: FC = () => {
const handleChange = (item: AnnoncementItemType) => {
if (window.innerWidth < 1280) {
- navigate(Pages.announcement.detail + item.id)
+ navigate(Pages.announcement.detail + item.announcement.id)
} else {
setItemSelected(item)
}
@@ -79,29 +79,32 @@ const AnnouncementtList: FC = () => {
)}>
- {item.title}
+ {item.announcement.title}
{
- item.isImportant &&
+ item.announcement.isImportant &&
}
- {/* */}
+ {
+ !item.isRead &&
+
+ }
-
+
- {moment(item.publishAt, 'jYYYY/jMM/jDD').format('jYYYY/jMM/jDD')}
+ {moment(item.announcement.publishAt).format('jYYYY/jMM/jDD')}
@@ -122,7 +125,7 @@ const AnnouncementtList: FC = () => {
متن اطلاعیه
{
- itemSelected.isImportant &&
+ itemSelected.announcement.isImportant &&
{
- {itemSelected.title}
+ {itemSelected.announcement.title}
-
diff --git a/src/pages/annoncement/types/AnnoncementTypes.ts b/src/pages/annoncement/types/AnnoncementTypes.ts
index ef97d3a..6ebe9bf 100644
--- a/src/pages/annoncement/types/AnnoncementTypes.ts
+++ b/src/pages/annoncement/types/AnnoncementTypes.ts
@@ -1,16 +1,18 @@
export type AnnoncementItemType = {
- content: string;
- createdAt: string;
id: string;
- isImportant: boolean;
- isPublic: boolean;
- isRead: boolean;
- publishAt: string;
- service: {
- id: string;
- name: string;
- };
- targetGroups: any[];
- title: string;
+ createdAt: string;
updatedAt: string;
+ announcement: {
+ id: string;
+ createdAt: string;
+ title: string;
+ content: string;
+ publishAt: string;
+ targetService: {
+ id: string;
+ name: string;
+ };
+ isImportant: boolean;
+ };
+ isRead: boolean;
};
diff --git a/src/pages/receipts/hooks/useReceiptData.ts b/src/pages/receipts/hooks/useReceiptData.ts
index 012bfcd..5af314d 100644
--- a/src/pages/receipts/hooks/useReceiptData.ts
+++ b/src/pages/receipts/hooks/useReceiptData.ts
@@ -1,4 +1,4 @@
-import { useMutation, useQuery } from "@tanstack/react-query";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
import * as api from "../service/ReceiptService";
import {
ApplyDiscountType,
@@ -29,8 +29,14 @@ export const useApproveInvoice = () => {
};
export const usePayInvoice = () => {
+ const queryClient = useQueryClient();
return useMutation({
mutationFn: (variables: string) => api.payInvoice(variables),
+ onSuccess: () => {
+ queryClient.refetchQueries({
+ queryKey: ["wallet-balance"],
+ });
+ },
});
};