Robosats/robosats
1
0
Fork 0
mirror of https://github.com/RoboSats/robosats.git synced 2025-09-13 00:56:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rebase

Browse Source
This commit is contained in:
koalasat
2024-09-16 14:50:29 +02:00
parent 8f70b57dd5
commit 22ca2fa071
1 changed files with 34 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
frontend/src/components/Notifications/index.tsx
View File

@ -71,15 +71,7 @@ const Notifications = ({
}: NotificationsProps): JSX.Element => { }: NotificationsProps): JSX.Element => {
const { t } = useTranslation(); const { t } = useTranslation();
const navigate = useNavigate(); const navigate = useNavigate();
<<<<<<< HEAD
const { garage, slotUpdatedAt } = useContext<UseGarageStoreType>(GarageContext); const { garage, slotUpdatedAt } = useContext<UseGarageStoreType>(GarageContext);
=======
const basePageTitle = t('RoboSats - Simple and Private Bitcoin Exchange');
const defaultDelay = 5000;
const position = windowWidth > 60 ? { top: '4em', right: '0em' } : { top: '0.5em', left: '50%' };
>>>>>>> 29f784e9 (Web notifications)
const { garage, orderUpdatedAt } = useContext<UseGarageStoreType>(GarageContext);
const { federation } = useContext<UseFederationStoreType>(FederationContext); const { federation } = useContext<UseFederationStoreType>(FederationContext);
const [inFocus, setInFocus] = useState<boolean>(true); const [inFocus, setInFocus] = useState<boolean>(true);
const [titleAnimation, setTitleAnimation] = useState<NodeJS.Timer | undefined>(undefined); const [titleAnimation, setTitleAnimation] = useState<NodeJS.Timer | undefined>(undefined);
@ -88,11 +80,8 @@ const Notifications = ({
new Date().toISOString(), new Date().toISOString(),
); );
const [notifications, setNotifications] = useState<NotificationMessage[]>([]); const [notifications, setNotifications] = useState<NotificationMessage[]>([]);
const [timer, setTimer] = useState<NodeJS.Timer | undefined>(() => const [timer, setTimer] = useState<NodeJS.Timer | undefined>(() => setInterval(() => null, 10));
setInterval(() => null, defaultDelay),
);
<<<<<<< HEAD
// Keep last values to trigger effects on change // Keep last values to trigger effects on change
const [oldOrderStatus, setOldOrderStatus] = useState<number | undefined>(undefined); const [oldOrderStatus, setOldOrderStatus] = useState<number | undefined>(undefined);
const [oldRewards, setOldRewards] = useState<number>(0); const [oldRewards, setOldRewards] = useState<number>(0);
@ -105,12 +94,6 @@ const Notifications = ({
navigate(`/order/${String(garage.getSlot()?.activeOrder?.id)}`); navigate(`/order/${String(garage.getSlot()?.activeOrder?.id)}`);
setShow(false); setShow(false);
}; };
=======
// // Keep last values to trigger effects on change
// const [oldOrderStatus, setOldOrderStatus] = useState<number | undefined>(undefined);
// const [oldRewards, setOldRewards] = useState<number>(0);
// const [oldChatIndex, setOldChatIndex] = useState<number>(0);
>>>>>>> 29f784e9 (Web notifications)
interface MessagesProps { interface MessagesProps {
bondLocked: NotificationMessage; bondLocked: NotificationMessage;
@ -220,10 +203,9 @@ const Notifications = ({
}, },
}; };
<<<<<<< HEAD
const notify = function (message: NotificationMessage): void { const notify = function (message: NotificationMessage): void {
if (message.title !== '') { if (message.title !== '') {
setMessage(message); // setMessage(message);
setShow(true); setShow(true);
setTimeout(() => { setTimeout(() => {
setShow(false); setShow(false);
@ -247,9 +229,6 @@ const Notifications = ({
if (order === undefined || order === null) return; if (order === undefined || order === null) return;
=======
const handleStatus = function (notification: RoboNotification, order: Order): void {
>>>>>>> 29f784e9 (Web notifications)
let message = emptyNotificationMessage; let message = emptyNotificationMessage;
// Order status descriptions: // Order status descriptions:
@ -277,37 +256,37 @@ const Notifications = ({
setShow(false); setShow(false);
}; };
if (notification.order_status === 5) { // if (notification.order_status === 5) {
message = Messages.expired; // message = Messages.expired;
} else if (notification.order_status === 1) { // } else if (notification.order_status === 1) {
message = Messages.bondLocked; // message = Messages.bondLocked;
} else if (order.is_taker && notification.order_status === 6) { // } else if (order.is_taker && notification.order_status === 6) {
message = Messages.bondLocked; // message = Messages.bondLocked;
} else if (order.is_maker && notification.order_status === 6) { // } else if (order.is_maker && notification.order_status === 6) {
message = Messages.taken; // message = Messages.taken;
} else if (order.is_seller && notification.order_status > 7) { // } else if (order.is_seller && notification.order_status > 7) {
message = Messages.escrowLocked; // message = Messages.escrowLocked;
} else if ([9, 10].includes(notification.order_status)) { // } else if ([9, 10].includes(notification.order_status)) {
message = Messages.chat; // message = Messages.chat;
} else if (order.is_seller && [13, 14, 15].includes(notification.order_status)) { // } else if (order.is_seller && [13, 14, 15].includes(notification.order_status)) {
message = Messages.successful; // message = Messages.successful;
} else if (order.is_buyer && notification.order_status === 14) { // } else if (order.is_buyer && notification.order_status === 14) {
message = Messages.successful; // message = Messages.successful;
} else if (order.is_buyer && notification.order_status === 15) { // } else if (order.is_buyer && notification.order_status === 15) {
message = Messages.routingFailed; // message = Messages.routingFailed;
} else if (notification.order_status === 11) { // } else if (notification.order_status === 11) {
message = Messages.dispute; // message = Messages.dispute;
} else if ( // } else if (
(order.is_maker && notification.order_status === 18) || // (order.is_maker && notification.order_status === 18) ||
(order.is_taker && notification.order_status === 17) // (order.is_taker && notification.order_status === 17)
) { // ) {
message = Messages.disputeWinner; // message = Messages.disputeWinner;
} else if ( // } else if (
(order.is_maker && notification.order_status === 17) || // (order.is_maker && notification.order_status === 17) ||
(order.is_taker && notification.order_status === 18) // (order.is_taker && notification.order_status === 18)
) { // ) {
message = Messages.disputeLoser; // message = Messages.disputeLoser;
} // }
notify({ notify({
...message, ...message,
@ -315,7 +294,6 @@ const Notifications = ({
}); });
}; };
<<<<<<< HEAD
// Notify on order status change // Notify on order status change
useEffect(() => { useEffect(() => {
const order = garage.getSlot()?.activeOrder; const order = garage.getSlot()?.activeOrder;
@ -331,24 +309,6 @@ const Notifications = ({
} }
} }
}, [slotUpdatedAt]); }, [slotUpdatedAt]);
=======
const notify: (message: NotificationMessage) => void = (message) => {
if (message.title !== '') {
setShow(true);
setTimeout(() => {
setShow(false);
}, message.timeout);
void audio.ding.play();
if (!inFocus) {
setTitleAnimation(
setInterval(() => {
const title = document.title;
document.title = title === basePageTitle ? message.pageTitle : basePageTitle;
}, 1000),
);
}
}
};
const fetchNotifications: () => void = () => { const fetchNotifications: () => void = () => {
clearInterval(timer); clearInterval(timer);
@ -365,11 +325,10 @@ const Notifications = ({
}); });
}); });
}; };
>>>>>>> 29f784e9 (Web notifications)
useEffect(() => { useEffect(() => {
fetchNotifications(); fetchNotifications();
}, [orderUpdatedAt, rewards]); }, [rewards]);
// Set blinking page title and clear on visibility change > infocus // Set blinking page title and clear on visibility change > infocus
useEffect(() => { useEffect(() => {