Qortal/Qortal-Hub
1
0
Fork 0
mirror of https://github.com/Qortal/Qortal-Hub.git synced 2025-06-21 23:21:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #43 from nbenaglia/feature/i18n-continue

Browse Source 
i18n: Add translations
This commit is contained in:
nico.benaz 2025-05-15 08:57:45 +02:00 committed by GitHub
commit 01ab780175
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
47 changed files with 1398 additions and 946 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/App.tsx
View File

@ -1778,6 +1778,7 @@ function App() {
<QMailStatus />
<Spacer height="20px" />
{extState === 'authenticated' && (
<GeneralNotifications address={userInfo?.address} />
)}
@ -2513,7 +2514,7 @@ function App() {
setExtstate('create-wallet');
}}
>
{t('auth:create_account', { postProcess: 'capitalize' })}
{t('auth:action.create_account', { postProcess: 'capitalize' })}
</CustomButton>
</>
)}
@ -2610,7 +2611,7 @@ function App() {
fontWeight: 600,
}}
>
{t('auth:authenticate', { postProcess: 'capitalize' })}
{t('auth:action.authenticate', { postProcess: 'capitalize' })}
</TextP>
</Box>
@ -2662,7 +2663,7 @@ function App() {
<Spacer height="20px" />
<CustomButton onClick={authenticateWallet}>
{t('auth:authenticate', { postProcess: 'capitalize' })}
{t('auth:action.authenticate', { postProcess: 'capitalize' })}
</CustomButton>
<ErrorText>{walletToBeDecryptedError}</ErrorText>
@ -2930,7 +2931,9 @@ function App() {
<Spacer height="17px" />
<CustomButton onClick={createAccountFunc}>
{t('auth:create_account', { postProcess: 'capitalize' })}
{t('auth:action.create_account', {
postProcess: 'capitalize',
})}
</CustomButton>
</Box>
<ErrorText>{walletToBeDownloadedError}</ErrorText>

6
src/ExtStates/NotAuthenticated.tsx
View File

@ -572,7 +572,7 @@ export const NotAuthenticated = ({
},
}}
>
{t('auth:create_account', { postProcess: 'capitalize' })}
{t('auth:action.create_account', { postProcess: 'capitalize' })}
</CustomButton>
</HtmlTooltip>
</Box>
@ -953,7 +953,9 @@ export const NotAuthenticated = ({
setCustomNodeToSaveIndex(null);
}}
>
{t('auth:return_to_list', { postProcess: 'capitalize' })}
{t('auth:action.return_to_list', {
postProcess: 'capitalize',
})}
</Button>
<Button

136
src/MessageQueueContext.tsx
View File

@ -1,12 +1,17 @@
import React, { createContext, useContext, useState, useCallback, useRef } from 'react';
import ShortUniqueId from "short-unique-id";
import {
createContext,
useContext,
useState,
useCallback,
useRef,
} from 'react';
import ShortUniqueId from 'short-unique-id';
const MessageQueueContext = createContext(null);
const uid = new ShortUniqueId({ length: 8 });
export const useMessageQueue = () => useContext(MessageQueueContext);
const uid = new ShortUniqueId({ length: 8 });
export const MessageQueueProvider = ({ children }) => {
const messageQueueRef = useRef([]);
const [queueChats, setQueueChats] = useState({}); // Stores chats and status for display
@ -21,39 +26,41 @@ export const MessageQueueProvider = ({ children }) => {
const processingPromiseRef = useRef(Promise.resolve());
// Function to add a message to the queue
const addToQueue = useCallback((sendMessageFunc, messageObj, type, groupDirectId) => {
const tempId = uid.rnd();
const chatData = {
...messageObj,
type,
groupDirectId,
signature: uid.rnd(),
identifier: tempId,
retries: 0, // Retry count for display purposes
status: 'pending' // Initial status is 'pending'
};
const addToQueue = useCallback(
(sendMessageFunc, messageObj, type, groupDirectId) => {
const tempId = uid.rnd();
const chatData = {
...messageObj,
type,
groupDirectId,
signature: uid.rnd(),
identifier: tempId,
retries: 0, // Retry count for display purposes
status: 'pending', // Initial status is 'pending'
};
// Add chat data to queueChats for status tracking
setQueueChats((prev) => ({
...prev,
[groupDirectId]: [...(prev[groupDirectId] || []), chatData]
}));
// Add chat data to queueChats for status tracking
setQueueChats((prev) => ({
...prev,
[groupDirectId]: [...(prev[groupDirectId] || []), chatData],
}));
// Add the message to the global messageQueueRef
messageQueueRef.current.push({
func: sendMessageFunc,
identifier: tempId,
groupDirectId,
specialId: messageObj?.message?.specialId
});
// Add the message to the global messageQueueRef
messageQueueRef.current.push({
func: sendMessageFunc,
identifier: tempId,
groupDirectId,
specialId: messageObj?.message?.specialId,
});
// Start processing the queue
processQueue([], groupDirectId);
}, []);
// Start processing the queue
processQueue([], groupDirectId);
},
[]
);
// Function to process the message queue
const processQueue = useCallback((newMessages = [], groupDirectId) => {
processingPromiseRef.current = processingPromiseRef.current
.then(() => processQueueInternal(newMessages, groupDirectId))
.catch((err) => console.error('Error in processQueue:', err));
@ -92,7 +99,6 @@ export const MessageQueueProvider = ({ children }) => {
// Remove the message from the queue after successful sending
messageQueueRef.current.shift();
} catch (error) {
console.error('Message sending failed', error);
@ -110,7 +116,8 @@ export const MessageQueueProvider = ({ children }) => {
updatedChats[groupDirectId][chatIndex].status = 'failed';
} else {
// Max retries reached, set status to 'failed-permanent'
updatedChats[groupDirectId][chatIndex].status = 'failed-permanent';
updatedChats[groupDirectId][chatIndex].status =
'failed-permanent';
// Remove the message from the queue after max retries
messageQueueRef.current.shift();
@ -127,33 +134,39 @@ export const MessageQueueProvider = ({ children }) => {
// Method to process with new messages and groupDirectId
const processWithNewMessages = (newMessages, groupDirectId) => {
let updatedNewMessages = newMessages
let updatedNewMessages = newMessages;
if (newMessages.length > 0) {
// Remove corresponding entries in queueChats for the provided groupDirectId
setQueueChats((prev) => {
const updatedChats = { ...prev };
if (updatedChats[groupDirectId]) {
updatedNewMessages = newMessages?.map((msg)=> {
const findTempMsg = updatedChats[groupDirectId]?.find((msg2)=> msg2?.message?.specialId === msg?.specialId)
if(findTempMsg){
updatedNewMessages = newMessages?.map((msg) => {
const findTempMsg = updatedChats[groupDirectId]?.find(
(msg2) => msg2?.message?.specialId === msg?.specialId
);
if (findTempMsg) {
return {
...msg,
tempSignature: findTempMsg?.signature
}
tempSignature: findTempMsg?.signature,
};
}
return msg
})
updatedChats[groupDirectId] = updatedChats[groupDirectId].filter((chat) => {
return !newMessages.some(newMsg => newMsg?.specialId === chat?.message?.specialId);
return msg;
});
updatedChats[groupDirectId] = updatedChats[groupDirectId].filter(
(chat) => {
return !newMessages.some(
(newMsg) => newMsg?.specialId === chat?.message?.specialId
);
}
);
// Remove messages with status 'failed-permanent'
updatedChats[groupDirectId] = updatedChats[groupDirectId].filter((chat) => {
return chat?.status !== 'failed-permanent';
});
updatedChats[groupDirectId] = updatedChats[groupDirectId].filter(
(chat) => {
return chat?.status !== 'failed-permanent';
}
);
// If no more chats for this group, delete the groupDirectId entry
if (updatedChats[groupDirectId].length === 0) {
@ -162,27 +175,36 @@ export const MessageQueueProvider = ({ children }) => {
}
return updatedChats;
});
}
setTimeout(() => {
if(!messageQueueRef.current.find((msg) => msg?.groupDirectId === groupDirectId)){
if (
!messageQueueRef.current.find(
(msg) => msg?.groupDirectId === groupDirectId
)
) {
setQueueChats((prev) => {
const updatedChats = { ...prev };
if (updatedChats[groupDirectId]) {
delete updatedChats[groupDirectId]
delete updatedChats[groupDirectId];
}
return updatedChats
}
)
return updatedChats;
});
}
}, 300);
return updatedNewMessages
return updatedNewMessages;
};
return (
<MessageQueueContext.Provider value={{ addToQueue, queueChats, clearStatesMessageQueueProvider, processWithNewMessages }}>
<MessageQueueContext.Provider
value={{
addToQueue,
queueChats,
clearStatesMessageQueueProvider,
processWithNewMessages,
}}
>
{children}
</MessageQueueContext.Provider>
);

143
src/Wallets.tsx
View File

@ -1,4 +1,4 @@
import React, { useContext, useEffect, useState } from 'react';
import { Fragment, useContext, useEffect, useState } from 'react';
import List from '@mui/material/List';
import ListItem from '@mui/material/ListItem';
import Divider from '@mui/material/Divider';
@ -32,6 +32,7 @@ import { LoadingButton } from '@mui/lab';
import { PasswordField } from './components';
import { HtmlTooltip } from './ExtStates/NotAuthenticated';
import { MyContext } from './App';
import { useTranslation } from 'react-i18next';
const parsefilenameQortal = (filename) => {
return filename.startsWith('qortal_backup_') ? filename.slice(14) : filename;
@ -44,11 +45,11 @@ export const Wallets = ({ setExtState, setRawWallet, rawWallet }) => {
const [seedName, setSeedName] = useState('');
const [seedError, setSeedError] = useState('');
const { hasSeenGettingStarted } = useContext(MyContext);
const [password, setPassword] = useState('');
const [isOpenSeedModal, setIsOpenSeedModal] = useState(false);
const [isLoadingEncryptSeed, setIsLoadingEncryptSeed] = useState(false);
const theme = useTheme();
const { t } = useTranslation(['core', 'auth']);
const { isShow, onCancel, onOk, show } = useModal();
const { getRootProps, getInputProps } = useDropzone({
@ -82,8 +83,7 @@ export const Wallets = ({ setExtState, setRawWallet, rawWallet }) => {
}
}
let error: any = null;
let uniqueInitialMap = new Map();
const uniqueInitialMap = new Map();
// Only add a message if it doesn't already exist in the Map
importedWallets.forEach((wallet) => {
@ -92,7 +92,9 @@ export const Wallets = ({ setExtState, setRawWallet, rawWallet }) => {
uniqueInitialMap.set(wallet?.address0, wallet);
}
});
const data = Array.from(uniqueInitialMap.values());
if (data && data?.length > 0) {
const uniqueNewWallets = data.filter(
(newWallet) =>
@ -148,10 +150,19 @@ export const Wallets = ({ setExtState, setRawWallet, rawWallet }) => {
setPassword('');
setSeedError('');
} else {
setSeedError('Could not create account.');
setSeedError(
t('auth:message.error.account_creation', {
postProcess: 'capitalize',
})
);
}
} catch (error) {
setSeedError(error?.message || 'Could not create account.');
setSeedError(
error?.message ||
t('auth:message.error.account_creation', {
postProcess: 'capitalize',
})
);
} finally {
setIsLoadingEncryptSeed(false);
}
@ -189,19 +200,34 @@ export const Wallets = ({ setExtState, setRawWallet, rawWallet }) => {
<div>
{wallets?.length === 0 || !wallets ? (
<>
<Typography>No accounts saved</Typography>
<Typography>
{t('auth:message.generic.no_account', {
postProcess: 'capitalize',
})}
</Typography>
<Spacer height="75px" />
</>
) : (
<>
<Typography>Your saved accounts</Typography>
<Typography>
{t('auth:message.generic.your_accounts', {
postProcess: 'capitalize',
})}
</Typography>
<Spacer height="30px" />
</>
)}
{rawWallet && (
<Box>
<Typography>Selected Account:</Typography>
<Typography>
{t('auth:account.selected', {
postProcess: 'capitalize',
})}
:
</Typography>
{rawWallet?.name && <Typography>{rawWallet.name}</Typography>}
{rawWallet?.address0 && (
<Typography>{rawWallet?.address0}</Typography>
@ -211,12 +237,12 @@ export const Wallets = ({ setExtState, setRawWallet, rawWallet }) => {
{wallets?.length > 0 && (
<List
sx={{
width: '100%',
maxWidth: '500px',
maxHeight: '60vh',
overflowY: 'auto',
overflowX: 'hidden',
backgroundColor: theme.palette.background.paper,
maxHeight: '60vh',
maxWidth: '500px',
overflowX: 'hidden',
overflowY: 'auto',
width: '100%',
}}
>
{wallets?.map((wallet, idx) => {
@ -238,29 +264,27 @@ export const Wallets = ({ setExtState, setRawWallet, rawWallet }) => {
<Box
sx={{
alignItems: 'center',
bottom: wallets?.length === 0 ? 'unset' : '20px',
display: 'flex',
gap: '10px',
alignItems: 'center',
position: wallets?.length === 0 ? 'relative' : 'fixed',
bottom: wallets?.length === 0 ? 'unset' : '20px',
right: wallets?.length === 0 ? 'unset' : '20px',
}}
>
<HtmlTooltip
disableHoverListener={hasSeenGettingStarted === true}
title={
<React.Fragment>
<Fragment>
<Typography
color="inherit"
sx={{
fontSize: '16px',
}}
>
Already have a Qortal account? Enter your secret backup phrase
here to access it. This phrase is one of the ways to recover
your account.
{t('auth:tips.existing_account', { postProcess: 'capitalize' })}
</Typography>
</React.Fragment>
</Fragment>
}
>
<CustomButton
@ -270,25 +294,25 @@ export const Wallets = ({ setExtState, setRawWallet, rawWallet }) => {
display: 'inline',
}}
>
Add seed-phrase
{t('auth:action.add.seed_phrase', { postProcess: 'capitalize' })}
</CustomButton>
</HtmlTooltip>
<HtmlTooltip
disableHoverListener={hasSeenGettingStarted === true}
title={
<React.Fragment>
<Fragment>
<Typography
color="inherit"
sx={{
fontSize: '16px',
}}
>
Use this option to connect additional Qortal wallets you've
already made, in order to login with them afterwards. You will
need access to your backup JSON file in order to do so.
{t('auth:tips.additional_wallet', {
postProcess: 'capitalize',
})}
</Typography>
</React.Fragment>
</Fragment>
}
>
<CustomButton
@ -298,7 +322,9 @@ export const Wallets = ({ setExtState, setRawWallet, rawWallet }) => {
{...getRootProps()}
>
<input {...getInputProps()} />
Add account
{t('auth:action.add.account', {
postProcess: 'capitalize',
})}
</CustomButton>
</HtmlTooltip>
</Box>
@ -314,7 +340,9 @@ export const Wallets = ({ setExtState, setRawWallet, rawWallet }) => {
}}
>
<DialogTitle id="alert-dialog-title">
Type or paste in your seed-phrase
{t('auth:message.generic.type_seed', {
postProcess: 'capitalize',
})}
</DialogTitle>
<DialogContent>
@ -324,7 +352,11 @@ export const Wallets = ({ setExtState, setRawWallet, rawWallet }) => {
flexDirection: 'column',
}}
>
<Label>Name</Label>
<Label>
{t('auth:name', {
postProcess: 'capitalize',
})}
</Label>
<Input
placeholder="Name"
value={seedName}
@ -333,7 +365,11 @@ export const Wallets = ({ setExtState, setRawWallet, rawWallet }) => {
<Spacer height="7px" />
<Label>Seed-phrase</Label>
<Label>
{t('auth:seed', {
postProcess: 'capitalize',
})}
</Label>
<PasswordField
placeholder="Seed-phrase"
id="standard-adornment-password"
@ -347,7 +383,11 @@ export const Wallets = ({ setExtState, setRawWallet, rawWallet }) => {
<Spacer height="7px" />
<Label>Choose new password</Label>
<Label>
{t('auth:action.choose_password', {
postProcess: 'capitalize',
})}
</Label>
<PasswordField
id="standard-adornment-password"
value={password}
@ -359,6 +399,7 @@ export const Wallets = ({ setExtState, setRawWallet, rawWallet }) => {
/>
</Box>
</DialogContent>
<DialogActions>
<Button
disabled={isLoadingEncryptSeed}
@ -371,7 +412,9 @@ export const Wallets = ({ setExtState, setRawWallet, rawWallet }) => {
setSeedError('');
}}
>
Close
{t('core:action.close', {
postProcess: 'capitalize',
})}
</Button>
<LoadingButton
loading={isLoadingEncryptSeed}
@ -383,7 +426,9 @@ export const Wallets = ({ setExtState, setRawWallet, rawWallet }) => {
}}
autoFocus
>
Add
{t('core:action.add', {
postProcess: 'capitalize',
})}
</LoadingButton>
<Typography
sx={{
@ -404,6 +449,7 @@ const WalletItem = ({ wallet, updateWalletItem, idx, setSelectedWallet }) => {
const [note, setNote] = useState('');
const [isEdit, setIsEdit] = useState(false);
const theme = useTheme();
const { t } = useTranslation(['core', 'auth']);
useEffect(() => {
if (wallet?.name) {
@ -439,6 +485,7 @@ const WalletItem = ({ wallet, updateWalletItem, idx, setSelectedWallet }) => {
<ListItemAvatar>
<Avatar alt="" src="/static/images/avatar/1.jpg" />
</ListItemAvatar>
<ListItemText
primary={
wallet?.name
@ -468,7 +515,9 @@ const WalletItem = ({ wallet, updateWalletItem, idx, setSelectedWallet }) => {
marginTop: '5px',
}}
>
Login
{t('core:action.login', {
postProcess: 'capitalize',
})}
</Typography>
</Box>
}
@ -495,7 +544,11 @@ const WalletItem = ({ wallet, updateWalletItem, idx, setSelectedWallet }) => {
padding: '8px',
}}
>
<Label>Name</Label>
<Label>
{t('auth:name', {
postProcess: 'capitalize',
})}
</Label>
<Input
placeholder="Name"
value={name}
@ -507,7 +560,11 @@ const WalletItem = ({ wallet, updateWalletItem, idx, setSelectedWallet }) => {
<Spacer height="10px" />
<Label>Note</Label>
<Label>
{t('auth:note', {
postProcess: 'capitalize',
})}
</Label>
<Input
placeholder="Note"
value={note}
@ -535,7 +592,9 @@ const WalletItem = ({ wallet, updateWalletItem, idx, setSelectedWallet }) => {
variant="contained"
onClick={() => setIsEdit(false)}
>
Close
{t('core:action.close', {
postProcess: 'capitalize',
})}
</Button>
<Button
sx={{
@ -551,7 +610,9 @@ const WalletItem = ({ wallet, updateWalletItem, idx, setSelectedWallet }) => {
variant="contained"
onClick={() => updateWalletItem(idx, null)}
>
Remove
{t('core:action.remove', {
postProcess: 'capitalize',
})}
</Button>
<Button
sx={{
@ -574,7 +635,9 @@ const WalletItem = ({ wallet, updateWalletItem, idx, setSelectedWallet }) => {
setIsEdit(false);
}}
>
Save
{t('core:action.save', {
postProcess: 'capitalize',
})}
</Button>
</Box>
</Box>

51
src/atoms/global.ts
View File

@ -18,37 +18,36 @@ export const sortablePinnedAppsAtom = atomWithReset([
{ name: 'Q-Nodecontrol', service: 'APP' },
]);
export const canSaveSettingToQdnAtom = atomWithReset(false);
export const settingsQDNLastUpdatedAtom = atomWithReset(-100);
export const settingsLocalLastUpdatedAtom = atomWithReset(0);
export const oldPinnedAppsAtom = atomWithReset([]);
export const isUsingImportExportSettingsAtom = atomWithReset(null);
export const fullScreenAtom = atomWithReset(false);
export const hasSettingsChangedAtom = atomWithReset(false);
export const navigationControllerAtom = atomWithReset({});
export const enabledDevModeAtom = atomWithReset(false);
export const myGroupsWhereIAmAdminAtom = atomWithReset([]);
export const promotionTimeIntervalAtom = atomWithReset(0);
export const promotionsAtom = atomWithReset([]);
export const resourceDownloadControllerAtom = atomWithReset({});
export const blobControllerAtom = atomWithReset({});
export const selectedGroupIdAtom = atomWithReset(null);
export const addressInfoControllerAtom = atomWithReset({});
export const blobControllerAtom = atomWithReset({});
export const canSaveSettingToQdnAtom = atomWithReset(false);
export const enabledDevModeAtom = atomWithReset(false);
export const fullScreenAtom = atomWithReset(false);
export const groupAnnouncementsAtom = atomWithReset({});
export const groupChatTimestampsAtom = atomWithReset({});
export const groupsOwnerNamesAtom = atomWithReset({});
export const groupsPropertiesAtom = atomWithReset({});
export const hasSettingsChangedAtom = atomWithReset(false);
export const isDisabledEditorEnterAtom = atomWithReset(false);
export const qMailLastEnteredTimestampAtom = atomWithReset(null);
export const isOpenBlockedModalAtom = atomWithReset(false);
export const isRunningPublicNodeAtom = atomWithReset(false);
export const isUsingImportExportSettingsAtom = atomWithReset(null);
export const lastPaymentSeenTimestampAtom = atomWithReset(null);
export const mailsAtom = atomWithReset([]);
export const groupsPropertiesAtom = atomWithReset({});
export const groupsOwnerNamesAtom = atomWithReset({});
export const isOpenBlockedModalAtom = atomWithReset(false);
export const groupAnnouncementsAtom = atomWithReset({});
export const mutedGroupsAtom = atomWithReset([]);
export const groupChatTimestampsAtom = atomWithReset({});
export const timestampEnterDataAtom = atomWithReset({});
export const txListAtom = atomWithReset([]);
export const memberGroupsAtom = atomWithReset([]);
export const isRunningPublicNodeAtom = atomWithReset(false);
export const mutedGroupsAtom = atomWithReset([]);
export const myGroupsWhereIAmAdminAtom = atomWithReset([]);
export const navigationControllerAtom = atomWithReset({});
export const oldPinnedAppsAtom = atomWithReset([]);
export const promotionsAtom = atomWithReset([]);
export const promotionTimeIntervalAtom = atomWithReset(0);
export const qMailLastEnteredTimestampAtom = atomWithReset(null);
export const resourceDownloadControllerAtom = atomWithReset({});
export const selectedGroupIdAtom = atomWithReset(null);
export const settingsLocalLastUpdatedAtom = atomWithReset(0);
export const settingsQDNLastUpdatedAtom = atomWithReset(-100);
export const timestampEnterDataAtom = atomWithReset({});
export const txListAtom = atomWithReset([]);
// Atom Families (replacing selectorFamily)
export const resourceKeySelector = atomFamily((key) =>

3
src/components/Apps/AppInfo.tsx
View File

@ -1,4 +1,3 @@
import React, { useEffect, useMemo, useState } from 'react';
import {
AppCircle,
AppCircleContainer,
@ -172,7 +171,7 @@ export const AppInfo = ({ app, myName }) => {
}}
>
<AppDownloadButtonText>
{isSelectedAppPinned
{isSelectedAppPinned // TODO translate
? 'Unpin from dashboard'
: 'Pin to dashboard'}
</AppDownloadButtonText>

2
src/components/Apps/AppInfoSnippet.tsx
View File

@ -166,7 +166,7 @@ export const AppInfoSnippet = ({
sx={{
backgroundColor: theme.palette.background.paper,
opacity: isSelectedAppPinned ? 0.6 : 1,
}}
}} // TODO translate
>
<AppDownloadButtonText>
{' '}

1
src/components/Apps/AppPublish.tsx
View File

@ -185,6 +185,7 @@ export const AppPublish = ({ names, categories }) => {
const fee = await getFee('ARBITRARY');
await show({
// TODO translate
message: 'Would you like to publish this app?',
publishFee: fee.fee + ' QORT',
});

1
src/components/Apps/AppRating.tsx
View File

@ -106,6 +106,7 @@ export const AppRating = ({ app, myName, ratingCountPosition = 'right' }) => {
const fee = await getFee('CREATE_POLL');
await show({
// TODO translate
message: `Would you like to rate this app a rating of ${newValue}?. It will create a POLL tx.`,
publishFee: fee.fee + ' QORT',
});

2
src/components/Apps/Apps-styles.tsx
View File

@ -351,7 +351,7 @@ export const PublishQAppChoseFile = styled(ButtonBase)(({ theme }) => ({
justifyContent: 'center',
width: '120px',
'&:hover': {
backgroundColor: 'action.hover', // background on hover
backgroundColor: 'action.hover',
},
}));

20
src/components/Apps/AppsCategoryDesktop.tsx
View File

@ -16,20 +16,6 @@ import { Spacer } from '../../common/Spacer';
import { AppInfoSnippet } from './AppInfoSnippet';
import { Virtuoso } from 'react-virtuoso';
const ScrollerStyled = styled('div')({
// Hide scrollbar for WebKit browsers (Chrome, Safari)
'::-webkit-scrollbar': {
width: '0px',
height: '0px',
},
// Hide scrollbar for Firefox
scrollbarWidth: 'none',
// Hide scrollbar for IE and older Edge
msOverflowStyle: 'none',
});
const StyledVirtuosoContainer = styled('div')({
position: 'relative',
width: '100%',
@ -99,7 +85,8 @@ export const AppsCategoryDesktop = ({
}, [debouncedValue, categoryList]);
const rowRenderer = (index) => {
let app = searchedList[index];
const app = searchedList[index];
return (
<AppInfoSnippet
key={`${app?.service}-${app?.name}`}
@ -205,9 +192,6 @@ export const AppsCategoryDesktop = ({
itemContent={rowRenderer}
atBottomThreshold={50}
followOutput="smooth"
// components={{
// Scroller: ScrollerStyled, // Use the styled scroller component
// }}
/>
</StyledVirtuosoContainer>
</AppsWidthLimiter>

13
src/components/Apps/AppsDesktop.tsx
View File

@ -17,7 +17,6 @@ import { AppsCategoryDesktop } from './AppsCategoryDesktop';
import { AppsNavBarDesktop } from './AppsNavBarDesktop';
import { Box, ButtonBase, useTheme } from '@mui/material';
import { HomeIcon } from '../../assets/Icons/HomeIcon';
import { MessagingIcon } from '../../assets/Icons/MessagingIcon';
import { Save } from '../Save/Save';
import { IconWrapper } from '../Desktop/DesktopFooter';
import { enabledDevModeAtom } from '../../atoms/global';
@ -98,8 +97,6 @@ export const AppsDesktop = ({
setCategories(responseData);
} catch (error) {
console.log(error);
} finally {
// dispatch(setIsLoadingGlobal(false))
}
}, []);
@ -135,8 +132,6 @@ export const AppsDesktop = ({
setAvailableQapps(combine);
} catch (error) {
console.log(error);
} finally {
// dispatch(setIsLoadingGlobal(false))
}
}, []);
useEffect(() => {
@ -338,13 +333,13 @@ export const AppsDesktop = ({
<Box
sx={{
alignItems: 'center',
backgroundColor: theme.palette.background.surface,
borderRight: `1px solid ${theme.palette.border.subtle}`,
display: 'flex',
flexDirection: 'column',
gap: '25px',
height: '100vh',
width: '60px',
backgroundColor: theme.palette.background.surface,
borderRight: `1px solid ${theme.palette.border.subtle}`,
}}
>
<ButtonBase
@ -407,6 +402,7 @@ export const AppsDesktop = ({
/>
</IconWrapper>
</ButtonBase>
<Save isDesktop disableWidth myName={myName} />
{isEnabledDevMode && (
<ButtonBase
@ -445,10 +441,10 @@ export const AppsDesktop = ({
<Box
sx={{
display: 'flex',
width: '100%',
flexDirection: 'column',
height: '100vh',
overflow: 'auto',
width: '100%',
}}
>
<Spacer height="30px" />
@ -515,6 +511,7 @@ export const AppsDesktop = ({
}}
>
<Spacer height="30px" />
<AppsHomeDesktop
myName={myName}
availableQapps={availableQapps}

5
src/components/Apps/AppsDevMode.tsx
View File

@ -310,7 +310,9 @@ export const AppsDevMode = ({
/>
</IconWrapper>
</ButtonBase>
<Save isDesktop disableWidth myName={myName} />
<ButtonBase
onClick={() => {
setDesktopViewMode('dev');
@ -342,10 +344,10 @@ export const AppsDevMode = ({
<Box
sx={{
display: 'flex',
width: '100%',
flexDirection: 'column',
height: '100vh',
overflow: 'auto',
width: '100%',
}}
>
<Spacer height="30px" />
@ -387,6 +389,7 @@ export const AppsDevMode = ({
}}
>
<Spacer height="30px" />
<AppsDevModeHome
myName={myName}
availableQapps={availableQapps}

2
src/components/Apps/AppsDevModeHome.tsx
View File

@ -446,7 +446,7 @@ export const AppsDevModeHome = ({
display: 'flex',
flexDirection: 'column',
gap: '5px',
}}
}} // TODO translate
>
<Label>Domain</Label>
<Input

6
src/components/Apps/AppsDevModeNavBar.tsx
View File

@ -80,13 +80,13 @@ export const AppsDevModeNavBar = () => {
return (
<AppsNavBarParent
sx={{
position: 'relative',
borderRadius: '0px 30px 30px 0px',
flexDirection: 'column',
width: '59px',
height: 'unset',
maxHeight: '70vh',
borderRadius: '0px 30px 30px 0px',
padding: '10px',
position: 'relative',
width: '59px',
}}
>
<AppsNavBarLeft

2
src/components/Apps/AppsHomeDesktop.tsx
View File

@ -51,7 +51,7 @@ export const AppsHomeDesktop = ({
<AppLibrarySubTitle
sx={{
fontSize: '30px',
}}
}} // TODO translate
>
Apps Dashboard
</AppLibrarySubTitle>

2
src/components/Apps/AppsLibraryDesktop.tsx
View File

@ -273,7 +273,7 @@ export const AppsLibraryDesktop = ({
}}
onClick={() => {
executeEvent('navigateBack', {});
}}
}} // TODO translate
>
<ReturnIcon />
<ComposeP>Return to Apps Dashboard</ComposeP>

3
src/components/Apps/AppsPrivate.tsx
View File

@ -152,7 +152,6 @@ export const AppsPrivate = ({ myName }) => {
const object64 = await objectToBase64(objectToSave);
const decryptedData = await window.sendMessage(
'ENCRYPT_QORTAL_GROUP_DATA',
{
base64: object64,
groupId: selectedGroup,
@ -313,7 +312,7 @@ export const AppsPrivate = ({ myName }) => {
display: 'flex',
flexDirection: 'column',
gap: '5px',
}}
}} // TODO translate
>
<Label>Select a group</Label>
<Label>Only private groups will be shown</Label>

6
src/components/Auth/DownloadWallet.tsx
View File

@ -157,7 +157,7 @@ export const DownloadWallet = ({
fontWeight: 600,
}}
>
{t('auth:download_account', { postProcess: 'capitalize' })}
{t('auth:action.download_account', { postProcess: 'capitalize' })}
</TextP>
</Box>
@ -247,13 +247,13 @@ export const DownloadWallet = ({
onClick={async () => {
await saveFileToDiskFunc();
await showInfo({
message: t('auth:keep_secure', {
message: t('auth:message.generic.keep_secure', {
postProcess: 'capitalize',
}),
});
}}
>
{t('auth:download_account', {
{t('auth:action.download_account', {
postProcess: 'capitalize',
})}
</CustomButton>

2
src/components/Chat/AdminSpaceInner.tsx
View File

@ -15,7 +15,7 @@ import { base64ToUint8Array } from '../../qdn/encryption/group-encryption';
import { uint8ArrayToObject } from '../../backgroundFunctions/encryption';
import { formatTimestampForum } from '../../utils/time';
import { Spacer } from '../../common/Spacer';
import { GroupAvatar } from '../GroupAvatar';
import { GroupAvatar } from './GroupAvatar';
export const getPublishesFromAdminsAdminSpace = async (
admins: string[],

16
src/components/GroupAvatar.tsx → src/components/Chat/GroupAvatar.tsx
View File

@ -1,6 +1,10 @@
import { useCallback, useContext, useEffect, useState } from 'react';
import Logo2 from '../assets/svgs/Logo2.svg';
import { MyContext, getArbitraryEndpointReact, getBaseApiReact } from '../App';
import Logo2 from '../../assets/svgs/Logo2.svg';
import {
MyContext,
getArbitraryEndpointReact,
getBaseApiReact,
} from '../../App';
import {
Avatar,
Box,
@ -10,10 +14,10 @@ import {
Typography,
useTheme,
} from '@mui/material';
import { Spacer } from '../common/Spacer';
import ImageUploader from '../common/ImageUploader';
import { getFee } from '../background';
import { fileToBase64 } from '../utils/fileReading';
import { Spacer } from '../../common/Spacer';
import ImageUploader from '../../common/ImageUploader';
import { getFee } from '../../background';
import { fileToBase64 } from '../../utils/fileReading';
import { LoadingButton } from '@mui/lab';
import ErrorIcon from '@mui/icons-material/Error';

4
src/components/Group/AddGroup.tsx
View File

@ -371,7 +371,6 @@ export const AddGroup = ({ address, open, setOpen }) => {
}}
>
<Label>
{' '}
{t('group:group.type', {
postProcess: 'capitalize',
})}
@ -428,6 +427,7 @@ export const AddGroup = ({ address, open, setOpen }) => {
postProcess: 'capitalize',
})}
</Label>
<Select
labelId="demo-simple-select-label"
id="demo-simple-select"
@ -536,7 +536,7 @@ export const AddGroup = ({ address, open, setOpen }) => {
{t('core:time.hour', { count: 1 })}
</MenuItem>
<MenuItem value={180}>
3{t('core:time.hour', { count: 3 })}
{t('core:time.hour', { count: 3 })}
</MenuItem>
<MenuItem value={300}>
{t('core:time.hour', { count: 5 })}

17
src/components/Group/InviteMember.tsx
View File

@ -15,6 +15,7 @@ export const InviteMember = ({ groupId, setInfoSnack, setOpenSnack, show }) => {
const inviteMember = async () => {
try {
const fee = await getFee('GROUP_INVITE');
await show({
message: t('group:question.perform_transaction', {
action: 'GROUP_INVITE',
@ -22,7 +23,9 @@ export const InviteMember = ({ groupId, setInfoSnack, setOpenSnack, show }) => {
}),
publishFee: fee.fee + ' QORT',
});
setIsLoadingInvite(true);
if (!expiryTime || !value) return;
new Promise((res, rej) => {
window
@ -42,7 +45,6 @@ export const InviteMember = ({ groupId, setInfoSnack, setOpenSnack, show }) => {
});
setOpenSnack(true);
res(response);
setValue('');
return;
}
@ -56,7 +58,11 @@ export const InviteMember = ({ groupId, setInfoSnack, setOpenSnack, show }) => {
.catch((error) => {
setInfoSnack({
type: 'error',
message: error?.message || 'An error occurred',
message:
error?.message ||
t('core:message.error.generic', {
postProcess: 'capitalize',
}),
});
setOpenSnack(true);
rej(error);
@ -81,16 +87,21 @@ export const InviteMember = ({ groupId, setInfoSnack, setOpenSnack, show }) => {
}}
>
{t('group:action.invite_member', { postProcess: 'capitalize' })}
<Spacer height="20px" />
<Input
value={value}
placeholder="Name or address"
onChange={(e) => setValue(e.target.value)}
/>
<Spacer height="20px" />
<Label>
{t('group:invitation_expiry', { postProcess: 'capitalize' })}
</Label>
<Select
labelId="demo-simple-select-label"
id="demo-simple-select"
@ -109,7 +120,9 @@ export const InviteMember = ({ groupId, setInfoSnack, setOpenSnack, show }) => {
<MenuItem value={1296000}>{t('core:time.day', { count: 15 })}</MenuItem>
<MenuItem value={2592000}>{t('core:time.day', { count: 30 })}</MenuItem>
</Select>
<Spacer height="20px" />
<LoadingButton
variant="contained"
loadingPosition="start"

302
src/components/Group/ListOfGroupPromotions.tsx
View File

@ -34,7 +34,6 @@ import {
import { Spacer } from '../../common/Spacer';
import { CustomLoader } from '../../common/CustomLoader';
import { RequestQueueWithPromise } from '../../utils/queue/queue';
import {
myGroupsWhereIAmAdminAtom,
promotionTimeIntervalAtom,
@ -89,9 +88,7 @@ export const ListOfGroupPromotions = () => {
const [promotionTimeInterval, setPromotionTimeInterval] = useAtom(
promotionTimeIntervalAtom
);
const [isExpanded, setIsExpanded] = React.useState(false);
const [openSnack, setOpenSnack] = useState(false);
const [infoSnack, setInfoSnack] = useState(null);
const [fee, setFee] = useState(null);
@ -99,7 +96,6 @@ export const ListOfGroupPromotions = () => {
const [isLoadingPublish, setIsLoadingPublish] = useState(false);
const { show } = useContext(MyContext);
const setTxList = useSetAtom(txListAtom);
const theme = useTheme();
const { t } = useTranslation(['core', 'group']);
const listRef = useRef(null);
@ -250,8 +246,9 @@ export const ListOfGroupPromotions = () => {
});
setInfoSnack({
type: 'success',
message:
'Successfully published promotion. It may take a couple of minutes for the promotion to appear',
message: t('group:message.success.group_promotion', {
postProcess: 'capitalize',
}),
});
setOpenSnack(true);
setText('');
@ -261,7 +258,10 @@ export const ListOfGroupPromotions = () => {
setInfoSnack({
type: 'error',
message:
error?.message || 'Error publishing the promotion. Please try again',
error?.message ||
t('group:message.error.group_promotion', {
postProcess: 'capitalize',
}),
});
setOpenSnack(true);
} finally {
@ -290,8 +290,9 @@ export const ListOfGroupPromotions = () => {
if (!response?.error) {
setInfoSnack({
type: 'success',
message:
'Successfully requested to join group. It may take a couple of minutes for the changes to propagate',
message: t('group:message.success.group_join', {
postProcess: 'capitalize',
}),
});
if (isOpen) {
@ -299,8 +300,14 @@ export const ListOfGroupPromotions = () => {
{
...response,
type: 'joined-group',
label: `Joined Group ${group?.groupName}: awaiting confirmation`,
labelDone: `Joined Group ${group?.groupName}: success!`,
label: t('group:message.success.group_join_label', {
group_name: group?.groupName,
postProcess: 'capitalize',
}),
labelDone: t('group:message.success.group_join_label', {
group_name: group?.groupName,
postProcess: 'capitalize',
}),
done: false,
groupId,
},
@ -311,15 +318,20 @@ export const ListOfGroupPromotions = () => {
{
...response,
type: 'joined-group-request',
label: `Requested to join Group ${group?.groupName}: awaiting confirmation`,
labelDone: `Requested to join Group ${group?.groupName}: success!`,
label: t('group:message.success.group_join_request', {
group_name: group?.groupName,
postProcess: 'capitalize',
}),
labelDone: t('group:message.success.group_join_outcome', {
group_name: group?.groupName,
postProcess: 'capitalize',
}),
done: false,
groupId,
},
...prev,
]);
}
setOpenSnack(true);
handlePopoverClose();
res(response);
@ -336,7 +348,9 @@ export const ListOfGroupPromotions = () => {
.catch((error) => {
setInfoSnack({
type: 'error',
message: error.message || 'An error occurred',
message:
error.message ||
t('core:message.error.generic', { postProcess: 'capitalize' }),
});
setOpenSnack(true);
rej(error);
@ -385,7 +399,7 @@ export const ListOfGroupPromotions = () => {
fontSize: '1rem',
}}
>
Group promotions{' '}
{t('group:group.promotions', { postProcess: 'capitalize' })}{' '}
{promotions.length > 0 && ` (${promotions.length})`}
</Typography>
@ -444,7 +458,7 @@ export const ListOfGroupPromotions = () => {
fontSize: '12px',
}}
>
Add Promotion
{t('group.action.add_promotion', { postProcess: 'capitalize' })}
</Button>
</Box>
@ -490,7 +504,9 @@ export const ListOfGroupPromotions = () => {
color: 'rgba(255, 255, 255, 0.2)',
}}
>
Nothing to display
{t('group.message.generic.no_display', {
postProcess: 'capitalize',
})}
</Typography>
</Box>
)}
@ -537,23 +553,25 @@ export const ListOfGroupPromotions = () => {
ref={rowVirtualizer.measureElement} //measure dynamic row height
key={promotion?.identifier}
style={{
position: 'absolute',
top: 0,
left: '50%', // Move to the center horizontally
transform: `translateY(${virtualRow.start}px) translateX(-50%)`, // Adjust for centering
width: '100%', // Control width (90% of the parent)
padding: '10px 0',
display: 'flex',
alignItems: 'center',
overscrollBehavior: 'none',
display: 'flex',
flexDirection: 'column',
gap: '5px',
left: '50%', // Move to the center horizontally
overscrollBehavior: 'none',
padding: '10px 0',
position: 'absolute',
top: 0,
transform: `translateY(${virtualRow.start}px) translateX(-50%)`, // Adjust for centering
width: '100%', // Control width (90% of the parent)
}}
>
<ErrorBoundary
fallback={
<Typography>
Error loading content: Invalid Data
{t('group.message.generic.invalid_data', {
postProcess: 'capitalize',
})}
</Typography>
}
>
@ -568,7 +586,7 @@ export const ListOfGroupPromotions = () => {
<Popover
open={openPopoverIndex === promotion?.groupId}
anchorEl={popoverAnchor}
onClose={(event, reason) => {
onClose={(reason) => {
if (reason === 'backdropClick') {
// Prevent closing on backdrop click
return;
@ -603,7 +621,10 @@ export const ListOfGroupPromotions = () => {
fontWeight: 600,
}}
>
Group name: {` ${promotion?.groupName}`}
{t('group:group.name', {
postProcess: 'capitalize',
})}
: {` ${promotion?.groupName}`}
</Typography>
<Typography
@ -612,8 +633,10 @@ export const ListOfGroupPromotions = () => {
fontWeight: 600,
}}
>
Number of members:{' '}
{` ${promotion?.memberCount}`}
{t('group:group.member_number', {
postProcess: 'capitalize',
})}
: {` ${promotion?.memberCount}`}
</Typography>
{promotion?.description && (
@ -634,9 +657,9 @@ export const ListOfGroupPromotions = () => {
fontWeight: 600,
}}
>
*This is a closed/private group, so you
will need to wait until an admin accepts
your request
{t('group:message.generic.closed_group', {
postProcess: 'capitalize',
})}
</Typography>
)}
@ -657,7 +680,9 @@ export const ListOfGroupPromotions = () => {
variant="contained"
onClick={handlePopoverClose}
>
Close
{t('core:action.close', {
postProcess: 'capitalize',
})}
</LoadingButton>
<LoadingButton
@ -671,7 +696,9 @@ export const ListOfGroupPromotions = () => {
)
}
>
Join
{t('core:action.join', {
postProcess: 'capitalize',
})}
</LoadingButton>
</Box>
</Box>
@ -755,8 +782,12 @@ export const ListOfGroupPromotions = () => {
}}
>
{promotion?.isOpen
? 'Public group'
: 'Private group'}
? t('group:group.public', {
postProcess: 'capitalize',
})
: t('group:group.private', {
postProcess: 'capitalize',
})}
</Typography>
</Box>
@ -790,7 +821,10 @@ export const ListOfGroupPromotions = () => {
color: theme.palette.text.primary,
}}
>
Join Group: {` ${promotion?.groupName}`}
{t('group:action.join_group', {
postProcess: 'capitalize',
})}
: {` ${promotion?.groupName}`}
</Button>
</Box>
</Box>
@ -810,90 +844,114 @@ export const ListOfGroupPromotions = () => {
<Spacer height="20px" />
{isShowModal && (
<Dialog
open={isShowModal}
aria-labelledby="alert-dialog-title"
aria-describedby="alert-dialog-description"
>
<DialogTitle id="alert-dialog-title">
{'Promote your group to non-members'}
</DialogTitle>
<DialogContent>
<DialogContentText id="alert-dialog-description">
Only the latest promotion from the week will be shown for your
group.
</DialogContentText>
<DialogContentText id="alert-dialog-description2">
Max 200 characters. Publish Fee: {fee && fee} {' QORT'}
</DialogContentText>
<Spacer height="20px" />
<Box
sx={{
display: 'flex',
flexDirection: 'column',
gap: '5px',
}}
<Dialog
open={isShowModal}
aria-labelledby="alert-dialog-title"
aria-describedby="alert-dialog-description"
>
<DialogTitle id="alert-dialog-title">
{t('group:action.promote_group', { postProcess: 'capitalize' })}
</DialogTitle>
<DialogContent>
<DialogContentText id="alert-dialog-description">
{t('group:message.generic.latest_promotion', {
postProcess: 'capitalize',
})}
</DialogContentText>
<DialogContentText id="alert-dialog-description2">
{t('group:message.generic.max_chars', {
postProcess: 'capitalize',
})}
: {fee && fee} {' QORT'}
</DialogContentText>
<Spacer height="20px" />
<Box
sx={{
display: 'flex',
flexDirection: 'column',
gap: '5px',
}}
>
<Label>
{t('group:action.select_group', {
postProcess: 'capitalize',
})}
</Label>
<Label>
{t('group:message.generic.admin_only', {
postProcess: 'capitalize',
})}
</Label>
<Select
labelId="demo-simple-select-label"
id="demo-simple-select"
value={selectedGroup}
label="Groups where you are an admin"
onChange={(e) => setSelectedGroup(e.target.value)}
variant="outlined"
>
<Label>Select a group</Label>
<Label>Only groups where you are an admin will be shown</Label>
<Select
labelId="demo-simple-select-label"
id="demo-simple-select"
value={selectedGroup}
label="Groups where you are an admin"
onChange={(e) => setSelectedGroup(e.target.value)}
variant="outlined"
>
{myGroupsWhereIAmAdmin?.map((group) => {
return (
<MenuItem key={group?.groupId} value={group?.groupId}>
{group?.groupName}
</MenuItem>
);
})}
</Select>
</Box>
<Spacer height="20px" />
<TextField
label="Promotion text"
variant="filled"
fullWidth
value={text}
onChange={(e) => setText(e.target.value)}
inputProps={{
maxLength: 200,
}}
multiline={true}
sx={{
'& .MuiFormLabel-root': {
color: theme.palette.text.primary,
},
'& .MuiFormLabel-root.Mui-focused': {
color: theme.palette.text.primary,
},
}}
/>
</DialogContent>
<DialogActions>
<Button
disabled={isLoadingPublish}
variant="contained"
onClick={() => setIsShowModal(false)}
>
Close
</Button>
<Button
disabled={!text.trim() || !selectedGroup || isLoadingPublish}
variant="contained"
onClick={publishPromo}
autoFocus
>
Publish
</Button>
</DialogActions>
</Dialog>
)}
{myGroupsWhereIAmAdmin?.map((group) => {
return (
<MenuItem key={group?.groupId} value={group?.groupId}>
{group?.groupName}
</MenuItem>
);
})}
</Select>
</Box>
<Spacer height="20px" />
<TextField
label="Promotion text"
variant="filled"
fullWidth
value={text}
onChange={(e) => setText(e.target.value)}
inputProps={{
maxLength: 200,
}}
multiline={true}
sx={{
'& .MuiFormLabel-root': {
color: theme.palette.text.primary,
},
'& .MuiFormLabel-root.Mui-focused': {
color: theme.palette.text.primary,
},
}}
/>
</DialogContent>
<DialogActions>
<Button
disabled={isLoadingPublish}
variant="contained"
onClick={() => setIsShowModal(false)}
>
{t('core:action.close', {
postProcess: 'capitalize',
})}
</Button>
<Button
disabled={!text.trim() || !selectedGroup || isLoadingPublish}
variant="contained"
onClick={publishPromo}
autoFocus
>
{t('core:action.publish', {
postProcess: 'capitalize',
})}
</Button>
</DialogActions>
</Dialog>
<CustomizedSnackbars
open={openSnack}
setOpen={setOpenSnack}

2
src/components/Home/NewUsersCTA.tsx
View File

@ -36,7 +36,7 @@ export const NewUsersCTA = ({ balance }) => {
textAlign: 'center',
}}
>
{t('core:question.new_user', { postProcess: 'capitalize' })}
{t('core:message.question.new_user', { postProcess: 'capitalize' })}
</Typography>
<Spacer height="20px" />

283
src/components/Minting/Minting.tsx
View File

@ -21,12 +21,13 @@ import {
subscribeToEvent,
unsubscribeFromEvent,
} from '../../utils/events';
import { getFee, getNameOrAddress } from '../../background';
import { getFee } from '../../background';
import { Spacer } from '../../common/Spacer';
import { FidgetSpinner } from 'react-loader-spinner';
import { useModal } from '../../common/useModal';
import { useAtom, useSetAtom } from 'jotai';
import { memberGroupsAtom, txListAtom } from '../../atoms/global';
import { useTranslation } from 'react-i18next';
export const Minting = ({ setIsOpenMinting, myAddress, show }) => {
const setTxList = useSetAtom(txListAtom);
@ -44,7 +45,7 @@ export const Minting = ({ setIsOpenMinting, myAddress, show }) => {
const { show: showKey, message } = useModal();
const { isShow: isShowNext, onOk, show: showNext } = useModal();
const theme = useTheme();
const { t } = useTranslation(['core', 'auth', 'group']);
const [info, setInfo] = useState(null);
const [names, setNames] = useState({});
const [accountInfos, setAccountInfos] = useState({});
@ -223,13 +224,21 @@ export const Minting = ({ setIsOpenMinting, myAddress, show }) => {
rej({ message: response.error });
})
.catch((error) => {
rej({ message: error.message || 'An error occurred' });
rej({
message:
error.message ||
t('core:message.error.generic', { postProcess: 'capitalize' }),
});
});
});
} catch (error) {
setInfo({
type: 'error',
message: error?.message || 'Unable to add minting account',
message:
error?.message ||
t('core:message.error.minting_account_add', {
postProcess: 'capitalize',
}),
});
setOpenSnack(true);
} finally {
@ -263,13 +272,21 @@ export const Minting = ({ setIsOpenMinting, myAddress, show }) => {
rej({ message: response.error });
})
.catch((error) => {
rej({ message: error.message || 'An error occurred' });
rej({
message:
error.message ||
t('core:message.error.generic', { postProcess: 'capitalize' }),
});
});
});
} catch (error) {
setInfo({
type: 'error',
message: error?.message || 'Unable to remove minting account',
message:
error?.message ||
t('core:message.error.minting_account_remove', {
postProcess: 'capitalize',
}),
});
setOpenSnack(true);
} finally {
@ -278,9 +295,13 @@ export const Minting = ({ setIsOpenMinting, myAddress, show }) => {
}, []);
const createRewardShare = useCallback(async (publicKey, recipient) => {
const fee = await getFee('REWARD_SHARE'); // TODO translate
const fee = await getFee('REWARD_SHARE');
await show({
message: 'Would you like to perform an REWARD_SHARE transaction?',
message: t('group:question.perform_transaction', {
// TODO move from group into core namespace
action: 'REWARD_SHARE',
postProcess: 'capitalize',
}),
publishFee: fee.fee + ' QORT',
});
return await new Promise((res, rej) => {
@ -295,8 +316,12 @@ export const Minting = ({ setIsOpenMinting, myAddress, show }) => {
recipient,
...response,
type: 'add-rewardShare',
label: `Add rewardshare: awaiting confirmation`,
labelDone: `Add rewardshare: success!`,
label: t('group:message.success.rewardshare_add', {
postProcess: 'capitalize',
}),
labelDone: t('group:message.success.rewardshare_add_label', {
postProcess: 'capitalize',
}),
done: false,
},
...prev,
@ -307,7 +332,11 @@ export const Minting = ({ setIsOpenMinting, myAddress, show }) => {
rej({ message: response.error });
})
.catch((error) => {
rej({ message: error.message || 'An error occurred' });
rej({
message:
error.message ||
t('core:message.error.generic', { postProcess: 'capitalize' }),
});
});
});
}, []);
@ -326,7 +355,11 @@ export const Minting = ({ setIsOpenMinting, myAddress, show }) => {
rej({ message: response.error });
})
.catch((error) => {
rej({ message: error.message || 'An error occurred' });
rej({
message:
error.message ||
t('core:message.error.generic', { postProcess: 'capitalize' }),
});
});
});
}, []);
@ -350,7 +383,9 @@ export const Minting = ({ setIsOpenMinting, myAddress, show }) => {
await sleep(pollingInterval); // Wait before the next poll
}
throw new Error('Timeout waiting for reward share confirmation');
throw new Error(
t('group:message.error.timeout_reward', { postProcess: 'capitalize' })
);
};
const startMinting = async () => {
@ -382,7 +417,11 @@ export const Minting = ({ setIsOpenMinting, myAddress, show }) => {
setShowWaitDialog(false);
setInfo({
type: 'error',
message: error?.message || 'Unable to start minting',
message:
error?.message ||
t('group:message.error.unable_minting', {
postProcess: 'capitalize',
}),
});
setOpenSnack(true);
} finally {
@ -420,8 +459,12 @@ export const Minting = ({ setIsOpenMinting, myAddress, show }) => {
...rewardShare,
...response,
type: 'remove-rewardShare',
label: `Remove rewardshare: awaiting confirmation`,
labelDone: `Remove rewardshare: success!`,
label: t('group:message.success.rewardshare_remove', {
postProcess: 'capitalize',
}),
labelDone: t('group:message.success.rewardshare_remove_label', {
postProcess: 'capitalize',
}),
done: false,
},
...prev,
@ -431,59 +474,65 @@ export const Minting = ({ setIsOpenMinting, myAddress, show }) => {
rej({ message: response.error });
})
.catch((error) => {
rej({ message: error.message || 'An error occurred' });
rej({
message:
error.message ||
t('core:message.error.generic', { postProcess: 'capitalize' }),
});
});
});
}, []);
const handleRemoveRewardShare = async (rewardShare) => {
try {
setIsLoading(true);
// TODO unused functions. Remove??
const privateRewardShare = await removeRewardShare(rewardShare);
} catch (error) {
setInfo({
type: 'error',
message: error?.message || 'Unable to remove reward share',
});
setOpenSnack(true);
} finally {
setIsLoading(false);
}
};
// const handleRemoveRewardShare = async (rewardShare) => {
// try {
// setIsLoading(true);
const createRewardShareForPotentialMinter = async (receiver) => {
try {
setIsLoading(true);
const confirmReceiver = await getNameOrAddress(receiver);
if (confirmReceiver.error)
throw new Error('Invalid receiver address or name');
const isInMinterGroup = await checkIfMinterGroup(confirmReceiver);
if (!isInMinterGroup) throw new Error('Account not in Minter Group');
const publicKey = await getPublicKeyFromAddress(confirmReceiver);
const findRewardShare = rewardShares?.find(
(item) =>
item?.recipient === confirmReceiver &&
item?.mintingAccount === myAddress
);
if (findRewardShare) {
const privateRewardShare = await getRewardSharePrivateKey(publicKey);
setRewardsharekey(privateRewardShare);
} else {
await createRewardShare(publicKey, confirmReceiver);
const privateRewardShare = await getRewardSharePrivateKey(publicKey);
setRewardsharekey(privateRewardShare);
}
} catch (error) {
setInfo({
type: 'error',
message: error?.message || 'Unable to create reward share',
});
setOpenSnack(true);
} finally {
setIsLoading(false);
}
};
// const privateRewardShare = await removeRewardShare(rewardShare);
// } catch (error) {
// setInfo({
// type: 'error',
// message: error?.message || 'Unable to remove reward share',
// });
// setOpenSnack(true);
// } finally {
// setIsLoading(false);
// }
// };
// const createRewardShareForPotentialMinter = async (receiver) => {
// try {
// setIsLoading(true);
// const confirmReceiver = await getNameOrAddress(receiver);
// if (confirmReceiver.error)
// throw new Error('Invalid receiver address or name');
// const isInMinterGroup = await checkIfMinterGroup(confirmReceiver);
// if (!isInMinterGroup) throw new Error('Account not in Minter Group');
// const publicKey = await getPublicKeyFromAddress(confirmReceiver);
// const findRewardShare = rewardShares?.find(
// (item) =>
// item?.recipient === confirmReceiver &&
// item?.mintingAccount === myAddress
// );
// if (findRewardShare) {
// const privateRewardShare = await getRewardSharePrivateKey(publicKey);
// setRewardsharekey(privateRewardShare);
// } else {
// await createRewardShare(publicKey, confirmReceiver);
// const privateRewardShare = await getRewardSharePrivateKey(publicKey);
// setRewardsharekey(privateRewardShare);
// }
// } catch (error) {
// setInfo({
// type: 'error',
// message: error?.message || 'Unable to create reward share',
// });
// setOpenSnack(true);
// } finally {
// setIsLoading(false);
// }
// };
useEffect(() => {
getNodeInfos();
@ -558,7 +607,12 @@ export const Minting = ({ setIsOpenMinting, myAddress, show }) => {
},
}}
>
<DialogTitle id="alert-dialog-title">{'Manage your minting'}</DialogTitle>
<DialogTitle id="alert-dialog-title">
{t('group:message.generic.manage_minting', {
postProcess: 'capitalize',
})}
</DialogTitle>
<IconButton
sx={{
position: 'absolute',
@ -606,19 +660,37 @@ export const Minting = ({ setIsOpenMinting, myAddress, show }) => {
padding: '10px',
}}
>
<Typography>Account: {handleNames(accountInfo?.address)}</Typography>
<Typography>Level: {accountInfo?.level}</Typography>
<Typography>
blocks remaining until next level: {_levelUpBlocks()}
{t('auth:account.account_one', {
postProcess: 'capitalize',
})}
: {handleNames(accountInfo?.address)}
</Typography>
<Typography>
This node is minting: {nodeInfos?.isMintingPossible?.toString()}
{t('core:level', {
postProcess: 'capitalize',
})}
: {accountInfo?.level}
</Typography>
<Typography>
{t('group:message.generic.next_level', {
postProcess: 'capitalize',
})}{' '}
{_levelUpBlocks()}
</Typography>
<Typography>
{t('group:message.generic.node_minting', {
postProcess: 'capitalize',
})}{' '}
{nodeInfos?.isMintingPossible?.toString()}
</Typography>
</Card>
<Spacer height="10px" />
{isPartOfMintingGroup && !accountIsMinting && (
<Box
sx={{
@ -650,19 +722,29 @@ export const Minting = ({ setIsOpenMinting, myAddress, show }) => {
}}
variant="contained"
>
Start minting
{t('core:action.start_minting', {
postProcess: 'capitalize',
})}
</Button>
{mintingAccounts?.length > 1 && (
<Typography>
Only 2 minting keys are allowed per node. Please remove one if
you would like to mint with this account.
{t('group:message.generic.minting_keys_per_node', {
postProcess: 'capitalize',
})}
</Typography>
)}
</Box>
)}
<Spacer height="10px" />
{mintingAccounts?.length > 0 && (
<Typography>Node's minting accounts</Typography>
<Typography>
{t('group:message.generic.node_minting_account', {
postProcess: 'capitalize',
})}
</Typography>
)}
<Card
sx={{
@ -679,12 +761,15 @@ export const Minting = ({ setIsOpenMinting, myAddress, show }) => {
}}
>
<Typography>
You currently have a minting key for this account attached to
this node
{t('group:message.generic.node_minting_key', {
postProcess: 'capitalize',
})}
</Typography>
</Box>
)}
<Spacer height="10px" />
{mintingAccounts?.map((acct) => (
<Box
key={acct?.mintingAccount}
@ -695,8 +780,12 @@ export const Minting = ({ setIsOpenMinting, myAddress, show }) => {
}}
>
<Typography>
Minting account: {handleNames(acct?.mintingAccount)}
{t('group:message.generic.minting_account', {
postProcess: 'capitalize',
})}{' '}
{handleNames(acct?.mintingAccount)}
</Typography>
<Button
size="small"
sx={{
@ -717,7 +806,9 @@ export const Minting = ({ setIsOpenMinting, myAddress, show }) => {
}}
variant="contained"
>
Remove minting account
{t('group:action.remove_minting_account', {
postProcess: 'capitalize',
})}
</Button>
<Divider />
@ -728,13 +819,15 @@ export const Minting = ({ setIsOpenMinting, myAddress, show }) => {
{mintingAccounts?.length > 1 && (
<Typography>
Only 2 minting keys are allowed per node. Please remove one if you
would like to add a different account.
{t('group:message.generic.minting_keys_per_node_different', {
postProcess: 'capitalize',
})}
</Typography>
)}
</Card>
<Spacer height="20px" />
{!isPartOfMintingGroup && (
<Card
sx={{
@ -752,12 +845,19 @@ export const Minting = ({ setIsOpenMinting, myAddress, show }) => {
}}
>
<Typography>
You are currently not part of the MINTER group
{t('group:message.generic.minter_group', {
postProcess: 'capitalize',
})}
</Typography>
<Typography>
Visit the Q-Mintership app to apply to be a minter
{t('group:message.generic.mintership_app', {
postProcess: 'capitalize',
})}
</Typography>
<Spacer height="10px" />
<Button
size="small"
sx={{
@ -781,7 +881,9 @@ export const Minting = ({ setIsOpenMinting, myAddress, show }) => {
}}
variant="contained"
>
Visit Q-Mintership
{t('group:action.visit_q_mintership', {
postProcess: 'capitalize',
})}
</Button>
</Box>
</Card>
@ -800,13 +902,16 @@ export const Minting = ({ setIsOpenMinting, myAddress, show }) => {
<DialogContent>
{!isShowNext && (
<Typography>
Confirming creation of rewardshare on chain. Please be
patient, this could take up to 90 seconds.
{t('group:message.success.rewardshare_creation', {
postProcess: 'capitalize',
})}
</Typography>
)}
{isShowNext && (
<Typography>
Rewardshare confirmed. Please click Next.
{t('group:message.success.rewardshare_confirmed', {
postProcess: 'capitalize',
})}
</Typography>
)}
</DialogContent>
@ -818,21 +923,23 @@ export const Minting = ({ setIsOpenMinting, myAddress, show }) => {
onClick={onOk}
autoFocus
>
Next
{t('core:page.next', { postProcess: 'capitalize' })}
</Button>
</DialogActions>
</Dialog>
)}
</DialogContent>
<DialogActions>
<Button
// disabled={isLoadingPublish}
variant="contained"
onClick={() => setIsOpenMinting(false)}
>
Close
{t('core:action.close', { postProcess: 'capitalize' })}
</Button>
</DialogActions>
<Snackbar
anchorOrigin={{ vertical: 'bottom', horizontal: 'center' }}
open={openSnack}

100
src/components/RegisterName.tsx
View File

@ -25,6 +25,7 @@ import CheckIcon from '@mui/icons-material/Check';
import ErrorIcon from '@mui/icons-material/Error';
import { useSetAtom } from 'jotai';
import { txListAtom } from '../atoms/global';
import { useTranslation } from 'react-i18next';
enum Availability {
NULL = 'null',
@ -50,6 +51,7 @@ export const RegisterName = ({
);
const [nameFee, setNameFee] = useState(null);
const theme = useTheme();
const { t } = useTranslation(['core', 'auth', 'group']);
const checkIfNameExisits = async (name) => {
if (!name?.trim()) {
setIsNameAvailable(Availability.NULL);
@ -110,12 +112,24 @@ export const RegisterName = ({
const registerName = async () => {
try {
if (!userInfo?.address) throw new Error('Your address was not found');
if (!registerNameValue) throw new Error('Enter a name');
if (!userInfo?.address)
throw new Error(
t('core:message.error.address_not_found', {
postProcess: 'capitalize',
})
);
if (!registerNameValue)
throw new Error(
t('core:action.enter_name', {
postProcess: 'capitalize',
})
);
const fee = await getFee('REGISTER_NAME');
await show({
message: 'Would you like to register this name?',
message: t('group:question.register_name', {
postProcess: 'capitalize',
}),
publishFee: fee.fee + ' QORT',
});
setIsLoadingRegisterName(true);
@ -130,8 +144,9 @@ export const RegisterName = ({
setIsLoadingRegisterName(false);
setInfoSnack({
type: 'success',
message:
'Successfully registered. It may take a couple of minutes for the changes to propagate',
message: t('group:message.success.registered_name', {
postProcess: 'capitalize',
}),
});
setIsOpen(false);
setRegisterNameValue('');
@ -140,8 +155,15 @@ export const RegisterName = ({
{
...response,
type: 'register-name',
label: `Registered name: awaiting confirmation. This may take a couple minutes.`,
labelDone: `Registered name: success!`,
label: t('group:message.success.registered_name_label', {
postProcess: 'capitalize',
}),
labelDone: t(
'group:message.success.registered_name_success',
{
postProcess: 'capitalize',
}
),
done: false,
},
...prev.filter((item) => !item.done),
@ -158,7 +180,9 @@ export const RegisterName = ({
.catch((error) => {
setInfoSnack({
type: 'error',
message: error.message || 'An error occurred',
message:
error.message ||
t('core:message.error.generic', { postProcess: 'capitalize' }),
});
setOpenSnack(true);
rej(error);
@ -199,7 +223,9 @@ export const RegisterName = ({
width: '400px',
}}
>
<Label>Choose a name</Label> // TODO: translate
<Label>
{t('core:action.choose_name', { postProcess: 'capitalize' })}
</Label>
<TextField
autoComplete="off"
autoFocus
@ -210,6 +236,7 @@ export const RegisterName = ({
{(!balance || (nameFee && balance && balance < nameFee)) && (
<>
<Spacer height="10px" />
<Box
sx={{
display: 'flex',
@ -223,15 +250,20 @@ export const RegisterName = ({
}}
/>
<Typography>
Your balance is {balance ?? 0} QORT. A name registration
requires a {nameFee} QORT fee
{t('core:message.generic.name_registration', {
balance: balance ?? 0,
fee: { nameFee },
postProcess: 'capitalize',
})}
</Typography>
</Box>
<Spacer height="10px" />
</>
)}
<Spacer height="5px" />
{isNameAvailable === Availability.AVAILABLE && (
<Box
sx={{
@ -245,9 +277,15 @@ export const RegisterName = ({
color: theme.palette.text.primary,
}}
/>
<Typography>{registerNameValue} is available</Typography>
<Typography>
{t('core:message.generic.name_available', {
name: registerNameValue,
postProcess: 'capitalize',
})}
</Typography>
</Box>
)}
{isNameAvailable === Availability.NOT_AVAILABLE && (
<Box
sx={{
@ -261,9 +299,15 @@ export const RegisterName = ({
color: theme.palette.text.primary,
}}
/>
<Typography>{registerNameValue} is unavailable</Typography>
<Typography>
{t('core:message.generic.name_unavailable', {
name: registerNameValue,
postProcess: 'capitalize',
})}
</Typography>
</Box>
)}
{isNameAvailable === Availability.LOADING && (
<Box
sx={{
@ -273,17 +317,27 @@ export const RegisterName = ({
}}
>
<BarSpinner width="16px" color={theme.palette.text.primary} />
<Typography>Checking if name already existis</Typography>
<Typography>
{t('core:message.generic.name_checking', {
postProcess: 'capitalize',
})}
</Typography>
</Box>
)}
<Spacer height="25px" />
<Typography
sx={{
textDecoration: 'underline',
}}
>
Benefits of a name
{t('core:message.generic.name_benefits', {
postProcess: 'capitalize',
})}
</Typography>
<List
sx={{ width: '100%', maxWidth: 360, bgcolor: 'background.paper' }}
aria-label="contacts"
@ -296,7 +350,11 @@ export const RegisterName = ({
}}
/>
</ListItemIcon>
<ListItemText primary="Publish data to Qortal: anything from apps to videos. Fully decentralized!" />
<ListItemText
primary={t('core:message.generic.publish_data', {
postProcess: 'capitalize',
})}
/>
</ListItem>
<ListItem disablePadding>
@ -307,7 +365,11 @@ export const RegisterName = ({
}}
/>
</ListItemIcon>
<ListItemText primary="Secure ownership of data published by your name. You can even sell your name, along with your data to a third party." />
<ListItemText
primary={t('core:message.generic.secure_ownership', {
postProcess: 'capitalize',
})}
/>
</ListItem>
</List>
</Box>
@ -322,7 +384,7 @@ export const RegisterName = ({
setRegisterNameValue('');
}}
>
Close
{t('core:action.close', { postProcess: 'capitalize' })}
</Button>
<Button
@ -337,7 +399,7 @@ export const RegisterName = ({
onClick={registerName}
autoFocus
>
Register Name
{t('core:action.register_name', { postProcess: 'capitalize' })}
</Button>
</DialogActions>
</Dialog>

20
src/components/Snackbar/LoadingSnackbar.tsx
View File

@ -1,21 +1,17 @@
import * as React from 'react';
import Button from '@mui/material/Button';
import Snackbar, { SnackbarCloseReason } from '@mui/material/Snackbar';
import Snackbar from '@mui/material/Snackbar';
import Alert from '@mui/material/Alert';
export const LoadingSnackbar = ({open, info}) => {
export const LoadingSnackbar = ({ open, info }) => {
return (
<div>
<Snackbar anchorOrigin={{ vertical: 'bottom', horizontal: 'center' }} open={open}>
<Alert
severity="info"
variant="filled"
sx={{ width: '100%' }}
>
<Snackbar
anchorOrigin={{ vertical: 'bottom', horizontal: 'center' }}
open={open}
>
<Alert severity="info" variant="filled" sx={{ width: '100%' }}>
{info?.message}
</Alert>
</Snackbar>
</div>
);
}
};

1
src/components/Snackbar/Snackbar.tsx
View File

@ -1,4 +1,3 @@
import * as React from 'react';
import Snackbar, { SnackbarCloseReason } from '@mui/material/Snackbar';
import Alert from '@mui/material/Alert';

2
src/components/TaskManager/TaskManager.tsx
View File

@ -198,9 +198,11 @@ export const TaskManager = ({ getUserInfo }) => {
/>
)}
</ListItemIcon>
<ListItemText primary="Ongoing Transactions" />
{open ? <ExpandLess /> : <ExpandMore />}
</ListItemButton>
<Collapse in={open} timeout="auto" unmountOnExit>
<List component="div" disablePadding>
{txList.map((item) => (

7
src/hooks/useHandlePaymentNotification.tsx
View File

@ -7,11 +7,9 @@ import { subscribeToEvent, unsubscribeFromEvent } from '../utils/events';
import { useAtom } from 'jotai';
export const useHandlePaymentNotification = (address) => {
const [latestTx, setLatestTx] = useState(null);
const nameAddressOfSender = useRef({});
const isFetchingName = useRef({});
const [latestTx, setLatestTx] = useState(null);
const [lastEnteredTimestampPayment, setLastEnteredTimestampPayment] = useAtom(
lastPaymentSeenTimestampAtom
);
@ -63,6 +61,7 @@ export const useHandlePaymentNotification = (address) => {
const key = `last-seen-payment-${address}`;
const res = await getData<any>(key).catch(() => null);
if (res) {
setLastEnteredTimestampPayment(res);
}
@ -76,6 +75,7 @@ export const useHandlePaymentNotification = (address) => {
const latestTx = responseData.filter(
(tx) => tx?.creatorAddress !== address && tx?.recipient === address
)[0];
if (!latestTx) {
return; // continue to the next group
}
@ -128,6 +128,7 @@ export const useHandlePaymentNotification = (address) => {
);
};
}, [setLastEnteredTimestampPaymentEventFunc]);
return {
latestTx,
getNameOrAddressOfSenderMiddle,

2
src/hooks/useNameSearch.tsx
View File

@ -5,6 +5,7 @@ interface NameListItem {
name: string;
address: string;
}
export const useNameSearch = (value: string, limit = 20) => {
const [nameList, setNameList] = useState<NameListItem[]>([]);
const [isLoading, setIsLoading] = useState(false);
@ -48,6 +49,7 @@ export const useNameSearch = (value: string, limit = 20) => {
clearTimeout(handler);
};
}, [value, limit, checkIfNameExisits]);
return {
isLoading,
results: nameList,

35
src/i18n/locales/en/auth.json
View File

@ -2,7 +2,19 @@
"account": {
"your": "your account",
"account_many": "accounts",
"account_one": "account"
"account_one": "account",
"selected": "selected account"
},
"action": {
"add": {
"account": "add account",
"seed_phrase": "add seed-phrase"
},
"authenticate": "authenticate",
"create_account": "create account",
"choose_password": "choose new password",
"download_account": "download account",
"return_to_list": "return to list"
},
"advanced_users": "for advanced users",
"apikey": {
@ -13,11 +25,19 @@
"key": "API key",
"select_valid": "select a valid apikey"
},
"authenticate": "authenticate",
"build_version": "build version",
"create_account": "create account",
"download_account": "download account",
"keep_secure": "keep your account file secure",
"message": {
"error": {
"account_creation": "could not create account."
},
"generic": {
"no_account": "No accounts saved",
"keep_secure": "keep your account file secure",
"type_seed": "type or paste in your seed-phrase",
"your_accounts": "your saved accounts"
}
},
"name": "name",
"node": {
"choose": "choose custom node",
"custom_many": "custom nodes",
@ -26,11 +46,14 @@
"using": "using node",
"using_public": "using public node"
},
"note": "note",
"password": "password",
"password_confirmation": "confirm password",
"return_to_list": "return to list",
"seed": "seed phrase",
"tips": {
"additional_wallet": "use this option to connect additional Qortal wallets you've already made, in order to login with them afterwards. You will need access to your backup JSON file in order to do so.",
"digital_id": "your wallet is like your digital ID on Qortal, and is how you will login to the Qortal User Interface. It holds your public address and the Qortal name you will eventually choose. Every transaction you make is linked to your ID, and this is where you manage all your QORT and other tradeable cryptocurrencies on Qortal.",
"existing_account": "already have a Qortal account? Enter your secret backup phrase here to access it. This phrase is one of the ways to recover your account.",
"new_account": "creating an account means creating a new wallet and digital ID to start using Qortal. Once you have made your account, you can start doing things like obtaining some QORT, buying a name and avatar, publishing videos and blogs, and much more.",
"new_users": "new users start here!"
},

29
src/i18n/locales/en/core.json
View File

@ -13,13 +13,16 @@
"continue": "continue",
"continue_logout": "continue to logout",
"create_thread": "create thread",
"choose_name": "choose a name",
"decline": "decline",
"decrypt": "decrypt",
"edit": "edit",
"enter_name": "enter a name",
"export": "export",
"import": "import",
"invite": "invite",
"join": "join",
"login": "login",
"logout": "logout",
"new": {
"post": "new post",
@ -27,7 +30,12 @@
},
"notify": "notify",
"post": "post",
"post_message": "post message"
"post_message": "post message",
"publish": "publish",
"register_name": "register name",
"remove": "remove",
"save": "save",
"start_minting": "start minting"
},
"admin": "admin",
"core": {
@ -51,6 +59,7 @@
},
"general_settings": "general settings",
"last_height": "last height",
"level": "level",
"list": {
"invite": "invite list",
"join_request": "join request list",
@ -61,11 +70,26 @@
"message_us": "please message us on Telegram or Discord if you need 4 QORT to start chatting without any limitations",
"message": {
"error": {
"address_not_found": "your address was not found",
"generic": "an error occurred",
"incorrect_password": "incorrect password",
"minting_account_add": "unable to add minting account",
"minting_account_remove": "unable to remove minting account",
"missing_field": "missing: {{ field }}",
"save_qdn": "unable to save to QDN"
},
"generic": {
"name_available": "{{ name }} is available",
"name_benefits": "benefits of a name",
"name_checking": "checking if name already exists",
"name_registration": "your balance is {{ balance }} QORT. A name registration requires a {{ fee }} QORT fee",
"name_unavailable": "{{ name }} is unavailable",
"publish_data": "publish data to Qortal: anything from apps to videos. Fully decentralized!",
"secure_ownership": "secure ownership of data published by your name. You can even sell your name, along with your data to a third party."
},
"question": {
"new_user": "are you a new user?"
},
"status": {
"minting": "(minting)",
"not_minting": "(not minting)",
@ -89,9 +113,6 @@
"payment_notification": "payment notification",
"price": "price",
"q_mail": "q-mail",
"question": {
"new_user": "are you a new user?"
},
"save_options": {
"no_pinned_changes": "you currently do not have any changes to your pinned apps",
"overwrite_changes": "the app was unable to download your existing QDN-saved pinned apps. Would you like to overwrite those changes?",

42
src/i18n/locales/en/group.json
View File

@ -1,5 +1,6 @@
{
"action": {
"add_promotion": "add promotion",
"ban": "ban member from group",
"cancel_ban": "cancel ban",
"copy_private_key": "copy private key",
@ -16,9 +17,13 @@
"load_members": "load members with names",
"make_admin": "make an admin",
"manage_members": "manage members",
"promote_group": "promote your group to non-members",
"refetch_page": "refetch page",
"remove_admin": "remove as admin",
"return_to_thread": "return to threads"
"remove_minting_account": "remove minting account",
"return_to_thread": "return to threads",
"select_group": "select a group",
"visit_q_mintership": "visit Q-Mintership"
},
"advanced_options": "advanced options",
"approval_threshold": "group Approval Threshold (number / percentage of Admins that must approve a transaction)",
@ -36,6 +41,9 @@
"member_number": "number of members",
"name": "group name",
"open": "open (public)",
"private": "private group",
"promotions": "group promotions",
"public": "public group",
"type": "group type"
},
"invitation_expiry": "invitation Expiry Time",
@ -46,12 +54,26 @@
"latest_mails": "latest Q-Mails",
"message": {
"generic": {
"admin_only": "only groups where you are an admin will be shown",
"already_in_group": "you are already in this group!",
"closed_group": "this is a closed/private group, so you will need to wait until an admin accepts your request",
"descrypt_wallet": "decrypting wallet...",
"encryption_key": "the group's first common encryption key is in the process of creation. Please wait a few minutes for it to be retrieved by the network. Checking every 2 minutes...",
"group_invited_you": "{{group}} has invited you",
"invalid_data": "error loading content: Invalid Data",
"latest_promotion": "only the latest promotion from the week will be shown for your group.",
"loading_members": "loading member list with names... please wait.",
"max_chars": "max 200 characters. Publish Fee",
"manage_minting": "manage your minting",
"minter_group": "you are currently not part of the MINTER group",
"mintership_app": "visit the Q-Mintership app to apply to be a minter",
"minting_account": "minting account:",
"minting_keys_per_node": "only 2 minting keys are allowed per node. Please remove one if you would like to mint with this account.",
"minting_keys_per_node_different": "only 2 minting keys are allowed per node. Please remove one if you would like to add a different account.",
"next_level": "blocks remaining until next level:",
"node_minting": "This node is minting:",
"node_minting_account": "node's minting accounts",
"node_minting_key": "you currently have a minting key for this account attached to this node",
"no_display": "nothing to display",
"no_selection": "no group selected",
"not_part_group": "you are not part of the encrypted group of members. Wait until an admin re-encrypts the keys.",
@ -66,10 +88,13 @@
"descrypt_wallet": "error decrypting wallet {{ :errorMessage }}",
"description_required": "please provide a description",
"group_info": "cannot access group information",
"group_promotion": "error publishing the promotion. Please try again",
"group_secret_key": "cannot get group secret key",
"name_required": "please provide a name",
"notify_admins": "try notifying an admin from the list of admins below:",
"thread_id": "unable to locate thread Id"
"timeout_reward": "timeout waiting for reward share confirmation",
"thread_id": "unable to locate thread Id",
"unable_minting": "unable to start minting"
},
"success": {
"group_ban": "successfully banned member from group. It may take a couple of minutes for the changes to propagate",
@ -87,11 +112,21 @@
"group_leave_name": "left group {{group_name}}: awaiting confirmation",
"group_leave_label": "left group {{name}}: success!",
"group_member_admin": "successfully made member an admin. It may take a couple of minutes for the changes to propagate",
"group_promotion": "successfully published promotion. It may take a couple of minutes for the promotion to appear",
"group_remove_member": "successfully removed member as an admin. It may take a couple of minutes for the changes to propagate",
"invitation_cancellation": "successfully canceled invitation. It may take a couple of minutes for the changes to propagate",
"invitation_request": "accepted join request: awaiting confirmation",
"loading_threads": "loading threads... please wait.",
"post_creation": "successfully created post. It may take some time for the publish to propagate",
"registered_name": "successfully registered. It may take a couple of minutes for the changes to propagate",
"registered_name_label": "registered name: awaiting confirmation. This may take a couple minutes.",
"registered_name_success": "registered name: success!",
"rewardshare_add": "add rewardshare: awaiting confirmation",
"rewardshare_add_label": "add rewardshare: success!",
"rewardshare_creation": "confirming creation of rewardshare on chain. Please be patient, this could take up to 90 seconds.",
"rewardshare_confirmed": "rewardshare confirmed. Please click Next.",
"rewardshare_remove": "remove rewardshare: awaiting confirmation",
"rewardshare_remove_label": "remove rewardshare: success!",
"thread_creation": "successfully created thread. It may take some time for the publish to propagate",
"unbanned_user": "successfully unbanned user. It may take a couple of minutes for the changes to propagate",
"user_joined": "user successfully joined!"
@ -99,7 +134,8 @@
},
"question": {
"perform_transaction": "would you like to perform a {{action}} transaction?",
"provide_thread": "please provide a thread title"
"provide_thread": "please provide a thread title",
"register_name": "would you like to register this name?"
},
"thread_posts": "new thread posts"
}

63
src/utils/chromeStorage.ts
View File

@ -7,22 +7,25 @@ const keysToEncrypt = ['keyPair'];
async function initializeKeyAndIV() {
if (!inMemoryKey) {
inMemoryKey = await generateKey(); // Generates the key in memory
inMemoryKey = await generateKey(); // Generates the key in memory
}
}
async function generateKey(): Promise<CryptoKey> {
return await crypto.subtle.generateKey(
{
name: "AES-GCM",
length: 256
name: 'AES-GCM',
length: 256,
},
true,
["encrypt", "decrypt"]
['encrypt', 'decrypt']
);
}
async function encryptData(data: string, key: CryptoKey): Promise<{ iv: Uint8Array; encryptedData: ArrayBuffer }> {
async function encryptData(
data: string,
key: CryptoKey
): Promise<{ iv: Uint8Array; encryptedData: ArrayBuffer }> {
const encoder = new TextEncoder();
const encodedData = encoder.encode(data);
@ -31,8 +34,8 @@ async function encryptData(data: string, key: CryptoKey): Promise<{ iv: Uint8Arr
const encryptedData = await crypto.subtle.encrypt(
{
name: "AES-GCM",
iv: iv
name: 'AES-GCM',
iv: iv,
},
key,
encodedData
@ -41,11 +44,15 @@ async function encryptData(data: string, key: CryptoKey): Promise<{ iv: Uint8Arr
return { iv, encryptedData };
}
async function decryptData(encryptedData: ArrayBuffer, key: CryptoKey, iv: Uint8Array): Promise<string> {
async function decryptData(
encryptedData: ArrayBuffer,
key: CryptoKey,
iv: Uint8Array
): Promise<string> {
const decryptedData = await crypto.subtle.decrypt(
{
name: "AES-GCM",
iv: iv
name: 'AES-GCM',
iv: iv,
},
key,
encryptedData
@ -83,7 +90,10 @@ export const storeData = async (key: string, payload: any): Promise<string> => {
const { iv, encryptedData } = await encryptData(base64Data, inMemoryKey);
// Combine IV and encrypted data into a single Uint8Array
const combinedData = new Uint8Array([...iv, ...new Uint8Array(encryptedData)]);
const combinedData = new Uint8Array([
...iv,
...new Uint8Array(encryptedData),
]);
const encryptedBase64Data = btoa(String.fromCharCode(...combinedData));
await SecureStoragePlugin.set({ key, value: encryptedBase64Data });
} else {
@ -91,10 +101,9 @@ export const storeData = async (key: string, payload: any): Promise<string> => {
await SecureStoragePlugin.set({ key, value: base64Data });
}
return "Data saved successfully";
return 'Data saved successfully';
};
export const getData = async <T = any>(key: string): Promise<T | null> => {
await initializeKeyAndIV();
@ -105,13 +114,17 @@ export const getData = async <T = any>(key: string): Promise<T | null> => {
if (keysToEncrypt.includes(key) && inMemoryKey) {
// Decode the Base64-encoded encrypted data
const combinedData = atob(storedDataBase64.value)
.split("")
.split('')
.map((c) => c.charCodeAt(0));
const iv = new Uint8Array(combinedData.slice(0, 12)); // First 12 bytes are the IV
const encryptedData = new Uint8Array(combinedData.slice(12)).buffer;
const decryptedBase64Data = await decryptData(encryptedData, inMemoryKey, iv);
const decryptedBase64Data = await decryptData(
encryptedData,
inMemoryKey,
iv
);
return base64ToJson(decryptedBase64Data);
} else {
// Decode non-encrypted data
@ -121,21 +134,21 @@ export const getData = async <T = any>(key: string): Promise<T | null> => {
return null;
}
} catch (error) {
return null
return null;
}
};
// Remove keys from storage and log out
export async function removeKeysAndLogout(keys: string[], event: MessageEvent, request: any) {
export async function removeKeysAndLogout(
keys: string[],
event: MessageEvent,
request: any
) {
try {
for (const key of keys) {
try {
await SecureStoragePlugin.remove({ key });
await SecureStoragePlugin.remove({ key: `${key}_iv` }); // Remove associated IV
await SecureStoragePlugin.remove({ key: `${key}_iv` }); // Remove associated IV
} catch (error) {
console.warn(`Key not found: ${key}`);
}
@ -144,13 +157,13 @@ export async function removeKeysAndLogout(keys: string[], event: MessageEvent, r
event.source.postMessage(
{
requestId: request.requestId,
action: "logout",
action: 'logout',
payload: true,
type: "backgroundMessageResponse",
type: 'backgroundMessageResponse',
},
event.origin
);
} catch (error) {
console.error("Error removing keys:", error);
console.error('Error removing keys:', error);
}
}

50
src/utils/decode.ts
View File

@ -1,31 +1,31 @@
export function decodeIfEncoded(input) {
try {
// Check if input is URI-encoded by encoding and decoding
const encoded = encodeURIComponent(decodeURIComponent(input));
if (encoded === input) {
// Input is URI-encoded, so decode it
return decodeURIComponent(input);
}
} catch (e) {
// decodeURIComponent throws an error if input is not encoded
console.error("Error decoding URI:", e);
try {
// Check if input is URI-encoded by encoding and decoding
const encoded = encodeURIComponent(decodeURIComponent(input));
if (encoded === input) {
// Input is URI-encoded, so decode it
return decodeURIComponent(input);
}
// Return input as-is if not URI-encoded
return input;
} catch (e) {
// decodeURIComponent throws an error if input is not encoded
console.error('Error decoding URI:', e);
}
export const isValidBase64 = (str: string): boolean => {
if (typeof str !== "string" || str.length % 4 !== 0) return false;
// Return input as-is if not URI-encoded
return input;
}
const base64Regex = /^[A-Za-z0-9+/]*={0,2}$/;
return base64Regex.test(str);
};
export const isValidBase64 = (str: string): boolean => {
if (typeof str !== 'string' || str.length % 4 !== 0) return false;
export const isValidBase64WithDecode = (str: string): boolean => {
try {
return isValidBase64(str) && Boolean(atob(str));
} catch {
return false;
}
};
const base64Regex = /^[A-Za-z0-9+/]*={0,2}$/;
return base64Regex.test(str);
};
export const isValidBase64WithDecode = (str: string): boolean => {
try {
return isValidBase64(str) && Boolean(atob(str));
} catch {
return false;
}
};

75
src/utils/decryptChatMessage.ts
View File

@ -1,38 +1,59 @@
// @ts-nocheck
import Base58 from '../deps/Base58'
import ed2curve from '../deps/ed2curve'
import nacl from '../deps/nacl-fast'
import {Sha256} from 'asmcrypto.js'
import Base58 from '../deps/Base58';
import ed2curve from '../deps/ed2curve';
import nacl from '../deps/nacl-fast';
import { Sha256 } from 'asmcrypto.js';
export const decryptChatMessage = (
encryptedMessage,
privateKey,
recipientPublicKey,
lastReference
) => {
const test = encryptedMessage;
let _encryptedMessage = atob(encryptedMessage);
const binaryLength = _encryptedMessage.length;
const bytes = new Uint8Array(binaryLength);
export const decryptChatMessage = (encryptedMessage, privateKey, recipientPublicKey, lastReference) => {
const test = encryptedMessage
let _encryptedMessage = atob(encryptedMessage)
const binaryLength = _encryptedMessage.length
const bytes = new Uint8Array(binaryLength)
for (let i = 0; i < binaryLength; i++) {
bytes[i] = _encryptedMessage.charCodeAt(i);
}
for (let i = 0; i < binaryLength; i++) {
bytes[i] = _encryptedMessage.charCodeAt(i)
}
const _base58RecipientPublicKey =
recipientPublicKey instanceof Uint8Array
? Base58.encode(recipientPublicKey)
: recipientPublicKey;
const _recipientPublicKey = Base58.decode(_base58RecipientPublicKey);
const _lastReference =
lastReference instanceof Uint8Array
? lastReference
: Base58.decode(lastReference);
const _base58RecipientPublicKey = recipientPublicKey instanceof Uint8Array ? Base58.encode(recipientPublicKey) : recipientPublicKey
const _recipientPublicKey = Base58.decode(_base58RecipientPublicKey)
const convertedPrivateKey = ed2curve.convertSecretKey(privateKey);
const convertedPublicKey = ed2curve.convertPublicKey(_recipientPublicKey);
const sharedSecret = new Uint8Array(32);
nacl.lowlevel.crypto_scalarmult(
sharedSecret,
convertedPrivateKey,
convertedPublicKey
);
const _lastReference = lastReference instanceof Uint8Array ? lastReference : Base58.decode(lastReference)
const _chatEncryptionSeed = new Sha256()
.process(sharedSecret)
.finish().result;
const _decryptedMessage = nacl.secretbox.open(
bytes,
_lastReference.slice(0, 24),
_chatEncryptionSeed
);
const convertedPrivateKey = ed2curve.convertSecretKey(privateKey)
const convertedPublicKey = ed2curve.convertPublicKey(_recipientPublicKey)
const sharedSecret = new Uint8Array(32);
nacl.lowlevel.crypto_scalarmult(sharedSecret, convertedPrivateKey, convertedPublicKey)
let decryptedMessage = '';
const _chatEncryptionSeed = new Sha256().process(sharedSecret).finish().result
const _decryptedMessage = nacl.secretbox.open(bytes, _lastReference.slice(0, 24), _chatEncryptionSeed)
_decryptedMessage === false
? decryptedMessage
: (decryptedMessage = new TextDecoder('utf-8').decode(_decryptedMessage));
let decryptedMessage = ''
_decryptedMessage === false ? decryptedMessage : decryptedMessage = new TextDecoder('utf-8').decode(_decryptedMessage)
return decryptedMessage
}
return decryptedMessage;
};

55
src/utils/decryptWallet.ts
View File

@ -1,33 +1,38 @@
// @ts-nocheck
import { crypto } from '../constants/decryptWallet'
import Base58 from '../deps/Base58'
import {AES_CBC, HmacSha512} from 'asmcrypto.js'
import { doInitWorkers, kdf } from '../deps/kdf'
import { crypto } from '../constants/decryptWallet';
import Base58 from '../deps/Base58';
import { AES_CBC, HmacSha512 } from 'asmcrypto.js';
import { doInitWorkers, kdf } from '../deps/kdf';
export const decryptStoredWallet = async (password, wallet) => {
const threads = doInitWorkers(crypto.kdfThreads)
const encryptedSeedBytes = Base58.decode(wallet.encryptedSeed)
const iv = Base58.decode(wallet.iv)
const salt = Base58.decode(wallet.salt)
const threads = doInitWorkers(crypto.kdfThreads);
const encryptedSeedBytes = Base58.decode(wallet.encryptedSeed);
const iv = Base58.decode(wallet.iv);
const salt = Base58.decode(wallet.salt);
const key = await kdf(password, salt, threads)
const encryptionKey = key.slice(0, 32)
const macKey = key.slice(32, 63)
const mac = new HmacSha512(macKey).process(encryptedSeedBytes).finish().result
if (Base58.encode(mac) !== wallet.mac) {
throw new Error("Incorrect password")
}
const decryptedBytes = AES_CBC.decrypt(encryptedSeedBytes, encryptionKey, false, iv)
return decryptedBytes
}
const key = await kdf(password, salt, threads);
const encryptionKey = key.slice(0, 32);
const macKey = key.slice(32, 63);
const mac = new HmacSha512(macKey)
.process(encryptedSeedBytes)
.finish().result;
if (Base58.encode(mac) !== wallet.mac) {
throw new Error('Incorrect password');
}
const decryptedBytes = AES_CBC.decrypt(
encryptedSeedBytes,
encryptionKey,
false,
iv
);
return decryptedBytes;
};
export const decryptStoredWalletFromSeedPhrase = async (password) => {
const threads = doInitWorkers(crypto.kdfThreads)
const salt = new Uint8Array(void 0)
const threads = doInitWorkers(crypto.kdfThreads);
const salt = new Uint8Array(void 0);
const seed = await kdf(password, salt, threads)
return seed
}
const seed = await kdf(password, salt, threads);
return seed;
};

21
src/utils/events.ts
View File

@ -1,11 +1,12 @@
export const executeEvent = (eventName: string, data: any)=> {
const event = new CustomEvent(eventName, {detail: data})
document.dispatchEvent(event)
}
export const subscribeToEvent = (eventName: string, listener: any)=> {
document.addEventListener(eventName, listener)
}
export const executeEvent = (eventName: string, data: any) => {
const event = new CustomEvent(eventName, { detail: data });
document.dispatchEvent(event);
};
export const unsubscribeFromEvent = (eventName: string, listener: any)=> {
document.removeEventListener(eventName, listener)
}
export const subscribeToEvent = (eventName: string, listener: any) => {
document.addEventListener(eventName, listener);
};
export const unsubscribeFromEvent = (eventName: string, listener: any) => {
document.removeEventListener(eventName, listener);
};

46
src/utils/helpers.ts
View File

@ -1,34 +1,28 @@
import moment from "moment";
export const delay = (time: number) => new Promise((_, reject) =>
export const delay = (time: number) =>
new Promise((_, reject) =>
setTimeout(() => reject(new Error('Request timed out')), time)
);
// const originalHtml = `<p>---------- Forwarded message ---------</p><p>From: Alex</p><p>Date: Mon, Jun 9 2014 9:32 PM</p><p>Subject: Batteries </p><p>To: Jessica</p><p><br></p><p><br></p>`;
// export function updateMessageDetails(newFrom: string, newDateMillis: number, newTo: string) {
// let htmlString = originalHtml
// // Use Moment.js to format the date from milliseconds
// const formattedDate = moment(newDateMillis).format('ddd, MMM D YYYY h:mm A');
// // Replace the From, Date, and To fields in the HTML string
// htmlString = htmlString.replace(/<p>From:.*?<\/p>/, `<p>From: ${newFrom}</p>`);
// htmlString = htmlString.replace(/<p>Date:.*?<\/p>/, `<p>Date: ${formattedDate}</p>`);
// htmlString = htmlString.replace(/<p>To:.*?<\/p>/, `<p>To: ${newTo}</p>`);
// return htmlString;
// }
);
const originalHtml = `<p>---------- Forwarded message ---------</p><p>From: Alex</p><p>Subject: Batteries </p><p>To: Jessica</p><p><br></p><p><br></p>`;
export function updateMessageDetails(
newFrom: string,
newSubject: string,
newTo: string
) {
let htmlString = originalHtml;
export function updateMessageDetails(newFrom: string, newSubject: string, newTo: string) {
let htmlString = originalHtml
htmlString = htmlString.replace(
/<p>From:.*?<\/p>/,
`<p>From: ${newFrom}</p>`
);
htmlString = htmlString.replace(/<p>From:.*?<\/p>/, `<p>From: ${newFrom}</p>`);
htmlString = htmlString.replace(/<p>Subject:.*?<\/p>/, `<p>Subject: ${newSubject}</p>`);
htmlString = htmlString.replace(/<p>To:.*?<\/p>/, `<p>To: ${newTo}</p>`);
htmlString = htmlString.replace(
/<p>Subject:.*?<\/p>/,
`<p>Subject: ${newSubject}</p>`
);
return htmlString;
htmlString = htmlString.replace(/<p>To:.*?<\/p>/, `<p>To: ${newTo}</p>`);
return htmlString;
}

155
src/utils/indexedDB.ts
View File

@ -1,90 +1,107 @@
import { openIndexedDB } from "../components/Apps/useQortalMessageListener";
import { fileToBase64 } from "./fileReading";
import { openIndexedDB } from '../components/Apps/useQortalMessageListener';
import { fileToBase64 } from './fileReading';
export async function handleGetFileFromIndexedDB(event) {
try {
const { fileId, requestId } = event.data;
const db = await openIndexedDB();
const transaction = db.transaction(["files"], "readonly");
const objectStore = transaction.objectStore("files");
try {
const { fileId, requestId } = event.data;
const db = await openIndexedDB();
const transaction = db.transaction(['files'], 'readonly');
const objectStore = transaction.objectStore('files');
const getRequest = objectStore.get(fileId);
const getRequest = objectStore.get(fileId);
getRequest.onsuccess = async function (event) {
if (getRequest.result) {
const file = getRequest.result.data;
getRequest.onsuccess = async function (event) {
if (getRequest.result) {
const file = getRequest.result.data;
try {
const base64String = await fileToBase64(file);
try {
const base64String = await fileToBase64(file);
// Create a new transaction to delete the file
const deleteTransaction = db.transaction(["files"], "readwrite");
const deleteObjectStore = deleteTransaction.objectStore("files");
const deleteRequest = deleteObjectStore.delete(fileId);
// Create a new transaction to delete the file
const deleteTransaction = db.transaction(['files'], 'readwrite');
const deleteObjectStore = deleteTransaction.objectStore('files');
const deleteRequest = deleteObjectStore.delete(fileId);
deleteRequest.onsuccess = function () {
try {
const targetOrigin = window.location.origin;
deleteRequest.onsuccess = function () {
try {
const targetOrigin = window.location.origin;
window.postMessage(
{ action: "getFileFromIndexedDBResponse", requestId, result: base64String },
targetOrigin
);
} catch (error) {
console.log('error', error)
}
};
window.postMessage(
{
action: 'getFileFromIndexedDBResponse',
requestId,
result: base64String,
},
targetOrigin
);
} catch (error) {
console.log('error', error);
}
};
deleteRequest.onerror = function () {
console.error(`Error deleting file with ID ${fileId} from IndexedDB`);
};
} catch (error) {
console.error("Error converting file to Base64:", error);
event.ports[0].postMessage({
result: null,
error: "Failed to convert file to Base64",
});
const targetOrigin = window.location.origin;
window.postMessage(
{ action: "getFileFromIndexedDBResponse", requestId, result: null,
error: "Failed to convert file to Base64"
},
targetOrigin
deleteRequest.onerror = function () {
console.error(
`Error deleting file with ID ${fileId} from IndexedDB`
);
}
} else {
console.error(`File with ID ${fileId} not found in IndexedDB`);
};
} catch (error) {
console.error('Error converting file to Base64:', error);
event.ports[0].postMessage({
result: null,
error: 'Failed to convert file to Base64',
});
const targetOrigin = window.location.origin;
window.postMessage(
{ action: "getFileFromIndexedDBResponse", requestId, result: null,
error: 'File not found in IndexedDB'
},
targetOrigin
{
action: 'getFileFromIndexedDBResponse',
requestId,
result: null,
error: 'Failed to convert file to Base64',
},
targetOrigin
);
}
};
} else {
console.error(`File with ID ${fileId} not found in IndexedDB`);
const targetOrigin = window.location.origin;
getRequest.onerror = function () {
console.error(`Error retrieving file with ID ${fileId} from IndexedDB`);
event.source.postMessage(
{ action: "getFileFromIndexedDBResponse", requestId, result: null,
error: 'Error retrieving file from IndexedDB'
},
event.origin
window.postMessage(
{
action: 'getFileFromIndexedDBResponse',
requestId,
result: null,
error: 'File not found in IndexedDB',
},
targetOrigin
);
};
} catch (error) {
const { requestId } = event.data;
console.error("Error opening IndexedDB:", error);
}
};
getRequest.onerror = function () {
console.error(`Error retrieving file with ID ${fileId} from IndexedDB`);
event.source.postMessage(
{ action: "getFileFromIndexedDBResponse", requestId, result: null,
error: 'Error opening IndexedDB'
},
{
action: 'getFileFromIndexedDBResponse',
requestId,
result: null,
error: 'Error retrieving file from IndexedDB',
},
event.origin
);
}
};
} catch (error) {
const { requestId } = event.data;
console.error('Error opening IndexedDB:', error);
event.source.postMessage(
{
action: 'getFileFromIndexedDBResponse',
requestId,
result: null,
error: 'Error opening IndexedDB',
},
event.origin
);
}
}

230
src/utils/memeTypes.ts
View File

@ -1,123 +1,125 @@
export const mimeToExtensionMap = {
// Documents
"application/pdf": ".pdf",
"application/msword": ".doc",
"application/vnd.openxmlformats-officedocument.wordprocessingml.document": ".docx",
"application/vnd.ms-excel": ".xls",
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": ".xlsx",
"application/vnd.ms-powerpoint": ".ppt",
"application/vnd.openxmlformats-officedocument.presentationml.presentation": ".pptx",
"application/vnd.oasis.opendocument.text": ".odt",
"application/vnd.oasis.opendocument.spreadsheet": ".ods",
"application/vnd.oasis.opendocument.presentation": ".odp",
"text/plain": ".txt",
"text/csv": ".csv",
"application/xhtml+xml": ".xhtml",
"application/xml": ".xml",
"application/rtf": ".rtf",
"application/vnd.apple.pages": ".pages",
"application/vnd.google-apps.document": ".gdoc",
"application/vnd.google-apps.spreadsheet": ".gsheet",
"application/vnd.google-apps.presentation": ".gslides",
// Documents
'application/pdf': '.pdf',
'application/msword': '.doc',
'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
'.docx',
'application/vnd.ms-excel': '.xls',
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': '.xlsx',
'application/vnd.ms-powerpoint': '.ppt',
'application/vnd.openxmlformats-officedocument.presentationml.presentation':
'.pptx',
'application/vnd.oasis.opendocument.text': '.odt',
'application/vnd.oasis.opendocument.spreadsheet': '.ods',
'application/vnd.oasis.opendocument.presentation': '.odp',
'text/plain': '.txt',
'text/csv': '.csv',
'application/xhtml+xml': '.xhtml',
'application/xml': '.xml',
'application/rtf': '.rtf',
'application/vnd.apple.pages': '.pages',
'application/vnd.google-apps.document': '.gdoc',
'application/vnd.google-apps.spreadsheet': '.gsheet',
'application/vnd.google-apps.presentation': '.gslides',
// Images
"image/jpeg": ".jpg",
"image/png": ".png",
"image/gif": ".gif",
"image/webp": ".webp",
"image/svg+xml": ".svg",
"image/tiff": ".tif",
"image/bmp": ".bmp",
"image/x-icon": ".ico",
"image/heic": ".heic",
"image/heif": ".heif",
"image/apng": ".apng",
"image/avif": ".avif",
// Images
'image/jpeg': '.jpg',
'image/png': '.png',
'image/gif': '.gif',
'image/webp': '.webp',
'image/svg+xml': '.svg',
'image/tiff': '.tif',
'image/bmp': '.bmp',
'image/x-icon': '.ico',
'image/heic': '.heic',
'image/heif': '.heif',
'image/apng': '.apng',
'image/avif': '.avif',
// Audio
"audio/mpeg": ".mp3",
"audio/ogg": ".ogg",
"audio/wav": ".wav",
"audio/webm": ".weba",
"audio/aac": ".aac",
"audio/flac": ".flac",
"audio/x-m4a": ".m4a",
"audio/x-ms-wma": ".wma",
"audio/midi": ".midi",
"audio/x-midi": ".mid",
// Audio
'audio/mpeg': '.mp3',
'audio/ogg': '.ogg',
'audio/wav': '.wav',
'audio/webm': '.weba',
'audio/aac': '.aac',
'audio/flac': '.flac',
'audio/x-m4a': '.m4a',
'audio/x-ms-wma': '.wma',
'audio/midi': '.midi',
'audio/x-midi': '.mid',
// Video
"video/mp4": ".mp4",
"video/webm": ".webm",
"video/ogg": ".ogv",
"video/x-msvideo": ".avi",
"video/quicktime": ".mov",
"video/x-ms-wmv": ".wmv",
"video/mpeg": ".mpeg",
"video/3gpp": ".3gp",
"video/3gpp2": ".3g2",
"video/x-matroska": ".mkv",
"video/x-flv": ".flv",
"video/x-ms-asf": ".asf",
// Video
'video/mp4': '.mp4',
'video/webm': '.webm',
'video/ogg': '.ogv',
'video/x-msvideo': '.avi',
'video/quicktime': '.mov',
'video/x-ms-wmv': '.wmv',
'video/mpeg': '.mpeg',
'video/3gpp': '.3gp',
'video/3gpp2': '.3g2',
'video/x-matroska': '.mkv',
'video/x-flv': '.flv',
'video/x-ms-asf': '.asf',
// Archives
"application/zip": ".zip",
"application/x-rar-compressed": ".rar",
"application/x-tar": ".tar",
"application/x-7z-compressed": ".7z",
"application/x-gzip": ".gz",
"application/x-bzip2": ".bz2",
"application/x-apple-diskimage": ".dmg",
"application/vnd.android.package-archive": ".apk",
"application/x-iso9660-image": ".iso",
// Archives
'application/zip': '.zip',
'application/x-rar-compressed': '.rar',
'application/x-tar': '.tar',
'application/x-7z-compressed': '.7z',
'application/x-gzip': '.gz',
'application/x-bzip2': '.bz2',
'application/x-apple-diskimage': '.dmg',
'application/vnd.android.package-archive': '.apk',
'application/x-iso9660-image': '.iso',
// Code Files
"text/javascript": ".js",
"text/css": ".css",
"text/html": ".html",
"application/json": ".json",
"text/xml": ".xml",
"application/x-sh": ".sh",
"application/x-csh": ".csh",
"text/x-python": ".py",
"text/x-java-source": ".java",
"application/java-archive": ".jar",
"application/vnd.microsoft.portable-executable": ".exe",
"application/x-msdownload": ".msi",
"text/x-c": ".c",
"text/x-c++": ".cpp",
"text/x-go": ".go",
"application/x-perl": ".pl",
"text/x-php": ".php",
"text/x-ruby": ".rb",
"text/x-sql": ".sql",
"application/x-httpd-php": ".php",
"application/x-python-code": ".pyc",
// Code Files
'text/javascript': '.js',
'text/css': '.css',
'text/html': '.html',
'application/json': '.json',
'text/xml': '.xml',
'application/x-sh': '.sh',
'application/x-csh': '.csh',
'text/x-python': '.py',
'text/x-java-source': '.java',
'application/java-archive': '.jar',
'application/vnd.microsoft.portable-executable': '.exe',
'application/x-msdownload': '.msi',
'text/x-c': '.c',
'text/x-c++': '.cpp',
'text/x-go': '.go',
'application/x-perl': '.pl',
'text/x-php': '.php',
'text/x-ruby': '.rb',
'text/x-sql': '.sql',
'application/x-httpd-php': '.php',
'application/x-python-code': '.pyc',
// ROM Files
"application/x-nintendo-nes-rom": ".nes",
"application/x-snes-rom": ".smc",
"application/x-gameboy-rom": ".gb",
"application/x-gameboy-advance-rom": ".gba",
"application/x-n64-rom": ".n64",
"application/x-sega-genesis-rom": ".gen",
"application/x-sega-master-system-rom": ".sms",
"application/x-psx-rom": ".iso", // PlayStation ROMs
"application/x-bios-rom": ".rom",
"application/x-flash-rom": ".bin",
"application/x-eeprom": ".eep",
"application/x-c64-rom": ".prg",
// ROM Files
'application/x-nintendo-nes-rom': '.nes',
'application/x-snes-rom': '.smc',
'application/x-gameboy-rom': '.gb',
'application/x-gameboy-advance-rom': '.gba',
'application/x-n64-rom': '.n64',
'application/x-sega-genesis-rom': '.gen',
'application/x-sega-master-system-rom': '.sms',
'application/x-psx-rom': '.iso', // PlayStation ROMs
'application/x-bios-rom': '.rom',
'application/x-flash-rom': '.bin',
'application/x-eeprom': '.eep',
'application/x-c64-rom': '.prg',
// Miscellaneous
"application/octet-stream": ".bin", // General binary files
"application/x-shockwave-flash": ".swf",
"application/x-silverlight-app": ".xap",
"application/x-ms-shortcut": ".lnk",
"application/vnd.ms-fontobject": ".eot",
"font/woff": ".woff",
"font/woff2": ".woff2",
"font/ttf": ".ttf",
"font/otf": ".otf",
"application/vnd.visio": ".vsd",
"application/vnd.ms-project": ".mpp",
// Miscellaneous
'application/octet-stream': '.bin', // General binary files
'application/x-shockwave-flash': '.swf',
'application/x-silverlight-app': '.xap',
'application/x-ms-shortcut': '.lnk',
'application/vnd.ms-fontobject': '.eot',
'font/woff': '.woff',
'font/woff2': '.woff2',
'font/ttf': '.ttf',
'font/otf': '.otf',
'application/vnd.visio': '.vsd',
'application/vnd.ms-project': '.mpp',
};

108
src/utils/queue/queue.ts
View File

@ -1,56 +1,58 @@
export class RequestQueueWithPromise {
constructor(maxConcurrent = 5) {
this.queue = [];
this.maxConcurrent = maxConcurrent;
this.currentlyProcessing = 0;
this.isPaused = false; // Flag to track whether the queue is paused
}
// Add a request to the queue and return a promise
enqueue(request) {
return new Promise((resolve, reject) => {
// Push the request and its resolve and reject callbacks to the queue
this.queue.push({ request, resolve, reject });
this.process();
});
}
// Process requests in the queue
async process() {
// Process requests only if the queue is not paused
if (this.isPaused) return;
while (this.queue.length > 0 && this.currentlyProcessing < this.maxConcurrent) {
this.currentlyProcessing++;
const { request, resolve, reject } = this.queue.shift();
try {
const response = await request();
resolve(response);
} catch (error) {
reject(error);
} finally {
this.currentlyProcessing--;
await this.process();
}
}
}
// Pause the queue processing
pause() {
this.isPaused = true;
}
// Resume the queue processing
resume() {
this.isPaused = false;
this.process(); // Continue processing when resumed
}
// Clear pending requests in the queue
clear() {
this.queue.length = 0;
}
constructor(maxConcurrent = 5) {
this.queue = [];
this.maxConcurrent = maxConcurrent;
this.currentlyProcessing = 0;
this.isPaused = false; // Flag to track whether the queue is paused
}
// Add a request to the queue and return a promise
enqueue(request) {
return new Promise((resolve, reject) => {
// Push the request and its resolve and reject callbacks to the queue
this.queue.push({ request, resolve, reject });
this.process();
});
}
// Process requests in the queue
async process() {
// Process requests only if the queue is not paused
if (this.isPaused) return;
while (
this.queue.length > 0 &&
this.currentlyProcessing < this.maxConcurrent
) {
this.currentlyProcessing++;
const { request, resolve, reject } = this.queue.shift();
try {
const response = await request();
resolve(response);
} catch (error) {
reject(error);
} finally {
this.currentlyProcessing--;
await this.process();
}
}
}
// Pause the queue processing
pause() {
this.isPaused = true;
}
// Resume the queue processing
resume() {
this.isPaused = false;
this.process(); // Continue processing when resumed
}
// Clear pending requests in the queue
clear() {
this.queue.length = 0;
}
}

95
src/utils/time.ts
View File

@ -1,56 +1,57 @@
import moment from "moment"
import moment from 'moment';
export function formatTimestamp(timestamp: number): string {
const now = moment()
const timestampMoment = moment(timestamp)
const elapsedTime = now.diff(timestampMoment, 'minutes')
const now = moment();
const timestampMoment = moment(timestamp);
const elapsedTime = now.diff(timestampMoment, 'minutes');
if (elapsedTime < 1) {
return 'Just now'
} else if (elapsedTime < 60) {
return `${elapsedTime}m ago`
} else if (elapsedTime < 1440) {
return `${Math.floor(elapsedTime / 60)}h ago`
} else {
return timestampMoment.format('MMM D, YYYY')
}
if (elapsedTime < 1) {
return 'Just now';
} else if (elapsedTime < 60) {
return `${elapsedTime}m ago`;
} else if (elapsedTime < 1440) {
return `${Math.floor(elapsedTime / 60)}h ago`;
} else {
return timestampMoment.format('MMM D, YYYY');
}
export function formatTimestampForum(timestamp: number): string {
const now = moment();
const timestampMoment = moment(timestamp);
const elapsedTime = now.diff(timestampMoment, 'minutes');
if (elapsedTime < 1) {
return `Just now - ${timestampMoment.format('h:mm A')}`;
} else if (elapsedTime < 60) {
return `${elapsedTime}m ago - ${timestampMoment.format('h:mm A')}`;
} else if (elapsedTime < 1440) {
return `${Math.floor(elapsedTime / 60)}h ago - ${timestampMoment.format('h:mm A')}`;
} else {
return timestampMoment.format('MMM D, YYYY - h:mm A');
}
}
export const formatDate = (unixTimestamp: number): string => {
const date = moment(unixTimestamp, 'x').fromNow()
export function formatTimestampForum(timestamp: number): string {
const now = moment();
const timestampMoment = moment(timestamp);
const elapsedTime = now.diff(timestampMoment, 'minutes');
return date
if (elapsedTime < 1) {
return `Just now - ${timestampMoment.format('h:mm A')}`;
} else if (elapsedTime < 60) {
return `${elapsedTime}m ago - ${timestampMoment.format('h:mm A')}`;
} else if (elapsedTime < 1440) {
return `${Math.floor(elapsedTime / 60)}h ago - ${timestampMoment.format('h:mm A')}`;
} else {
return timestampMoment.format('MMM D, YYYY - h:mm A');
}
}
export function sortArrayByTimestampAndGroupName(array) {
return array.sort((a, b) => {
if (a.timestamp && b.timestamp) {
// Both have timestamp, sort by timestamp descending
return b.timestamp - a.timestamp;
} else if (a.timestamp) {
// Only `a` has timestamp, it comes first
return -1;
} else if (b.timestamp) {
// Only `b` has timestamp, it comes first
return 1;
} else {
// Neither has timestamp, sort alphabetically by groupName
return a.groupName.localeCompare(b.groupName);
}
});
}
export const formatDate = (unixTimestamp: number): string => {
const date = moment(unixTimestamp, 'x').fromNow();
return date;
};
export function sortArrayByTimestampAndGroupName(array) {
return array.sort((a, b) => {
if (a.timestamp && b.timestamp) {
// Both have timestamp, sort by timestamp descending
return b.timestamp - a.timestamp;
} else if (a.timestamp) {
// Only `a` has timestamp, it comes first
return -1;
} else if (b.timestamp) {
// Only `b` has timestamp, it comes first
return 1;
} else {
// Neither has timestamp, sort alphabetically by groupName
return a.groupName.localeCompare(b.groupName);
}
});
}

102
src/utils/utils.ts
View File

@ -1,55 +1,55 @@
// @ts-nocheck
const utils = {
int32ToBytes (word) {
var byteArray = []
for (var b = 0; b < 32; b += 8) {
byteArray.push((word >>> (24 - b % 32)) & 0xFF)
}
return byteArray
},
stringtoUTF8Array (message) {
if (typeof message === 'string') {
var s = unescape(encodeURIComponent(message)) // UTF-8
message = new Uint8Array(s.length)
for (var i = 0; i < s.length; i++) {
message[i] = s.charCodeAt(i) & 0xff
}
}
return message
},
// ...buffers then buffers.foreach and append to buffer1
appendBuffer (buffer1, buffer2) {
buffer1 = new Uint8Array(buffer1)
buffer2 = new Uint8Array(buffer2)
const tmp = new Uint8Array(buffer1.byteLength + buffer2.byteLength)
tmp.set(buffer1, 0)
tmp.set(buffer2, buffer1.byteLength)
return tmp
},
int64ToBytes (int64) {
// we want to represent the input as a 8-bytes array
var byteArray = [0, 0, 0, 0, 0, 0, 0, 0]
for (var index = 0; index < byteArray.length; index++) {
var byte = int64 & 0xff
byteArray[byteArray.length - index - 1] = byte
int64 = (int64 - byte) / 256
}
return byteArray
},
equal (buf1, buf2) {
if (buf1.byteLength != buf2.byteLength) return false
var dv1 = new Uint8Array(buf1)
var dv2 = new Uint8Array(buf2)
for (var i = 0; i != buf1.byteLength; i++) {
if (dv1[i] != dv2[i]) return false
}
return true
int32ToBytes(word) {
var byteArray = [];
for (var b = 0; b < 32; b += 8) {
byteArray.push((word >>> (24 - (b % 32))) & 0xff);
}
}
return byteArray;
},
export default utils
stringtoUTF8Array(message) {
if (typeof message === 'string') {
var s = unescape(encodeURIComponent(message)); // UTF-8
message = new Uint8Array(s.length);
for (var i = 0; i < s.length; i++) {
message[i] = s.charCodeAt(i) & 0xff;
}
}
return message;
},
// ...buffers then buffers.foreach and append to buffer1
appendBuffer(buffer1, buffer2) {
buffer1 = new Uint8Array(buffer1);
buffer2 = new Uint8Array(buffer2);
const tmp = new Uint8Array(buffer1.byteLength + buffer2.byteLength);
tmp.set(buffer1, 0);
tmp.set(buffer2, buffer1.byteLength);
return tmp;
},
int64ToBytes(int64) {
// we want to represent the input as a 8-bytes array
var byteArray = [0, 0, 0, 0, 0, 0, 0, 0];
for (var index = 0; index < byteArray.length; index++) {
var byte = int64 & 0xff;
byteArray[byteArray.length - index - 1] = byte;
int64 = (int64 - byte) / 256;
}
return byteArray;
},
equal(buf1, buf2) {
if (buf1.byteLength != buf2.byteLength) return false;
var dv1 = new Uint8Array(buf1);
var dv2 = new Uint8Array(buf2);
for (var i = 0; i != buf1.byteLength; i++) {
if (dv1[i] != dv2[i]) return false;
}
return true;
},
};
export default utils;

29
src/utils/validateAddress.ts
View File

@ -1,21 +1,20 @@
// @ts-nocheck
import Base58 from "../deps/Base58"
import Base58 from '../deps/Base58';
export const validateAddress = (address) => {
let isAddress = false
try {
const decodePubKey = Base58.decode(address)
let isAddress = false;
try {
const decodePubKey = Base58.decode(address);
if (!(decodePubKey instanceof Uint8Array && decodePubKey.length == 25)) {
isAddress = false
} else {
isAddress = true
}
if (!(decodePubKey instanceof Uint8Array && decodePubKey.length == 25)) {
isAddress = false;
} else {
isAddress = true;
}
} catch (error) {
console.log(error);
}
} catch (error) {
}
return isAddress
}
return isAddress;
};