From 702e18a33476c9304c5111818a943b653f5762a6 Mon Sep 17 00:00:00 2001 From: Nicola Benaglia Date: Sat, 24 May 2025 12:19:11 +0200 Subject: [PATCH] Rename files and folders (uniform the case) --- src/App.tsx | 2 +- src/Wallets.tsx | 2 +- src/components/Chat/ChatDirect.tsx | 2 +- src/components/Chat/ChatGroup.tsx | 2 +- src/components/Group/Group.tsx | 2 +- src/main.tsx | 4 +- src/{ => messaging}/MessageQueueContext.tsx | 0 ...ackground.tsx => MessagesToBackground.tsx} | 44 ++++++++++++++----- ...enerator.ts => randomSentenceGenerator.ts} | 0 src/utils/{Size => size}/index.ts | 0 10 files changed, 40 insertions(+), 18 deletions(-) rename src/{ => messaging}/MessageQueueContext.tsx (100%) rename src/messaging/{messagesToBackground.tsx => MessagesToBackground.tsx} (71%) rename src/utils/seedPhrase/{RandomSentenceGenerator.ts => randomSentenceGenerator.ts} (100%) rename src/utils/{Size => size}/index.ts (100%) diff --git a/src/App.tsx b/src/App.tsx index f58c7c2..9e1332b 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -35,7 +35,7 @@ import PersonSearchIcon from '@mui/icons-material/PersonSearch'; import qortLogo from './assets/qort.png'; import { Return } from './assets/Icons/Return.tsx'; import WarningIcon from '@mui/icons-material/Warning'; -import './utils/seedPhrase/RandomSentenceGenerator'; +import './utils/seedPhrase/randomSentenceGenerator.ts'; import EngineeringIcon from '@mui/icons-material/Engineering'; import AccountBalanceWalletIcon from '@mui/icons-material/AccountBalanceWallet'; import PriorityHighIcon from '@mui/icons-material/PriorityHigh'; diff --git a/src/Wallets.tsx b/src/Wallets.tsx index c0aa098..1fe7583 100644 --- a/src/Wallets.tsx +++ b/src/Wallets.tsx @@ -75,7 +75,7 @@ export const Wallets = ({ setExtState, setRawWallet, rawWallet }) => { const fileContents = await new Promise((resolve, reject) => { const reader = new FileReader(); - reader.onabort = () => reject('File reading was aborted'); + reader.onabort = () => reject('File reading was aborted'); // TODO translate reader.onerror = () => reject('File reading has failed'); reader.onload = () => { // Resolve the promise with the reader result when reading completes diff --git a/src/components/Chat/ChatDirect.tsx b/src/components/Chat/ChatDirect.tsx index 0af54a6..6f95eee 100644 --- a/src/components/Chat/ChatDirect.tsx +++ b/src/components/Chat/ChatDirect.tsx @@ -15,7 +15,7 @@ import { resumeAllQueues, } from '../../App'; import { getPublicKey } from '../../background/background.ts'; -import { useMessageQueue } from '../../MessageQueueContext'; +import { useMessageQueue } from '../../messaging/MessageQueueContext.tsx'; import { executeEvent, subscribeToEvent, diff --git a/src/components/Chat/ChatGroup.tsx b/src/components/Chat/ChatGroup.tsx index 6fada40..9fc5e9a 100644 --- a/src/components/Chat/ChatGroup.tsx +++ b/src/components/Chat/ChatGroup.tsx @@ -25,7 +25,7 @@ import { } from '../../App'; import { CustomizedSnackbars } from '../Snackbar/Snackbar'; import { PUBLIC_NOTIFICATION_CODE_FIRST_SECRET_KEY } from '../../constants/constants'; -import { useMessageQueue } from '../../MessageQueueContext'; +import { useMessageQueue } from '../../messaging/MessageQueueContext.tsx'; import { executeEvent, subscribeToEvent, diff --git a/src/components/Group/Group.tsx b/src/components/Group/Group.tsx index 8f312ec..fa534f9 100644 --- a/src/components/Group/Group.tsx +++ b/src/components/Group/Group.tsx @@ -43,7 +43,7 @@ import { } from '../../utils/events'; import { RequestQueueWithPromise } from '../../utils/queue/queue'; import { WebSocketActive } from './WebsocketActive'; -import { useMessageQueue } from '../../MessageQueueContext'; +import { useMessageQueue } from '../../messaging/MessageQueueContext'; import { HomeDesktop } from './HomeDesktop'; import { IconWrapper } from '../Desktop/DesktopFooter'; import { DesktopHeader } from '../Desktop/DesktopHeader'; diff --git a/src/main.tsx b/src/main.tsx index d6da0d2..2b224c8 100644 --- a/src/main.tsx +++ b/src/main.tsx @@ -1,8 +1,8 @@ import { createRoot } from 'react-dom/client'; import App from './App.tsx'; import '../src/styles/index.css'; -import './messaging/messagesToBackground'; -import { MessageQueueProvider } from './MessageQueueContext.tsx'; +import './messaging/MessagesToBackground.tsx'; +import { MessageQueueProvider } from './messaging/MessageQueueContext.tsx'; import { ThemeProvider } from './components/Theme/ThemeContext.tsx'; import { CssBaseline } from '@mui/material'; import './i18n/i18n.js'; diff --git a/src/MessageQueueContext.tsx b/src/messaging/MessageQueueContext.tsx similarity index 100% rename from src/MessageQueueContext.tsx rename to src/messaging/MessageQueueContext.tsx diff --git a/src/messaging/messagesToBackground.tsx b/src/messaging/MessagesToBackground.tsx similarity index 71% rename from src/messaging/messagesToBackground.tsx rename to src/messaging/MessagesToBackground.tsx index 4eebc5e..a325352 100644 --- a/src/messaging/messagesToBackground.tsx +++ b/src/messaging/MessagesToBackground.tsx @@ -1,5 +1,3 @@ - - // Utility to generate unique request IDs function generateRequestId() { return `msg-${Date.now()}-${Math.random().toString(36).slice(2, 9)}`; @@ -9,34 +7,55 @@ function generateRequestId() { const callbackMap = new Map(); // Global listener for handling message responses -window.addEventListener("message", (event) => { +window.addEventListener('message', (event) => { const { type, requestId, payload, error, message } = event.data; // Only process messages of type `backgroundMessageResponse` - if (type !== "backgroundMessageResponse") return; + if (type !== 'backgroundMessageResponse') return; // Check if there’s a callback stored for this requestId if (callbackMap.has(requestId)) { const { resolve, reject } = callbackMap.get(requestId); callbackMap.delete(requestId); // Remove callback after use - resolve(event.data) + resolve(event.data); } }); -export const sendMessageBackground = (action, data = {}, timeout = 240000, isExtension, appInfo, skipAuth) => { +export const sendMessageBackground = ( + action, + data = {}, + timeout = 240000, + isExtension, + appInfo, + skipAuth +) => { return new Promise((resolve, reject) => { const requestId = generateRequestId(); // Unique ID for each request callbackMap.set(requestId, { resolve, reject }); // Store both resolve and reject callbacks - const targetOrigin = window.location.origin + const targetOrigin = window.location.origin; // Send the message with `backgroundMessage` type - window.postMessage({ type: "backgroundMessage", action, requestId, payload: data, isExtension, appInfo, skipAuth }, targetOrigin); + window.postMessage( + { + type: 'backgroundMessage', + action, + requestId, + payload: data, + isExtension, + appInfo, + skipAuth, + }, + targetOrigin + ); // Set up a timeout to automatically reject if no response is received const timeoutId = setTimeout(() => { // Remove the callback to prevent memory leaks callbackMap.delete(requestId); - reject({ error: "timeout", message: `Request timed out after ${timeout} ms` }); + reject({ + error: 'timeout', + message: `Request timed out after ${timeout} ms`, + }); }, timeout); // Adjust resolve/reject to clear the timeout when a response arrives @@ -48,14 +67,17 @@ export const sendMessageBackground = (action, data = {}, timeout = 240000, isExt reject: (error) => { clearTimeout(timeoutId); // Clear the timeout if an error occurs reject(error); - } + }, }); }).then((response) => { // Return payload or error based on response content if (response?.payload !== null && response?.payload !== undefined) { return response.payload; } else if (response?.error) { - return { error: response.error, message: response?.message || "An error occurred" }; + return { + error: response.error, + message: response?.message || 'An error occurred', + }; } }); }; diff --git a/src/utils/seedPhrase/RandomSentenceGenerator.ts b/src/utils/seedPhrase/randomSentenceGenerator.ts similarity index 100% rename from src/utils/seedPhrase/RandomSentenceGenerator.ts rename to src/utils/seedPhrase/randomSentenceGenerator.ts diff --git a/src/utils/Size/index.ts b/src/utils/size/index.ts similarity index 100% rename from src/utils/Size/index.ts rename to src/utils/size/index.ts