diff --git a/docs/i18n_languages.md b/docs/i18n_languages.md
index 9fcf779..da5a64b 100644
--- a/docs/i18n_languages.md
+++ b/docs/i18n_languages.md
@@ -1,10 +1,25 @@
 # I18N Guidelines
 
-In JSON file:
+[react-i18next](https://react.i18next.com/) is the framework used for internationalization.
+
+## Locales
+
+Locales are in folder `./src/i18n/locales`, one folder per language.
+
+A single JSON file represents a namespace (group of translation).
+It's a key/value structure.
+
+Please:
 
 - Keep the file sorted
-- Always write in lowercase
+- First letter of each value is lowercase
 
-In GUI:
+Translation in GUI:
 
-- If the first letter of the translation must be uppercase, use the postProcess, for example: `{t_auth('advanced_users', { postProcess: 'capitalizeFirst' })}`
+- If the first letter of the translation must be uppercase, use the postProcess, for example: `t('core:advanced_users', { postProcess: 'capitalizeFirst' })`
+- For all translation in uppercase `{ postProcess: 'capitalizeAll' }`
+- See `.src/i18n/i18n.ts` for processor definition
+
+## Missing language?
+
+- Please open an issue on the project's github repository and specify the missing language
diff --git a/src/App.tsx b/src/App.tsx
index e5f9cc0..3f7dcca 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -44,8 +44,6 @@ import {
   saveFileToDisk,
   saveSeedPhraseToDisk,
 } from './utils/generateWallet/generateWallet';
-import { kdf } from './deps/kdf';
-import { generateSaveWalletData } from './utils/generateWallet/storeWallet';
 import { crypto, walletVersion } from './constants/decryptWallet';
 import PhraseWallet from './utils/generateWallet/phrase-wallet';
 import {
@@ -138,7 +136,7 @@ import { QortPayment } from './components/QortPayment';
 import { GeneralNotifications } from './components/GeneralNotifications';
 import { PdfViewer } from './common/PdfViewer';
 import ThemeSelector from './components/Theme/ThemeSelector.tsx';
-import { useTranslation } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
 import LanguageSelector from './components/Language/LanguageSelector.tsx';
 import { DownloadWallet } from './components/Auth/DownloadWallet.tsx';
 import { CopyIcon } from './assets/Icons/CopyIcon.tsx';
@@ -147,21 +145,21 @@ import { useAtom, useSetAtom } from 'jotai';
 import { useResetAtom } from 'jotai/utils';
 
 type extStates =
-  | 'not-authenticated'
   | 'authenticated'
-  | 'send-qort'
-  | 'web-app-request-connection'
-  | 'web-app-request-payment'
-  | 'web-app-request-authentication'
-  | 'download-wallet'
+  | 'buy-order-submitted'
   | 'create-wallet'
+  | 'download-wallet'
+  | 'group'
+  | 'not-authenticated'
+  | 'send-qort'
   | 'transfer-success-regular'
   | 'transfer-success-request'
   | 'wallet-dropped'
-  | 'web-app-request-buy-order'
-  | 'buy-order-submitted'
   | 'wallets'
-  | 'group';
+  | 'web-app-request-authentication'
+  | 'web-app-request-buy-order'
+  | 'web-app-request-connection'
+  | 'web-app-request-payment';
 
 interface MyContextInterface {
   isShow: boolean;
@@ -277,6 +275,7 @@ export const getBaseApiReactSocket = (customApi?: string) => {
 };
 
 export const isMainWindow = true;
+
 function App() {
   const [extState, setExtstate] = useState<extStates>('not-authenticated');
   const [desktopViewMode, setDesktopViewMode] = useState('home');
@@ -308,18 +307,22 @@ function App() {
   const [isLoading, setIsLoading] = useState<boolean>(false);
   const [isLoadingSendCoin, setIsLoadingSendCoin] = useState<boolean>(false);
 
-  const { t } = useTranslation(['auth', 'core']);
+  const { t } = useTranslation(['auth', 'core', 'group']);
   const theme = useTheme();
 
   const [
     walletToBeDownloadedPasswordConfirm,
     setWalletToBeDownloadedPasswordConfirm,
   ] = useState<string>('');
+
   const [walletToBeDownloadedError, setWalletToBeDownloadedError] =
     useState<string>('');
+
   const [walletToBeDecryptedError, setWalletToBeDecryptedError] =
     useState<string>('');
+
   const [isFocused, setIsFocused] = useState(true);
+
   const [hasSettingsChanged, setHasSettingsChanged] = useAtom(
     hasSettingsChangedAtom
   );
@@ -328,6 +331,7 @@ function App() {
   const downloadResource = useFetchResources();
   const holdRefExtState = useRef<extStates>('not-authenticated');
   const isFocusedRef = useRef<boolean>(true);
+
   const {
     showTutorial,
     openTutorialModal,
@@ -335,7 +339,9 @@ function App() {
     setOpenTutorialModal,
     hasSeenGettingStarted,
   } = useHandleTutorials();
+
   const { isShow, onCancel, onOk, show, message } = useModal();
+
   const {
     isShow: isShowUnsavedChanges,
     onCancel: onCancelUnsavedChanges,
@@ -343,6 +349,7 @@ function App() {
     show: showUnsavedChanges,
     message: messageUnsavedChanges,
   } = useModal();
+
   const {
     isShow: isShowInfo,
     onCancel: onCancelInfo,
@@ -358,6 +365,7 @@ function App() {
     isShow: isShowQortalRequest,
     message: messageQortalRequest,
   } = useModal();
+
   const {
     onCancel: onCancelQortalRequestExtension,
     onOk: onOkQortalRequestExtension,
@@ -365,6 +373,7 @@ function App() {
     isShow: isShowQortalRequestExtension,
     message: messageQortalRequestExtension,
   } = useModal();
+
   const setIsRunningPublicNode = useSetAtom(isRunningPublicNodeAtom);
 
   const [infoSnack, setInfoSnack] = useState(null);
@@ -375,15 +384,18 @@ function App() {
   const [apiKey, setApiKey] = useState('');
   const [isOpenSendQort, setIsOpenSendQort] = useState(false);
   const [isOpenSendQortSuccess, setIsOpenSendQortSuccess] = useState(false);
+
   const {
     isUserBlocked,
     addToBlockList,
     removeBlockFromList,
     getAllBlockedUsers,
   } = useBlockedAddresses();
+
   const [currentNode, setCurrentNode] = useState({
     url: 'http://127.0.0.1:12391',
   });
+
   const [useLocalNode, setUseLocalNode] = useState(false);
 
   const [confirmRequestRead, setConfirmRequestRead] = useState(false);
@@ -662,10 +674,15 @@ function App() {
           'kdfThreads',
         ];
         for (const field of requiredFields) {
-          if (!(field in pf)) throw new Error(field + ' not found in JSON');
+          if (!(field in pf))
+            throw new Error(
+              t('auth:message.error.field_not_found_json', {
+                field: field,
+                postProcess: 'capitalizeFirst',
+              })
+            );
         }
         setRawWallet(pf);
-        // setExtstate("authenticated");
         setExtstate('wallet-dropped');
         setdecryptedWallet(null);
       } catch (e) {
@@ -958,25 +975,39 @@ function App() {
   const createAccountFunc = async () => {
     try {
       if (!walletToBeDownloadedPassword) {
-        setWalletToBeDownloadedError('Please enter a password');
+        setWalletToBeDownloadedError(
+          t('core:message.generic.password_enter', {
+            postProcess: 'capitalizeFirst',
+          })
+        );
         return;
       }
       if (!walletToBeDownloadedPasswordConfirm) {
-        setWalletToBeDownloadedError('Please confirm your password');
+        setWalletToBeDownloadedError(
+          t('core:message.generic.password_confirm', {
+            postProcess: 'capitalizeFirst',
+          })
+        );
         return;
       }
       if (
         walletToBeDownloadedPasswordConfirm !== walletToBeDownloadedPassword
       ) {
-        setWalletToBeDownloadedError('Password fields do not match!');
+        setWalletToBeDownloadedError(
+          t('core:message.error.password_not_matching', {
+            postProcess: 'capitalizeFirst',
+          })
+        );
         return;
       }
       setIsLoading(true);
+
       await new Promise<void>((res) => {
         setTimeout(() => {
           res();
         }, 250);
       });
+
       const res = await createAccount(generatorRef.current.parsedString);
       const wallet = await res.generateSaveWalletData(
         walletToBeDownloadedPassword,
@@ -1030,7 +1061,9 @@ function App() {
     try {
       if (extState === 'authenticated') {
         await showUnsavedChanges({
-          message: 'Are you sure you would like to logout?',
+          message: t('core:message.question.logout', {
+            postProcess: 'capitalizeFirst',
+          }),
         });
       }
       window
@@ -1090,7 +1123,6 @@ function App() {
     setWalletToBeDownloadedPassword('');
     setShowSeed(false);
     setCreationStep(1);
-
     setWalletToBeDownloadedPasswordConfirm('');
     setWalletToBeDownloadedError('');
     setSendqortState(null);
@@ -1165,7 +1197,11 @@ function App() {
           console.error('Failed to decrypt wallet:', error);
         });
     } catch (error) {
-      setWalletToBeDecryptedError('Unable to authenticate. Wrong password');
+      setWalletToBeDecryptedError(
+        t('core:message.error.password_wrong', {
+          postProcess: 'capitalizeFirst',
+        })
+      );
     }
   };
 
@@ -1241,24 +1277,25 @@ function App() {
     return (
       <AuthenticatedContainerInnerLeft
         sx={{
+          minWidth: '225px',
           overflowY: 'auto',
           padding: '0px 20px',
-          minWidth: '225px',
         }}
       >
         <Spacer height="20px" />
+
         <Box
           sx={{
-            width: '100%',
             display: 'flex',
             justifyContent: 'flex-start',
+            width: '100%',
           }}
         >
           {authenticatedMode === 'qort' && (
             <Tooltip
               title={
                 <span style={{ fontSize: '14px', fontWeight: 700 }}>
-                  LITECOIN WALLET
+                  {t('core:wallet.litecoin', { postProcess: 'capitalizeAll' })}
                 </span>
               }
               placement="left"
@@ -1285,8 +1322,8 @@ function App() {
                 src={ltcLogo}
                 style={{
                   cursor: 'pointer',
-                  width: '20px',
                   height: 'auto',
+                  width: '20px',
                 }}
               />
             </Tooltip>
@@ -1295,7 +1332,7 @@ function App() {
             <Tooltip
               title={
                 <span style={{ fontSize: '14px', fontWeight: 700 }}>
-                  QORTAL WALLET
+                  {t('core:wallet.qortal', { postProcess: 'capitalizeAll' })}
                 </span>
               }
               placement="left"
@@ -1364,9 +1401,9 @@ function App() {
             {!isNaN(+ltcBalance) && !ltcBalanceLoading && (
               <Box
                 sx={{
-                  gap: '10px',
-                  display: 'flex',
                   alignItems: 'center',
+                  display: 'flex',
+                  gap: '10px',
                 }}
               >
                 <TextP
@@ -1404,9 +1441,9 @@ function App() {
 
             <TextP
               sx={{
-                textAlign: 'center',
-                lineHeight: '24px',
                 fontSize: '20px',
+                lineHeight: '24px',
+                textAlign: 'center',
               }}
             >
               {userInfo?.name}
@@ -1433,15 +1470,17 @@ function App() {
             </ButtonBase>
 
             <Spacer height="10px" />
+
             {qortBalanceLoading && (
               <CircularProgress color="success" size={16} />
             )}
+
             {!qortBalanceLoading && balance >= 0 && (
               <Box
                 sx={{
-                  gap: '10px',
-                  display: 'flex',
                   alignItems: 'center',
+                  display: 'flex',
+                  gap: '10px',
                 }}
               >
                 <TextP
@@ -1454,6 +1493,7 @@ function App() {
                 >
                   {balance?.toFixed(2)} QORT
                 </TextP>
+
                 <RefreshIcon
                   onClick={getBalanceFunc}
                   sx={{
@@ -1481,22 +1521,28 @@ function App() {
                   executeEvent('openRegisterName', {});
                 }}
               >
-                REGISTER NAME
+                {t('core:action.register_name', {
+                  postProcess: 'capitalizeAll',
+                })}
               </TextP>
             )}
+
             <Spacer height="20px" />
+
             <CustomButton
               onClick={() => {
                 setIsOpenSendQort(true);
-                // setExtstate("send-qort");
                 setIsOpenDrawerProfile(false);
               }}
             >
-              Transfer QORT
+              {t('core:action.transfer_qort', {
+                postProcess: 'capitalizeFirst',
+              })}
             </CustomButton>
             <AddressQRCode targetAddress={rawWallet?.address0} />
           </>
         )}
+
         <TextP
           sx={{
             cursor: 'pointer',
@@ -1514,7 +1560,7 @@ function App() {
             executeEvent('open-apps-mode', {});
           }}
         >
-          Get QORT at Q-Trade
+          {t('core:action.get_qort', { postProcess: 'capitalizeFirst' })}
         </TextP>
       </AuthenticatedContainerInnerLeft>
     );
@@ -1536,9 +1582,9 @@ function App() {
 
         <AuthenticatedContainerInnerRight
           sx={{
+            borderLeft: `1px solid ${theme.palette.border.subtle}`,
             height: '100%',
             justifyContent: 'space-between',
-            borderLeft: `1px solid ${theme.palette.border.subtle}`,
           }}
         >
           <Box
@@ -1807,7 +1853,9 @@ function App() {
                   const res = await isRunningGateway();
                   if (res)
                     throw new Error(
-                      'Cannot view minting details on the gateway'
+                      t('core:message.generic.no_minting_details', {
+                        postProcess: 'capitalizeFirst',
+                      })
                     );
                   setIsOpenMinting(true);
                 } catch (error) {
@@ -1964,26 +2012,24 @@ function App() {
       }}
     >
       <PdfViewer />
+
       <MyContext.Provider value={contextValue}>
         <Tutorials />
         {extState === 'not-authenticated' && (
           <NotAuthenticated
-            getRootProps={getRootProps}
-            getInputProps={getInputProps}
-            setExtstate={setExtstate}
             apiKey={apiKey}
-            globalApiKey={globalApiKey}
-            setApiKey={setApiKey}
-            handleSetGlobalApikey={handleSetGlobalApikey}
             currentNode={currentNode}
+            getInputProps={getInputProps}
+            getRootProps={getRootProps}
+            globalApiKey={globalApiKey}
+            handleSetGlobalApikey={handleSetGlobalApikey}
+            setApiKey={setApiKey}
             setCurrentNode={setCurrentNode}
+            setExtstate={setExtstate}
             setUseLocalNode={setUseLocalNode}
             useLocalNode={useLocalNode}
           />
         )}
-        {/* {extState !== "not-authenticated" && (
-        <button onClick={logoutFunc}>logout</button>
-      )} */}
         {extState === 'authenticated' && isMainWindow && (
           <Box
             sx={{
@@ -2008,6 +2054,7 @@ function App() {
             {renderProfile()}
           </Box>
         )}
+
         {isOpenSendQort && isMainWindow && (
           <Box
             sx={{
@@ -2022,6 +2069,7 @@ function App() {
             }}
           >
             <Spacer height="22px" />
+
             <Box
               sx={{
                 boxSizing: 'border-box',
@@ -2055,6 +2103,7 @@ function App() {
             />
           </Box>
         )}
+
         {isShowQortalRequest && !isMainWindow && (
           <>
             <Spacer height="120px" />
@@ -2081,6 +2130,7 @@ function App() {
             {messageQortalRequest?.text2 && (
               <>
                 <Spacer height="10px" />
+
                 <Box
                   sx={{
                     display: 'flex',
@@ -2098,9 +2148,11 @@ function App() {
                     {messageQortalRequest?.text2}
                   </TextP>
                 </Box>
+
                 <Spacer height="15px" />
               </>
             )}
+
             {messageQortalRequest?.text3 && (
               <>
                 <Box
@@ -2177,22 +2229,25 @@ function App() {
                     maxWidth: '90%',
                   }}
                 >
-                  {'Fee: '}
-                  {messageQortalRequest?.fee}
-                  {' QORT'}
+                  {t('core:message.generic.fee_qort', {
+                    message: messageQortalRequest?.fee,
+                    postProcess: 'capitalizeFirst',
+                  })}
                 </TextP>
+
                 <Spacer height="15px" />
               </>
             )}
+
             {messageQortalRequest?.checkbox1 && (
               <Box
                 sx={{
+                  alignItems: 'center',
                   display: 'flex',
                   gap: '10px',
-                  alignItems: 'center',
                   justifyContent: 'center',
-                  width: '90%',
                   marginTop: '20px',
+                  width: '90%',
                 }}
               >
                 <Checkbox
@@ -2237,7 +2292,7 @@ function App() {
                 }}
                 onClick={() => onOkQortalRequest('accepted')}
               >
-                accept
+                {t('core:action.accept', { postProcess: 'capitalizeFirst' })}
               </CustomButton>
               <CustomButton
                 sx={{
@@ -2245,12 +2300,14 @@ function App() {
                 }}
                 onClick={() => onCancelQortalRequest()}
               >
-                decline
+                {t('core:action.decline', { postProcess: 'capitalizeFirst' })}
               </CustomButton>
             </Box>
+
             <ErrorText>{sendPaymentError}</ErrorText>
           </>
         )}
+
         {extState === 'web-app-request-buy-order' && !isMainWindow && (
           <>
             <Spacer height="100px" />
@@ -2261,22 +2318,34 @@ function App() {
                 lineHeight: '15px',
               }}
             >
-              The Application <br></br>{' '}
-              <TextItalic>{requestBuyOrder?.hostname}</TextItalic> <br></br>
-              <TextSpan>
-                is requesting {requestBuyOrder?.crosschainAtInfo?.length}{' '}
-                {`buy order${
-                  requestBuyOrder?.crosschainAtInfo.length === 1 ? '' : 's'
-                }`}
-              </TextSpan>
+              <Trans
+                i18nKey="message.generic.buy_order_request"
+                ns="core"
+                components={{
+                  br: <br />,
+                  italic: <TextItalic />,
+                  span: <TextSpan />,
+                }}
+                values={{
+                  hostname: requestBuyOrder?.hostname,
+                  count: requestBuyOrder?.crosschainAtInfo?.length || 0,
+                }}
+                tOptions={{ postProcess: ['capitalizeFirst'] }}
+              >
+                The Application <br />
+                <italic>{{ hostname }}</italic> <br />
+                <span>is requesting {{ count }} buy order</span>
+              </Trans>
             </TextP>
+
             <Spacer height="10px" />
+
             <TextP
               sx={{
-                textAlign: 'center',
-                lineHeight: '24px',
                 fontSize: '20px',
                 fontWeight: 700,
+                lineHeight: '24px',
+                textAlign: 'center',
               }}
             >
               {requestBuyOrder?.crosschainAtInfo?.reduce((latest, cur) => {
@@ -2284,7 +2353,9 @@ function App() {
               }, 0)}{' '}
               QORT
             </TextP>
+
             <Spacer height="15px" />
+
             <TextP
               sx={{
                 textAlign: 'center',
@@ -2292,9 +2363,11 @@ function App() {
                 fontSize: '14px',
               }}
             >
-              FOR
+              {t('core:for', { postProcess: 'capitalizeAll' })}
             </TextP>
+
             <Spacer height="15px" />
+
             <TextP
               sx={{
                 textAlign: 'center',
@@ -2312,6 +2385,7 @@ function App() {
             </TextP>
 
             <Spacer height="29px" />
+
             <Box
               sx={{
                 display: 'flex',
@@ -2325,17 +2399,19 @@ function App() {
                 }}
                 onClick={() => confirmBuyOrder(false)}
               >
-                accept
+                {t('core:action.accept', { postProcess: 'capitalizeFirst' })}
               </CustomButton>
+
               <CustomButton
                 sx={{
                   minWidth: '102px',
                 }}
                 onClick={() => confirmBuyOrder(true)}
               >
-                decline
+                {t('core:action.decline', { postProcess: 'capitalizeFirst' })}
               </CustomButton>
             </Box>
+
             <ErrorText>{sendPaymentError}</ErrorText>
           </>
         )}
@@ -2349,11 +2425,28 @@ function App() {
                 lineHeight: '15px',
               }}
             >
-              The Application <br></br>{' '}
-              <TextItalic>{sendqortState?.hostname}</TextItalic> <br></br>
-              <TextSpan>is requesting a payment</TextSpan>
+              <Trans
+                i18nKey="message.generic.payment_request"
+                ns="core"
+                components={{
+                  br: <br />,
+                  italic: <TextItalic />,
+                  span: <TextSpan />,
+                }}
+                values={{
+                  hostname: requestBuyOrder?.hostname,
+                  count: requestBuyOrder?.crosschainAtInfo?.length || 0,
+                }}
+                tOptions={{ postProcess: ['capitalizeFirst'] }}
+              >
+                The Application <br />
+                <italic>{{ hostname }}</italic> <br />
+                <span>is requesting {{ count }} a payment</span>
+              </Trans>
             </TextP>
+
             <Spacer height="10px" />
+
             <TextP
               sx={{
                 textAlign: 'center',
@@ -2363,7 +2456,9 @@ function App() {
             >
               {sendqortState?.description}
             </TextP>
+
             <Spacer height="15px" />
+
             <TextP
               sx={{
                 textAlign: 'center',
@@ -2376,6 +2471,7 @@ function App() {
             </TextP>
 
             <Spacer height="29px" />
+
             <Box
               sx={{
                 display: 'flex',
@@ -2389,23 +2485,27 @@ function App() {
                 }}
                 onClick={() => confirmPayment(false)}
               >
-                accept
+                {t('core:action.accept', { postProcess: 'capitalizeFirst' })}
               </CustomButton>
+
               <CustomButton
                 sx={{
                   minWidth: '102px',
                 }}
                 onClick={() => confirmPayment(true)}
               >
-                decline
+                {t('core:action.decline', { postProcess: 'capitalizeFirst' })}
               </CustomButton>
             </Box>
+
             <ErrorText>{sendPaymentError}</ErrorText>
           </>
         )}
+
         {extState === 'web-app-request-connection' && !isMainWindow && (
           <>
             <Spacer height="48px" />
+
             <div
               className="image-container"
               style={{
@@ -2415,7 +2515,9 @@ function App() {
             >
               <img src={Logo1Dark} className="base-image" />
             </div>
+
             <Spacer height="38px" />
+
             <TextP
               sx={{
                 textAlign: 'center',
@@ -2426,7 +2528,9 @@ function App() {
               <TextItalic>{requestConnection?.hostname}</TextItalic> <br></br>
               <TextSpan>is requestion a connection</TextSpan>
             </TextP>
+
             <Spacer height="38px" />
+
             <Box
               sx={{
                 display: 'flex',
@@ -2446,7 +2550,7 @@ function App() {
                   )
                 }
               >
-                accept
+                {t('core:action.accept', { postProcess: 'capitalizeFirst' })}
               </CustomButton>
               <CustomButton
                 sx={{
@@ -2460,14 +2564,16 @@ function App() {
                   )
                 }
               >
-                decline
+                {t('core:action.decline', { postProcess: 'capitalizeFirst' })}
               </CustomButton>
             </Box>
           </>
         )}
+
         {extState === 'web-app-request-authentication' && !isMainWindow && (
           <>
             <Spacer height="48px" />
+
             <div
               className="image-container"
               style={{
@@ -2477,6 +2583,7 @@ function App() {
             >
               <img src={Logo1Dark} className="base-image" />
             </div>
+
             <Spacer height="38px" />
 
             <TextP
@@ -2494,8 +2601,8 @@ function App() {
 
             <Box
               sx={{
-                display: 'flex',
                 alignItems: 'center',
+                display: 'flex',
                 gap: '14px',
               }}
             ></Box>
@@ -2504,7 +2611,9 @@ function App() {
 
             <CustomButton {...getRootProps()}>
               <input {...getInputProps()} />
-              Authenticate
+              {t('auth:action.authenticate', {
+                postProcess: 'capitalizeFirst',
+              })}
             </CustomButton>
 
             <Spacer height="6px" />
@@ -2520,6 +2629,7 @@ function App() {
             </CustomButton>
           </>
         )}
+
         {extState === 'wallets' && (
           <>
             <Spacer height="22px" />
@@ -2555,6 +2665,7 @@ function App() {
             />
           </>
         )}
+
         {rawWallet && extState === 'wallet-dropped' && (
           <>
             <Spacer height="22px" />
@@ -2581,7 +2692,9 @@ function App() {
                 }}
               />
             </Box>
+
             <Spacer height="10px" />
+
             <div
               className="image-container"
               style={{
@@ -2591,12 +2704,14 @@ function App() {
             >
               <img src={Logo1Dark} className="base-image" />
             </div>
+
             <Spacer height="35px" />
+
             <Box
               sx={{
+                alignItems: 'center',
                 display: 'flex',
                 flexDirection: 'column',
-                alignItems: 'center',
               }}
             >
               <Typography>
@@ -2626,7 +2741,7 @@ function App() {
                 {t('auth:wallet.password', { postProcess: 'capitalizeFirst' })}
               </CustomLabel>
 
-              <Spacer height="5px" />
+              <Spacer height="10px" />
 
               <PasswordField
                 id="standard-adornment-password"
@@ -2642,6 +2757,7 @@ function App() {
               {useLocalNode ? (
                 <>
                   <Spacer height="20px" />
+
                   <Typography
                     sx={{
                       fontSize: '12px',
@@ -2654,6 +2770,7 @@ function App() {
               ) : (
                 <>
                   <Spacer height="20px" />
+
                   <Typography
                     sx={{
                       fontSize: '12px',
@@ -2688,6 +2805,7 @@ function App() {
             walletToBeDownloaded={walletToBeDownloaded}
           />
         )}
+
         {extState === 'create-wallet' && (
           <>
             {!walletToBeDownloaded && (
@@ -2745,7 +2863,9 @@ function App() {
                     fontSize: '18px',
                   }}
                 >
-                  Set up your Qortal account
+                  {t('auth:action.setup_qortal_account', {
+                    postProcess: 'capitalizeFirst',
+                  })}
                 </TextP>
 
                 <Spacer height="14px" />
@@ -2760,11 +2880,11 @@ function App() {
                 >
                   <Box
                     sx={{
+                      alignItems: 'center',
                       display: creationStep === 1 ? 'flex' : 'none',
                       flexDirection: 'column',
-                      alignItems: 'center',
-                      width: '350px',
                       maxWidth: '95%',
+                      width: '350px',
                     }}
                   >
                     <Typography
@@ -2772,33 +2892,39 @@ function App() {
                         fontSize: '14px',
                       }}
                     >
-                      A ‘{' '}
-                      <span
-                        onClick={() => {
-                          setShowSeed(true);
-                        }}
-                        style={{
-                          fontSize: '14px',
-                          color: 'steelblue',
-                          cursor: 'pointer',
+                      <Trans
+                        ns="auth"
+                        i18nKey="message.generic.seedphrase_notice"
+                        components={{
+                          seed: (
+                            <span
+                              onClick={() => setShowSeed(true)}
+                              style={{
+                                fontSize: '14px',
+                                color: 'steelblue',
+                                cursor: 'pointer',
+                              }}
+                            />
+                          ),
                         }}
+                        tOptions={{ postProcess: ['capitalizeFirst'] }}
                       >
-                        SEEDPHRASE
-                      </span>{' '}
-                      ’ has been randomly generated in the background.
+                        A <seed>SEEDPHRASE</seed> has been randomly generated in
+                        the background.
+                      </Trans>
                     </Typography>
+
                     <Typography
                       sx={{
                         fontSize: '14px',
                         marginTop: '5px',
                       }}
                     >
-                      If you wish to VIEW THE SEEDPHRASE, click the word
-                      'SEEDPHRASE' in this text. Seedphrases are used to
-                      generate the private key for your Qortal account. For
-                      security by default, seedphrases are NOT displayed unless
-                      specifically chosen.
+                      {t('auth:tips.view_seedphrase', {
+                        postProcess: 'capitalizeFirst',
+                      })}
                     </Typography>
+
                     <Typography
                       sx={{
                         fontSize: '18px',
@@ -2806,25 +2932,36 @@ function App() {
                         textAlign: 'center',
                       }}
                     >
-                      Create your Qortal account by clicking{' '}
-                      <span
-                        style={{
-                          fontWeight: 'bold',
+                      <Trans
+                        i18nKey="action.create_qortal_account"
+                        ns="auth"
+                        components={{
+                          next: (
+                            <span
+                              style={{
+                                fontWeight: 'bold',
+                              }}
+                            />
+                          ),
                         }}
+                        tOptions={{ postProcess: ['capitalizeFirst'] }}
                       >
-                        NEXT
-                      </span>{' '}
-                      below.
+                        Create your Qortal account by clicking <next>NEXT</next>{' '}
+                        below.
+                      </Trans>
                     </Typography>
+
                     <Spacer height="17px" />
+
                     <CustomButton
                       onClick={() => {
                         setCreationStep(2);
                       }}
                     >
-                      Next
+                      {t('core:page.next', { postProcess: 'capitalizeFirst' })}
                     </CustomButton>
                   </Box>
+
                   <div
                     style={{
                       display: 'none',
@@ -2835,6 +2972,7 @@ function App() {
                       template="adverb verb noun adjective noun adverb verb noun adjective noun adjective verbed adjective noun"
                     ></random-sentence-generator>
                   </div>
+
                   <Dialog
                     open={showSeed}
                     aria-labelledby="alert-dialog-title"
@@ -2855,7 +2993,9 @@ function App() {
                             fontSize: '14px',
                           }}
                         >
-                          Your seedphrase
+                          {t('auth:seed_your', {
+                            postProcess: 'capitalizeFirst',
+                          })}
                         </Typography>
 
                         <Box
@@ -2877,16 +3017,21 @@ function App() {
                           }}
                           onClick={exportSeedphrase}
                         >
-                          Export Seedphrase
+                          {t('auth:action.export_seedphrase', {
+                            postProcess: 'capitalizeFirst',
+                          })}
                         </CustomButton>
                       </Box>
                     </DialogContent>
+
                     <DialogActions>
                       <Button
                         variant="contained"
                         onClick={() => setShowSeed(false)}
                       >
-                        close
+                        {t('core:action.close', {
+                          postProcess: 'capitalizeFirst',
+                        })}
                       </Button>
                     </DialogActions>
                   </Dialog>
@@ -2902,7 +3047,9 @@ function App() {
                   <Spacer height="14px" />
 
                   <CustomLabel htmlFor="standard-adornment-password">
-                    Wallet Password
+                    {t('auth:wallet.password', {
+                      postProcess: 'capitalizeFirst',
+                    })}
                   </CustomLabel>
 
                   <Spacer height="5px" />
@@ -2918,7 +3065,9 @@ function App() {
                   <Spacer height="6px" />
 
                   <CustomLabel htmlFor="standard-adornment-password">
-                    Confirm Wallet Password
+                    {t('auth:wallet.password_confirmation', {
+                      postProcess: 'capitalizeFirst',
+                    })}
                   </CustomLabel>
 
                   <Spacer height="5px" />
@@ -2933,7 +3082,9 @@ function App() {
                   <Spacer height="5px" />
 
                   <Typography variant="body2">
-                    There is no minimum length requirement
+                    {t('auth:message.generic.no_minimum_length', {
+                      postProcess: 'capitalizeFirst',
+                    })}
                   </Typography>
 
                   <Spacer height="17px" />
@@ -2944,6 +3095,7 @@ function App() {
                     })}
                   </CustomButton>
                 </Box>
+
                 <ErrorText>{walletToBeDownloadedError}</ErrorText>
               </>
             )}
@@ -2951,17 +3103,24 @@ function App() {
             {walletToBeDownloaded && (
               <>
                 <Spacer height="48px" />
+
                 <SuccessIcon />
+
                 <Spacer height="45px" />
+
                 <TextP
                   sx={{
                     textAlign: 'center',
                     lineHeight: '15px',
                   }}
                 >
-                  Congrats, you’re all set up!
+                  {t('auth:message.generic.congrats_setup', {
+                    postProcess: 'capitalizeFirst',
+                  })}
                 </TextP>
+
                 <Spacer height="50px" />
+
                 <Box
                   sx={{
                     display: 'flex',
@@ -2971,17 +3130,24 @@ function App() {
                   }}
                 >
                   <WarningIcon color="warning" />
+
                   <Typography>
-                    Save your account in a place where you will remember it!
+                    {t('auth:tips.safe_place', {
+                      postProcess: 'capitalizeFirst',
+                    })}
                   </Typography>
                 </Box>
+
                 <Spacer height="50px" />
+
                 <CustomButton
                   onClick={async () => {
                     await saveFileToDiskFunc();
                     returnToMain();
                     await showInfo({
-                      message: `Keep your wallet file secure.`,
+                      message: t('auth:tips.wallet_secure', {
+                        postProcess: 'capitalizeFirst',
+                      }),
                     });
                   }}
                 >
@@ -2993,6 +3159,7 @@ function App() {
             )}
           </>
         )}
+
         {isOpenSendQortSuccess && (
           <Box
             sx={{
@@ -3007,8 +3174,11 @@ function App() {
             }}
           >
             <Spacer height="48px" />
+
             <SuccessIcon />
+
             <Spacer height="45px" />
+
             <TextP
               sx={{
                 textAlign: 'center',
@@ -3019,7 +3189,9 @@ function App() {
                 postProcess: 'capitalizeFirst',
               })}
             </TextP>
+
             <Spacer height="100px" />
+
             <ButtonBase
               autoFocus
               onClick={() => {
@@ -3032,11 +3204,15 @@ function App() {
             </ButtonBase>
           </Box>
         )}
+
         {extState === 'transfer-success-request' && (
           <>
             <Spacer height="48px" />
+
             <SuccessIcon />
+
             <Spacer height="45px" />
+
             <TextP
               sx={{
                 textAlign: 'center',
@@ -3047,7 +3223,9 @@ function App() {
                 postProcess: 'capitalizeFirst',
               })}
             </TextP>
+
             <Spacer height="100px" />
+
             <CustomButton
               onClick={() => {
                 window.close();
@@ -3057,11 +3235,15 @@ function App() {
             </CustomButton>
           </>
         )}
+
         {extState === 'buy-order-submitted' && (
           <>
             <Spacer height="48px" />
+
             <SuccessIcon />
+
             <Spacer height="45px" />
+
             <TextP
               sx={{
                 textAlign: 'center',
@@ -3072,7 +3254,9 @@ function App() {
                 postProcess: 'capitalizeFirst',
               })}
             </TextP>
+
             <Spacer height="100px" />
+
             <CustomButton
               onClick={() => {
                 window.close();
@@ -3086,12 +3270,11 @@ function App() {
         {countdown && (
           <Box
             style={{
+              left: '20px',
               position: 'absolute',
               top: '20px',
-              left: '20px',
             }}
           >
-            {/* <Spacer  height="25px"/> */}
             <CountdownCircleTimer
               isPlaying
               duration={countdown}
@@ -3107,6 +3290,7 @@ function App() {
             </CountdownCircleTimer>
           </Box>
         )}
+
         {isLoading && <Loader />}
         {isShow && (
           <Dialog
@@ -3120,6 +3304,7 @@ function App() {
             <DialogTitle id="alert-dialog-title">
               {message.paymentFee ? 'Payment' : 'Publish'}
             </DialogTitle>
+
             <DialogContent>
               <DialogContentText id="alert-dialog-description">
                 {message.message}
@@ -3141,6 +3326,7 @@ function App() {
                 </DialogContentText>
               )}
             </DialogContent>
+
             <DialogActions>
               <Button
                 sx={{
@@ -3162,6 +3348,7 @@ function App() {
                   postProcess: 'capitalizeFirst',
                 })}
               </Button>
+
               <Button
                 sx={{
                   backgroundColor: theme.palette.other.danger,
@@ -3184,6 +3371,7 @@ function App() {
             </DialogActions>
           </Dialog>
         )}
+
         {isShowInfo && (
           <Dialog
             open={isShowInfo}
@@ -3193,11 +3381,13 @@ function App() {
             <DialogTitle id="alert-dialog-title">
               {'Important Info'}
             </DialogTitle>
+
             <DialogContent>
               <DialogContentText id="alert-dialog-description">
                 {messageInfo.message}
               </DialogContentText>
             </DialogContent>
+
             <DialogActions>
               <Button variant="contained" onClick={onOkInfo} autoFocus>
                 {t('core:action.close', {
@@ -3207,24 +3397,30 @@ function App() {
             </DialogActions>
           </Dialog>
         )}
+
         {isShowUnsavedChanges && (
           <Dialog
             open={isShowUnsavedChanges}
             aria-labelledby="alert-dialog-title"
             aria-describedby="alert-dialog-description"
           >
-            <DialogTitle id="alert-dialog-title">{'LOGOUT'}</DialogTitle>
+            <DialogTitle id="alert-dialog-title">
+              {t('core:action.logout', { postProcess: 'capitalizeAll' })}
+            </DialogTitle>
+
             <DialogContent>
               <DialogContentText id="alert-dialog-description">
                 {messageUnsavedChanges.message}
               </DialogContentText>
             </DialogContent>
+
             <DialogActions>
               <Button variant="contained" onClick={onCancelUnsavedChanges}>
                 {t('core:action.cancel', {
                   postProcess: 'capitalizeFirst',
                 })}
               </Button>
+
               <Button
                 variant="contained"
                 onClick={onOkUnsavedChanges}
@@ -3237,6 +3433,7 @@ function App() {
             </DialogActions>
           </Dialog>
         )}
+
         {isShowQortalRequestExtension && isMainWindow && (
           <Dialog
             open={isShowQortalRequestExtension}
@@ -3256,15 +3453,16 @@ function App() {
             >
               {({ remainingTime }) => <TextP>{remainingTime}</TextP>}
             </CountdownCircleTimer>
+
             <Box
               sx={{
-                display: 'flex',
-                padding: '20px',
-                flexDirection: 'column',
                 alignItems: 'center',
+                display: 'flex',
+                flexDirection: 'column',
                 justifyContent: 'flex-start',
                 maxHeight: '90vh',
                 overflow: 'auto',
+                padding: '20px',
               }}
             >
               <Box
@@ -3286,9 +3484,11 @@ function App() {
                   {messageQortalRequestExtension?.text1}
                 </TextP>
               </Box>
+
               {messageQortalRequestExtension?.text2 && (
                 <>
                   <Spacer height="10px" />
+
                   <Box
                     sx={{
                       display: 'flex',
@@ -3306,9 +3506,11 @@ function App() {
                       {messageQortalRequestExtension?.text2}
                     </TextP>
                   </Box>
+
                   <Spacer height="15px" />
                 </>
               )}
+
               {messageQortalRequestExtension?.text3 && (
                 <>
                   <Box
@@ -3328,6 +3530,7 @@ function App() {
                       {messageQortalRequestExtension?.text3}
                     </TextP>
                   </Box>
+
                   <Spacer height="15px" />
                 </>
               )}
@@ -3363,6 +3566,7 @@ function App() {
                   />
                 </>
               )}
+
               <Spacer height="15px" />
 
               <TextP
@@ -3421,13 +3625,16 @@ function App() {
                       maxWidth: '90%',
                     }}
                   >
-                    {'App Fee: '}
-                    {messageQortalRequestExtension?.appFee}
-                    {' QORT'}
+                    {t('core:message.generic.fee_qort', {
+                      message: messageQortalRequestExtension?.appFee,
+                      postProcess: 'capitalizeFirst',
+                    })}
                   </TextP>
+
                   <Spacer height="15px" />
                 </>
               )}
+
               {messageQortalRequestExtension?.foreignFee && (
                 <>
                   <Spacer height="15px" />
@@ -3441,12 +3648,16 @@ function App() {
                       maxWidth: '90%',
                     }}
                   >
-                    {'Foreign Fee: '}
-                    {messageQortalRequestExtension?.foreignFee}
+                    {t('core:message.generic.foreign_fee', {
+                      message: messageQortalRequestExtension?.foreignFee,
+                      postProcess: 'capitalizeFirst',
+                    })}
                   </TextP>
+
                   <Spacer height="15px" />
                 </>
               )}
+
               {messageQortalRequestExtension?.checkbox1 && (
                 <Box
                   sx={{
@@ -3520,6 +3731,7 @@ function App() {
               )}
 
               <Spacer height="29px" />
+
               <Box
                 sx={{
                   alignItems: 'center',
@@ -3563,6 +3775,7 @@ function App() {
                     postProcess: 'capitalizeFirst',
                   })}
                 </CustomButtonAccept>
+
                 <CustomButtonAccept
                   color="black"
                   bgColor={theme.palette.other.danger}
@@ -3580,6 +3793,7 @@ function App() {
             </Box>
           </Dialog>
         )}
+
         {isSettingsOpen && (
           <Settings
             open={isSettingsOpen}
@@ -3587,22 +3801,26 @@ function App() {
             rawWallet={rawWallet}
           />
         )}
+
         <CustomizedSnackbars
           open={openSnack}
           setOpen={setOpenSnack}
           info={infoSnack}
           setInfo={setInfoSnack}
         />
+
         <DrawerComponent
           open={isOpenDrawerProfile}
           setOpen={setIsOpenDrawerProfile}
         >
           {renderProfileLeft()}
         </DrawerComponent>
+
         <UserLookup
           isOpenDrawerLookup={isOpenDrawerLookup}
           setIsOpenDrawerLookup={setIsOpenDrawerLookup}
         />
+
         <RegisterName
           balance={balance}
           show={show}
@@ -3612,14 +3830,15 @@ function App() {
         />
         <BuyQortInformation balance={balance} />
       </MyContext.Provider>
+
       {extState === 'create-wallet' && walletToBeDownloaded && (
         <ButtonBase
           onClick={() => {
             showTutorial('important-information', true);
           }}
           sx={{
-            position: 'fixed',
             bottom: '25px',
+            position: 'fixed',
             right: '25px',
           }}
         >
@@ -3630,6 +3849,7 @@ function App() {
           />
         </ButtonBase>
       )}
+
       {isOpenMinting && (
         <Minting
           setIsOpenMinting={setIsOpenMinting}
diff --git a/src/background-cases.ts b/src/background-cases.ts
index d4ab82a..831c032 100644
--- a/src/background-cases.ts
+++ b/src/background-cases.ts
@@ -52,26 +52,31 @@ import {
   sendChatGroup,
   sendChatNotification,
   sendCoin,
-  setChatHeads,
   setGroupData,
   updateThreadActivity,
   walletVersion,
-} from "./background";
-import { decryptGroupEncryption, encryptAndPublishSymmetricKeyGroupChat, encryptAndPublishSymmetricKeyGroupChatForAdmins, publishGroupEncryptedResource, publishOnQDN } from "./backgroundFunctions/encryption";
-import { PUBLIC_NOTIFICATION_CODE_FIRST_SECRET_KEY } from "./constants/codes";
-import Base58 from "./deps/Base58";
-import { encryptSingle } from "./qdn/encryption/group-encryption";
-import { _createPoll, _voteOnPoll } from "./qortalRequests/get";
-import { createTransaction } from "./transactions/transactions";
-import { getData, storeData } from "./utils/chromeStorage";
+} from './background';
+import {
+  decryptGroupEncryption,
+  encryptAndPublishSymmetricKeyGroupChat,
+  encryptAndPublishSymmetricKeyGroupChatForAdmins,
+  publishGroupEncryptedResource,
+  publishOnQDN,
+} from './backgroundFunctions/encryption';
+import { PUBLIC_NOTIFICATION_CODE_FIRST_SECRET_KEY } from './constants/codes';
+import Base58 from './deps/Base58';
+import { encryptSingle } from './qdn/encryption/group-encryption';
+import { _createPoll, _voteOnPoll } from './qortalRequests/get';
+import { createTransaction } from './transactions/transactions';
+import { getData, storeData } from './utils/chromeStorage';
 
 export function versionCase(request, event) {
   event.source.postMessage(
     {
       requestId: request.requestId,
-      action: "version",
-      payload: { version: "1.0" },
-      type: "backgroundMessageResponse",
+      action: 'version',
+      payload: { version: '1.0' },
+      type: 'backgroundMessageResponse',
     },
     event.origin
   );
@@ -82,14 +87,14 @@ export async function getWalletInfoCase(request, event) {
     const response = await getKeyPair();
 
     try {
-      const walletInfo = await getData('walletInfo').catch((error)=> null)
-      if(walletInfo){
+      const walletInfo = await getData('walletInfo').catch((error) => null);
+      if (walletInfo) {
         event.source.postMessage(
           {
             requestId: request.requestId,
-            action: "getWalletInfo",
+            action: 'getWalletInfo',
             payload: { walletInfo, hasKeyPair: true },
-            type: "backgroundMessageResponse",
+            type: 'backgroundMessageResponse',
           },
           event.origin
         );
@@ -97,36 +102,34 @@ export async function getWalletInfoCase(request, event) {
         event.source.postMessage(
           {
             requestId: request.requestId,
-            action: "getWalletInfo",
-            error: "No wallet info found",
-            type: "backgroundMessageResponse",
+            action: 'getWalletInfo',
+            error: 'No wallet info found', // TODO translate
+            type: 'backgroundMessageResponse',
           },
           event.origin
         );
       }
-   
     } catch (error) {
       event.source.postMessage(
         {
           requestId: request.requestId,
-          action: "getWalletInfo",
-          error: "No wallet info found",
-          type: "backgroundMessageResponse",
+          action: 'getWalletInfo',
+          error: 'No wallet info found',
+          type: 'backgroundMessageResponse',
         },
         event.origin
       );
     }
-   
   } catch (error) {
     try {
-      const walletInfo = await getData('walletInfo').catch((error)=> null)
-      if(walletInfo){
+      const walletInfo = await getData('walletInfo').catch((error) => null);
+      if (walletInfo) {
         event.source.postMessage(
           {
             requestId: request.requestId,
-            action: "getWalletInfo",
+            action: 'getWalletInfo',
             payload: { walletInfo, hasKeyPair: false },
-            type: "backgroundMessageResponse",
+            type: 'backgroundMessageResponse',
           },
           event.origin
         );
@@ -134,9 +137,9 @@ export async function getWalletInfoCase(request, event) {
         event.source.postMessage(
           {
             requestId: request.requestId,
-            action: "getWalletInfo",
-            error: "Wallet not authenticated",
-            type: "backgroundMessageResponse",
+            action: 'getWalletInfo',
+            error: 'Wallet not authenticated',
+            type: 'backgroundMessageResponse',
           },
           event.origin
         );
@@ -145,14 +148,13 @@ export async function getWalletInfoCase(request, event) {
       event.source.postMessage(
         {
           requestId: request.requestId,
-          action: "getWalletInfo",
-          error: "Wallet not authenticated",
-          type: "backgroundMessageResponse",
+          action: 'getWalletInfo',
+          error: 'Wallet not authenticated',
+          type: 'backgroundMessageResponse',
         },
         event.origin
       );
     }
-   
   }
 }
 
@@ -163,9 +165,9 @@ export async function validApiCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "validApi",
+        action: 'validApi',
         payload: usableApi,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -173,9 +175,9 @@ export async function validApiCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "validApi",
+        action: 'validApi',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -189,9 +191,9 @@ export async function nameCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "name",
+        action: 'name',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -199,9 +201,9 @@ export async function nameCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "name",
+        action: 'name',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -215,9 +217,9 @@ export async function userInfoCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "userInfo",
+        action: 'userInfo',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -225,9 +227,9 @@ export async function userInfoCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "userInfo",
-        error: "User not authenticated",
-        type: "backgroundMessageResponse",
+        action: 'userInfo',
+        error: 'User not authenticated',
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -235,15 +237,19 @@ export async function userInfoCase(request, event) {
 }
 
 export async function decryptWalletCase(request, event) {
-  try { 
+  try {
     const { password, wallet } = request.payload;
-    const response = await decryptWallet({password, wallet, walletVersion: wallet?.version || walletVersion});
+    const response = await decryptWallet({
+      password,
+      wallet,
+      walletVersion: wallet?.version || walletVersion,
+    });
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "decryptWallet",
+        action: 'decryptWallet',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -251,9 +257,9 @@ export async function decryptWalletCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "decryptWallet",
+        action: 'decryptWallet',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -267,9 +273,9 @@ export async function balanceCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "balance",
+        action: 'balance',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -277,9 +283,9 @@ export async function balanceCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "balance",
+        action: 'balance',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -292,9 +298,9 @@ export async function ltcBalanceCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "ltcBalance",
+        action: 'ltcBalance',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -302,9 +308,9 @@ export async function ltcBalanceCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "ltcBalance",
+        action: 'ltcBalance',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -319,9 +325,9 @@ export async function sendCoinCase(request, event) {
       event.source.postMessage(
         {
           requestId: request.requestId,
-          action: "sendCoin",
+          action: 'sendCoin',
           error: res?.data?.message,
-          type: "backgroundMessageResponse",
+          type: 'backgroundMessageResponse',
         },
         event.origin
       );
@@ -330,9 +336,9 @@ export async function sendCoinCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "sendCoin",
+        action: 'sendCoin',
         payload: true,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -340,9 +346,9 @@ export async function sendCoinCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "sendCoin",
+        action: 'sendCoin',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -361,9 +367,9 @@ export async function inviteToGroupCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "inviteToGroup",
+        action: 'inviteToGroup',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -371,9 +377,9 @@ export async function inviteToGroupCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "inviteToGroup",
+        action: 'inviteToGroup',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -388,9 +394,9 @@ export async function saveTempPublishCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "saveTempPublish",
+        action: 'saveTempPublish',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -398,9 +404,9 @@ export async function saveTempPublishCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "saveTempPublish",
+        action: 'saveTempPublish',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -414,9 +420,9 @@ export async function getTempPublishCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "getTempPublish",
+        action: 'getTempPublish',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -424,9 +430,9 @@ export async function getTempPublishCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "getTempPublish",
+        action: 'getTempPublish',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -455,9 +461,9 @@ export async function createGroupCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "createGroup",
+        action: 'createGroup',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -465,9 +471,9 @@ export async function createGroupCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "createGroup",
+        action: 'createGroup',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -482,9 +488,9 @@ export async function cancelInvitationToGroupCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "cancelInvitationToGroup",
+        action: 'cancelInvitationToGroup',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -492,9 +498,9 @@ export async function cancelInvitationToGroupCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "cancelInvitationToGroup",
+        action: 'cancelInvitationToGroup',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -509,9 +515,9 @@ export async function leaveGroupCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "leaveGroup",
+        action: 'leaveGroup',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -519,9 +525,9 @@ export async function leaveGroupCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "leaveGroup",
+        action: 'leaveGroup',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -536,9 +542,9 @@ export async function joinGroupCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "joinGroup",
+        action: 'joinGroup',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -546,9 +552,9 @@ export async function joinGroupCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "joinGroup",
+        action: 'joinGroup',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -567,9 +573,9 @@ export async function kickFromGroupCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "kickFromGroup",
+        action: 'kickFromGroup',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -577,9 +583,9 @@ export async function kickFromGroupCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "kickFromGroup",
+        action: 'kickFromGroup',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -599,9 +605,9 @@ export async function banFromGroupCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "banFromGroup",
+        action: 'banFromGroup',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -609,9 +615,9 @@ export async function banFromGroupCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "banFromGroup",
+        action: 'banFromGroup',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -621,14 +627,14 @@ export async function banFromGroupCase(request, event) {
 export async function addDataPublishesCase(request, event) {
   try {
     const { data, groupId, type } = request.payload;
-    const response = await addDataPublishes( data, groupId, type );
+    const response = await addDataPublishes(data, groupId, type);
 
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "addDataPublishes",
+        action: 'addDataPublishes',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -636,9 +642,9 @@ export async function addDataPublishesCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "addDataPublishes",
+        action: 'addDataPublishes',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -648,14 +654,14 @@ export async function addDataPublishesCase(request, event) {
 export async function getDataPublishesCase(request, event) {
   try {
     const { groupId, type } = request.payload;
-    const response = await getDataPublishes(groupId, type );
+    const response = await getDataPublishes(groupId, type);
 
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "getDataPublishes",
+        action: 'getDataPublishes',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -663,9 +669,9 @@ export async function getDataPublishesCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "getDataPublishes",
+        action: 'getDataPublishes',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -679,9 +685,9 @@ export async function addUserSettingsCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "addUserSettings",
+        action: 'addUserSettings',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -689,9 +695,9 @@ export async function addUserSettingsCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "addUserSettings",
+        action: 'addUserSettings',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -706,9 +712,9 @@ export async function getUserSettingsCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "getUserSettings",
+        action: 'getUserSettings',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -716,9 +722,9 @@ export async function getUserSettingsCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "getUserSettings",
+        action: 'getUserSettings',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -733,9 +739,9 @@ export async function cancelBanCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "cancelBan",
+        action: 'cancelBan',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -743,9 +749,9 @@ export async function cancelBanCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "cancelBan",
+        action: 'cancelBan',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -760,9 +766,9 @@ export async function registerNameCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "registerName",
+        action: 'registerName',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -770,9 +776,9 @@ export async function registerNameCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "registerName",
+        action: 'registerName',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -788,15 +794,15 @@ export async function createPollCase(request, event) {
         options: pollOptions,
       },
       true,
-       true // skip permission
+      true // skip permission
     );
 
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "registerName",
+        action: 'registerName',
         payload: resCreatePoll,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -804,9 +810,9 @@ export async function createPollCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "registerName",
+        action: 'registerName',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -816,13 +822,12 @@ export async function voteOnPollCase(request, event) {
   try {
     const res = await _voteOnPoll(request.payload, true, true);
 
-
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "registerName",
+        action: 'registerName',
         payload: res,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -830,9 +835,9 @@ export async function voteOnPollCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "registerName",
+        action: 'registerName',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -847,9 +852,9 @@ export async function makeAdminCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "makeAdmin",
+        action: 'makeAdmin',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -857,9 +862,9 @@ export async function makeAdminCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "makeAdmin",
+        action: 'makeAdmin',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -874,9 +879,9 @@ export async function removeAdminCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "removeAdmin",
+        action: 'removeAdmin',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -884,9 +889,9 @@ export async function removeAdminCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "removeAdmin",
+        action: 'removeAdmin',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -895,14 +900,14 @@ export async function removeAdminCase(request, event) {
 
 export async function notificationCase(request, event) {
   try {
-    const notificationId = "chat_notification_" + Date.now(); // Create a unique ID
+    const notificationId = 'chat_notification_' + Date.now(); // Create a unique ID
 
     // chrome.notifications.create(notificationId, {
     //   type: "basic",
     //   iconUrl: "qort.png", // Add an appropriate icon for chat notifications
     //   title: "New Group Message!",
     //   message: "You have received a new message from one of your groups",
-    //   priority: 2, // Use the maximum priority to ensure it's 
+    //   priority: 2, // Use the maximum priority to ensure it's
     // });
     // Set a timeout to clear the notification after 'timeout' milliseconds
     // setTimeout(() => {
@@ -922,9 +927,9 @@ export async function notificationCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "notification",
-        error: "Error displaying notifaction",
-        type: "backgroundMessageResponse",
+        action: 'notification',
+        error: 'Error displaying notifaction',
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -939,9 +944,9 @@ export async function addTimestampEnterChatCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "addTimestampEnterChat",
+        action: 'addTimestampEnterChat',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -949,9 +954,9 @@ export async function addTimestampEnterChatCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "addTimestampEnterChat",
+        action: 'addTimestampEnterChat',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -961,13 +966,13 @@ export async function addTimestampEnterChatCase(request, event) {
 export async function setApiKeyCase(request, event) {
   try {
     const payload = request.payload;
-    storeData('apiKey', payload)
+    storeData('apiKey', payload);
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "setApiKey",
+        action: 'setApiKey',
         payload: true,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -975,9 +980,9 @@ export async function setApiKeyCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "setApiKey",
+        action: 'setApiKey',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -986,14 +991,14 @@ export async function setApiKeyCase(request, event) {
 export async function setCustomNodesCase(request, event) {
   try {
     const nodes = request.payload;
-    storeData('customNodes', nodes)
+    storeData('customNodes', nodes);
 
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "setCustomNodes",
+        action: 'setCustomNodes',
         payload: true,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1001,9 +1006,9 @@ export async function setCustomNodesCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "setCustomNodes",
+        action: 'setCustomNodes',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1017,9 +1022,9 @@ export async function getApiKeyCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "getApiKey",
+        action: 'getApiKey',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1027,9 +1032,9 @@ export async function getApiKeyCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "getApiKey",
+        action: 'getApiKey',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1043,9 +1048,9 @@ export async function getCustomNodesFromStorageCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "getCustomNodesFromStorage",
+        action: 'getCustomNodesFromStorage',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1053,9 +1058,9 @@ export async function getCustomNodesFromStorageCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "getCustomNodesFromStorage",
+        action: 'getCustomNodesFromStorage',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1073,9 +1078,9 @@ export async function notifyAdminRegenerateSecretKeyCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "notifyAdminRegenerateSecretKey",
+        action: 'notifyAdminRegenerateSecretKey',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1083,9 +1088,9 @@ export async function notifyAdminRegenerateSecretKeyCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "notifyAdminRegenerateSecretKey",
+        action: 'notifyAdminRegenerateSecretKey',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1098,15 +1103,15 @@ export async function addGroupNotificationTimestampCase(request, event) {
     const response = await addTimestampGroupAnnouncement({
       groupId,
       timestamp,
-      seenTimestamp: true
+      seenTimestamp: true,
     });
 
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "addGroupNotificationTimestamp",
+        action: 'addGroupNotificationTimestamp',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1114,9 +1119,9 @@ export async function addGroupNotificationTimestampCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "addGroupNotificationTimestamp",
+        action: 'addGroupNotificationTimestamp',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1129,9 +1134,9 @@ export async function addEnteredQmailTimestampCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "addEnteredQmailTimestamp",
+        action: 'addEnteredQmailTimestamp',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1139,9 +1144,9 @@ export async function addEnteredQmailTimestampCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "addEnteredQmailTimestamp",
+        action: 'addEnteredQmailTimestamp',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1154,9 +1159,9 @@ export async function getEnteredQmailTimestampCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "getEnteredQmailTimestamp",
-        payload: {timestamp: response},
-        type: "backgroundMessageResponse",
+        action: 'getEnteredQmailTimestamp',
+        payload: { timestamp: response },
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1164,9 +1169,9 @@ export async function getEnteredQmailTimestampCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "getEnteredQmailTimestamp",
+        action: 'getEnteredQmailTimestamp',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1180,9 +1185,9 @@ export async function clearAllNotificationsCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "clearAllNotifications",
+        action: 'clearAllNotifications',
         payload: true,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1190,9 +1195,9 @@ export async function clearAllNotificationsCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "clearAllNotifications",
+        action: 'clearAllNotifications',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1213,9 +1218,9 @@ export async function setGroupDataCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "setGroupData",
+        action: 'setGroupData',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1223,9 +1228,9 @@ export async function setGroupDataCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "setGroupData",
+        action: 'setGroupData',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1240,9 +1245,9 @@ export async function getGroupDataSingleCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "getGroupDataSingle",
+        action: 'getGroupDataSingle',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1250,9 +1255,9 @@ export async function getGroupDataSingleCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "getGroupDataSingle",
+        action: 'getGroupDataSingle',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1266,9 +1271,9 @@ export async function getTimestampEnterChatCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "getTimestampEnterChat",
+        action: 'getTimestampEnterChat',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1276,9 +1281,9 @@ export async function getTimestampEnterChatCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "getTimestampEnterChat",
+        action: 'getTimestampEnterChat',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1288,66 +1293,66 @@ export async function getTimestampEnterChatCase(request, event) {
 export async function listActionsCase(request, event) {
   try {
     const { type, listName = '', items = [] } = request.payload;
-    let responseData 
+    let responseData;
 
-    if(type === 'get'){
+    if (type === 'get') {
       const url = await createEndpoint(`/lists/${listName}`);
-          const response = await fetch(url);
-          if (!response.ok) throw new Error("Failed to fetch");
-      
-          responseData = await response.json();
-    } else if(type === 'remove'){
-      const url = await createEndpoint(`/lists/${listName}`);
-          const body = {
-            items: items ,
-          };
-          const bodyToString = JSON.stringify(body);
-          const response = await fetch(url, {
-            method: "DELETE",
-            headers: {
-              "Content-Type": "application/json",
-            },
-            body: bodyToString,
-          });
+      const response = await fetch(url);
+      if (!response.ok) throw new Error('Failed to fetch');
 
-          if (!response.ok) throw new Error("Failed to remove from list");
-          let res;
-          try {
-            res = await response.clone().json();
-          } catch (e) {
-            res = await response.text();
-          }
-          responseData = res;
-          } else if(type === 'add'){
-            const url = await createEndpoint(`/lists/${listName}`);
-                const body = {
-                  items: items ,
-                };
-                const bodyToString = JSON.stringify(body);
-    const response = await fetch(url, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: bodyToString,
-    });
-      
-                if (!response.ok) throw new Error("Failed to add to list");
-                let res;
-                try {
-                  res = await response.clone().json();
-                } catch (e) {
-                  res = await response.text();
-                }
-                responseData = res;
-                }
+      responseData = await response.json();
+    } else if (type === 'remove') {
+      const url = await createEndpoint(`/lists/${listName}`);
+      const body = {
+        items: items,
+      };
+      const bodyToString = JSON.stringify(body);
+      const response = await fetch(url, {
+        method: 'DELETE',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: bodyToString,
+      });
+
+      if (!response.ok) throw new Error('Failed to remove from list');
+      let res;
+      try {
+        res = await response.clone().json();
+      } catch (e) {
+        res = await response.text();
+      }
+      responseData = res;
+    } else if (type === 'add') {
+      const url = await createEndpoint(`/lists/${listName}`);
+      const body = {
+        items: items,
+      };
+      const bodyToString = JSON.stringify(body);
+      const response = await fetch(url, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: bodyToString,
+      });
+
+      if (!response.ok) throw new Error('Failed to add to list');
+      let res;
+      try {
+        res = await response.clone().json();
+      } catch (e) {
+        res = await response.text();
+      }
+      responseData = res;
+    }
 
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "listActions",
+        action: 'listActions',
         payload: responseData,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1355,9 +1360,9 @@ export async function listActionsCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "listActions",
+        action: 'listActions',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1371,9 +1376,9 @@ export async function getTimestampMentionCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "getTimestampMention",
+        action: 'getTimestampMention',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1381,9 +1386,9 @@ export async function getTimestampMentionCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "getTimestampMention",
+        action: 'getTimestampMention',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1398,9 +1403,9 @@ export async function addTimestampMentionCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "addTimestampMention",
+        action: 'addTimestampMention',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1408,9 +1413,9 @@ export async function addTimestampMentionCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "addTimestampMention",
+        action: 'addTimestampMention',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1424,9 +1429,9 @@ export async function getGroupNotificationTimestampCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "getGroupNotificationTimestamp",
+        action: 'getGroupNotificationTimestamp',
         payload: response,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1434,9 +1439,9 @@ export async function getGroupNotificationTimestampCase(request, event) {
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "getGroupNotificationTimestamp",
+        action: 'getGroupNotificationTimestamp',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1459,24 +1464,24 @@ export async function encryptAndPublishSymmetricKeyGroupChatCase(
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "encryptAndPublishSymmetricKeyGroupChat",
+        action: 'encryptAndPublishSymmetricKeyGroupChat',
         payload: data,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
     if (!previousData) {
-    try {
-      sendChatGroup({
-        groupId,
-        typeMessage: undefined,
-        chatReference: undefined,
-        messageText: PUBLIC_NOTIFICATION_CODE_FIRST_SECRET_KEY,
-      });
-    } catch (error) {
-      // error in sending chat message
+      try {
+        sendChatGroup({
+          groupId,
+          typeMessage: undefined,
+          chatReference: undefined,
+          messageText: PUBLIC_NOTIFICATION_CODE_FIRST_SECRET_KEY,
+        });
+      } catch (error) {
+        // error in sending chat message
+      }
     }
-  }
     try {
       sendChatNotification(data, groupId, previousData, numberOfMembers);
     } catch (error) {
@@ -1486,9 +1491,9 @@ export async function encryptAndPublishSymmetricKeyGroupChatCase(
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "encryptAndPublishSymmetricKeyGroupChat",
+        action: 'encryptAndPublishSymmetricKeyGroupChat',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1505,15 +1510,15 @@ export async function encryptAndPublishSymmetricKeyGroupChatForAdminsCase(
       await encryptAndPublishSymmetricKeyGroupChatForAdmins({
         groupId,
         previousData,
-        admins
+        admins,
       });
 
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "encryptAndPublishSymmetricKeyGroupChatForAdmins",
+        action: 'encryptAndPublishSymmetricKeyGroupChatForAdmins',
         payload: data,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1521,9 +1526,9 @@ export async function encryptAndPublishSymmetricKeyGroupChatForAdminsCase(
     event.source.postMessage(
       {
         requestId: request.requestId,
-        action: "encryptAndPublishSymmetricKeyGroupChat",
+        action: 'encryptAndPublishSymmetricKeyGroupChat',
         error: error?.message,
-        type: "backgroundMessageResponse",
+        type: 'backgroundMessageResponse',
       },
       event.origin
     );
@@ -1531,588 +1536,632 @@ export async function encryptAndPublishSymmetricKeyGroupChatForAdminsCase(
 }
 
 export async function publishGroupEncryptedResourceCase(request, event) {
-    try {
-      const {encryptedData, identifier} = request.payload;
-      const response = await publishGroupEncryptedResource({encryptedData, identifier});
-  
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "publishGroupEncryptedResource",
-          payload: response,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    } catch (error) {
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "publishGroupEncryptedResource",
-          error: error?.message,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    }
-  }
+  try {
+    const { encryptedData, identifier } = request.payload;
+    const response = await publishGroupEncryptedResource({
+      encryptedData,
+      identifier,
+    });
 
-  export async function publishOnQDNCase(request, event) {
-    try {
-      const {data, identifier, service, title,
-          description,
-          category,
-          tag1,
-          tag2,
-          tag3,
-          tag4,
-          tag5, uploadType} = request.payload;
-      const response = await publishOnQDN({data, identifier, service, title,
-          description,
-          category,
-          tag1,
-          tag2,
-          tag3,
-          tag4,
-          tag5, uploadType});
-  
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "publishOnQDN",
-          payload: response,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    } catch (error) {
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "publishOnQDN",
-          error: error?.message || 'Unable to publish',
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    }
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'publishGroupEncryptedResource',
+        payload: response,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
+  } catch (error) {
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'publishGroupEncryptedResource',
+        error: error?.message,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
   }
+}
 
-  export async function handleActiveGroupDataFromSocketCase(request, event) {
-    try {
-      const {groups, directs} = request.payload;
-      const response = await handleActiveGroupDataFromSocket({groups, directs});
-  
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "handleActiveGroupDataFromSocket",
-          payload: true,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    } catch (error) {
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "handleActiveGroupDataFromSocket",
-          error: error?.message,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    }
+export async function publishOnQDNCase(request, event) {
+  try {
+    const {
+      data,
+      identifier,
+      service,
+      title,
+      description,
+      category,
+      tag1,
+      tag2,
+      tag3,
+      tag4,
+      tag5,
+      uploadType,
+    } = request.payload;
+    const response = await publishOnQDN({
+      data,
+      identifier,
+      service,
+      title,
+      description,
+      category,
+      tag1,
+      tag2,
+      tag3,
+      tag4,
+      tag5,
+      uploadType,
+    });
+
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'publishOnQDN',
+        payload: response,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
+  } catch (error) {
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'publishOnQDN',
+        error: error?.message || 'Unable to publish',
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
   }
+}
 
-  export async function getThreadActivityCase(request, event) {
-    try {
-      const response = await checkThreads(true)
-  
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "getThreadActivity",
-          payload: response,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    } catch (error) {
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "getThreadActivity",
-          error: error?.message,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    }
+export async function handleActiveGroupDataFromSocketCase(request, event) {
+  try {
+    const { groups, directs } = request.payload;
+    const response = await handleActiveGroupDataFromSocket({ groups, directs });
+
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'handleActiveGroupDataFromSocket',
+        payload: true,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
+  } catch (error) {
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'handleActiveGroupDataFromSocket',
+        error: error?.message,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
   }
+}
 
-  export async function updateThreadActivityCase(request, event) {
-    try {
-      const { threadId, qortalName, groupId, thread} = request.payload;
-      const response = await updateThreadActivity({ threadId, qortalName, groupId, thread });
-  
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "updateThreadActivity",
-          payload: response,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    } catch (error) {
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "updateThreadActivity",
-          error: error?.message,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    }
+export async function getThreadActivityCase(request, event) {
+  try {
+    const response = await checkThreads(true);
+
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'getThreadActivity',
+        payload: response,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
+  } catch (error) {
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'getThreadActivity',
+        error: error?.message,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
   }
+}
 
-  export async function decryptGroupEncryptionCase(request, event) {
-    try {
-      const { data} = request.payload;
-      const response = await decryptGroupEncryption({ data });
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "decryptGroupEncryption",
-          payload: response,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    } catch (error) {
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "decryptGroupEncryption",
-          error: error?.message,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    }
+export async function updateThreadActivityCase(request, event) {
+  try {
+    const { threadId, qortalName, groupId, thread } = request.payload;
+    const response = await updateThreadActivity({
+      threadId,
+      qortalName,
+      groupId,
+      thread,
+    });
+
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'updateThreadActivity',
+        payload: response,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
+  } catch (error) {
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'updateThreadActivity',
+        error: error?.message,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
   }
+}
 
-  export async function encryptSingleCase(request, event) {
-    try {
-      const { data, secretKeyObject, typeNumber} = request.payload;
-      const response = await encryptSingle({ data64: data, secretKeyObject, typeNumber });
-  
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "encryptSingle",
-          payload: response,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    } catch (error) {
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "encryptSingle",
-          error: error?.message,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    }
+export async function decryptGroupEncryptionCase(request, event) {
+  try {
+    const { data } = request.payload;
+    const response = await decryptGroupEncryption({ data });
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'decryptGroupEncryption',
+        payload: response,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
+  } catch (error) {
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'decryptGroupEncryption',
+        error: error?.message,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
   }
+}
 
-  export async function decryptSingleCase(request, event) {
-    try {
-      const { data, secretKeyObject, skipDecodeBase64} = request.payload;
-      const response = await decryptSingleFunc({ messages: data, secretKeyObject, skipDecodeBase64 });
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "decryptSingle",
-          payload: response,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    } catch (error) {
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "decryptSingle",
-          error: error?.message,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    }
+export async function encryptSingleCase(request, event) {
+  try {
+    const { data, secretKeyObject, typeNumber } = request.payload;
+    const response = await encryptSingle({
+      data64: data,
+      secretKeyObject,
+      typeNumber,
+    });
+
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'encryptSingle',
+        payload: response,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
+  } catch (error) {
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'encryptSingle',
+        error: error?.message,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
   }
+}
 
-  export async function pauseAllQueuesCase(request, event) {
-    try {
-       await pauseAllQueues();
-  
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "pauseAllQueues",
-          payload: true,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    } catch (error) {
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "pauseAllQueues",
-          error: error?.message,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    }
+export async function decryptSingleCase(request, event) {
+  try {
+    const { data, secretKeyObject, skipDecodeBase64 } = request.payload;
+    const response = await decryptSingleFunc({
+      messages: data,
+      secretKeyObject,
+      skipDecodeBase64,
+    });
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'decryptSingle',
+        payload: response,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
+  } catch (error) {
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'decryptSingle',
+        error: error?.message,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
   }
+}
 
-  export async function resumeAllQueuesCase(request, event) {
-    try {
-       await resumeAllQueues();
-  
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "resumeAllQueues",
-          payload: true,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    } catch (error) {
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "resumeAllQueues",
-          error: error?.message,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    }
+export async function pauseAllQueuesCase(request, event) {
+  try {
+    await pauseAllQueues();
+
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'pauseAllQueues',
+        payload: true,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
+  } catch (error) {
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'pauseAllQueues',
+        error: error?.message,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
   }
-  export async function checkLocalCase(request, event) {
-    try {
-      const response = await checkLocalFunc()
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "pauseAllQueues",
-          payload: response,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    } catch (error) {
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "checkLocal",
-          error: error?.message,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    }
+}
+
+export async function resumeAllQueuesCase(request, event) {
+  try {
+    await resumeAllQueues();
+
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'resumeAllQueues',
+        payload: true,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
+  } catch (error) {
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'resumeAllQueues',
+        error: error?.message,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
   }
-
-  export async function decryptSingleForPublishesCase(request, event) {
-    try {
-      const { data, secretKeyObject, skipDecodeBase64} = request.payload;
-      const response = await decryptSingleForPublishes({ messages: data, secretKeyObject, skipDecodeBase64 });
-  
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "decryptSingleForPublishes",
-          payload: response,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    } catch (error) {
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "decryptSingle",
-          error: error?.message,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    }
+}
+export async function checkLocalCase(request, event) {
+  try {
+    const response = await checkLocalFunc();
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'pauseAllQueues',
+        payload: response,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
+  } catch (error) {
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'checkLocal',
+        error: error?.message,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
   }
+}
 
-  export async function decryptDirectCase(request, event) {
-    try {
-      const { data, involvingAddress} = request.payload;
-      const response = await decryptDirectFunc({ messages: data, involvingAddress });
-  
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "decryptDirect",
-          payload: response,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    } catch (error) {
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "decryptDirect",
-          error: error?.message,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    }
+export async function decryptSingleForPublishesCase(request, event) {
+  try {
+    const { data, secretKeyObject, skipDecodeBase64 } = request.payload;
+    const response = await decryptSingleForPublishes({
+      messages: data,
+      secretKeyObject,
+      skipDecodeBase64,
+    });
+
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'decryptSingleForPublishes',
+        payload: response,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
+  } catch (error) {
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'decryptSingle',
+        error: error?.message,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
   }
-  export async function sendChatGroupCase(request, event) {
-    try {
-      const {   groupId,
-        typeMessage = undefined,
-        chatReference = undefined,
-        messageText} = request.payload;
-      const response = await sendChatGroup({ groupId, typeMessage, chatReference, messageText });
-  
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "sendChatGroup",
-          payload: response,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    } catch (error) {
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "sendChatGroup",
-          error: error?.message,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    }
+}
+
+export async function decryptDirectCase(request, event) {
+  try {
+    const { data, involvingAddress } = request.payload;
+    const response = await decryptDirectFunc({
+      messages: data,
+      involvingAddress,
+    });
+
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'decryptDirect',
+        payload: response,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
+  } catch (error) {
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'decryptDirect',
+        error: error?.message,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
   }
-  export async function sendChatDirectCase(request, event) {
-    try {
-      const {    directTo,
-        typeMessage = undefined,
-        chatReference = undefined,
-        messageText,
-        publicKeyOfRecipient,
-        address,
-        otherData} = request.payload;
-      const response = await sendChatDirect({  directTo,
-        chatReference,
-        messageText,
-        typeMessage,
-        publicKeyOfRecipient,
-        address,
-        otherData });
-  
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "sendChatDirect",
-          payload: response,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    } catch (error) {
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "sendChatDirect",
-          error: error?.message,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    }
+}
+export async function sendChatGroupCase(request, event) {
+  try {
+    const {
+      groupId,
+      typeMessage = undefined,
+      chatReference = undefined,
+      messageText,
+    } = request.payload;
+    const response = await sendChatGroup({
+      groupId,
+      typeMessage,
+      chatReference,
+      messageText,
+    });
+
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'sendChatGroup',
+        payload: response,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
+  } catch (error) {
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'sendChatGroup',
+        error: error?.message,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
   }
+}
+export async function sendChatDirectCase(request, event) {
+  try {
+    const {
+      directTo,
+      typeMessage = undefined,
+      chatReference = undefined,
+      messageText,
+      publicKeyOfRecipient,
+      address,
+      otherData,
+    } = request.payload;
+    const response = await sendChatDirect({
+      directTo,
+      chatReference,
+      messageText,
+      typeMessage,
+      publicKeyOfRecipient,
+      address,
+      otherData,
+    });
 
-  export async function setupGroupWebsocketCase(request, event) {
-    try {
-     
-        checkNewMessages();
-        checkThreads();
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "sendChatDirect",
-          payload: true,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    } catch (error) {
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "sendChatDirect",
-          error: error?.message,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    }
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'sendChatDirect',
+        payload: response,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
+  } catch (error) {
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'sendChatDirect',
+        error: error?.message,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
   }
+}
 
-  export async function createRewardShareCase(request, event) {
-    try {
-      const {recipientPublicKey} = request.payload;
-        const resKeyPair = await getKeyPair();
-        const parsedData = resKeyPair;
-        const uint8PrivateKey = Base58.decode(parsedData.privateKey);
-        const uint8PublicKey = Base58.decode(parsedData.publicKey);
-        const keyPair = {
-          privateKey: uint8PrivateKey,
-          publicKey: uint8PublicKey,
-        };
-        let lastRef = await getLastRef();
-      
-        const tx = await createTransaction(38, keyPair, {
-          recipientPublicKey,
-          percentageShare: 0,
-          lastReference: lastRef,
-        });
-
-        const signedBytes = Base58.encode(tx.signedBytes);
-      
-        const res = await processTransactionVersion2(signedBytes);
-        if (!res?.signature)
-          throw new Error("Transaction was not able to be processed");
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "createRewardShare",
-          payload: res,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    } catch (error) {
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "createRewardShare",
-          error: error?.message,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    }
+export async function setupGroupWebsocketCase(request, event) {
+  try {
+    checkNewMessages();
+    checkThreads();
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'sendChatDirect',
+        payload: true,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
+  } catch (error) {
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'sendChatDirect',
+        error: error?.message,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
   }
+}
 
-  export async function removeRewardShareCase(request, event) {
-    try {
-      const {rewardShareKeyPairPublicKey, recipient, percentageShare} = request.payload;
-        const resKeyPair = await getKeyPair();
-        const parsedData = resKeyPair;
-        const uint8PrivateKey = Base58.decode(parsedData.privateKey);
-        const uint8PublicKey = Base58.decode(parsedData.publicKey);
-        const keyPair = {
-          privateKey: uint8PrivateKey,
-          publicKey: uint8PublicKey,
-        };
-        let lastRef = await getLastRef();
-      
-        const tx = await createTransaction(381, keyPair, {
-          rewardShareKeyPairPublicKey,
-          recipient,
-          percentageShare,
-          lastReference: lastRef,
-        });
+export async function createRewardShareCase(request, event) {
+  try {
+    const { recipientPublicKey } = request.payload;
+    const resKeyPair = await getKeyPair();
+    const parsedData = resKeyPair;
+    const uint8PrivateKey = Base58.decode(parsedData.privateKey);
+    const uint8PublicKey = Base58.decode(parsedData.publicKey);
+    const keyPair = {
+      privateKey: uint8PrivateKey,
+      publicKey: uint8PublicKey,
+    };
+    let lastRef = await getLastRef();
 
-        const signedBytes = Base58.encode(tx.signedBytes);
-      
-        const res = await processTransactionVersion2(signedBytes);
-        if (!res?.signature)
-          throw new Error("Transaction was not able to be processed");
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "removeRewardShare",
-          payload: res,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    } catch (error) {
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "removeRewardShare",
-          error: error?.message,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    }
+    const tx = await createTransaction(38, keyPair, {
+      recipientPublicKey,
+      percentageShare: 0,
+      lastReference: lastRef,
+    });
+
+    const signedBytes = Base58.encode(tx.signedBytes);
+
+    const res = await processTransactionVersion2(signedBytes);
+    if (!res?.signature)
+      throw new Error('Transaction was not able to be processed');
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'createRewardShare',
+        payload: res,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
+  } catch (error) {
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'createRewardShare',
+        error: error?.message,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
   }
+}
 
-  export async function getRewardSharePrivateKeyCase(request, event) {
-    try {
-      const {recipientPublicKey} = request.payload;
-        const resKeyPair = await getKeyPair();
-        const parsedData = resKeyPair;
-        const uint8PrivateKey = Base58.decode(parsedData.privateKey);
-        const uint8PublicKey = Base58.decode(parsedData.publicKey);
-        const keyPair = {
-          privateKey: uint8PrivateKey,
-          publicKey: uint8PublicKey,
-        };
-        let lastRef = await getLastRef();
-      
-        const tx = await createTransaction(38, keyPair, {
-          recipientPublicKey,
-          percentageShare: 0,
-          lastReference: lastRef,
-        });
+export async function removeRewardShareCase(request, event) {
+  try {
+    const { rewardShareKeyPairPublicKey, recipient, percentageShare } =
+      request.payload;
+    const resKeyPair = await getKeyPair();
+    const parsedData = resKeyPair;
+    const uint8PrivateKey = Base58.decode(parsedData.privateKey);
+    const uint8PublicKey = Base58.decode(parsedData.publicKey);
+    const keyPair = {
+      privateKey: uint8PrivateKey,
+      publicKey: uint8PublicKey,
+    };
+    let lastRef = await getLastRef();
 
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "getRewardSharePrivateKey",
-          payload: tx?._base58RewardShareSeed,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    } catch (error) {
-      event.source.postMessage(
-        {
-          requestId: request.requestId,
-          action: "getRewardSharePrivateKey",
-          error: error?.message,
-          type: "backgroundMessageResponse",
-        },
-        event.origin
-      );
-    }
+    const tx = await createTransaction(381, keyPair, {
+      rewardShareKeyPairPublicKey,
+      recipient,
+      percentageShare,
+      lastReference: lastRef,
+    });
+
+    const signedBytes = Base58.encode(tx.signedBytes);
+
+    const res = await processTransactionVersion2(signedBytes);
+    if (!res?.signature)
+      throw new Error('Transaction was not able to be processed');
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'removeRewardShare',
+        payload: res,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
+  } catch (error) {
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'removeRewardShare',
+        error: error?.message,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
   }
+}
 
-  
\ No newline at end of file
+export async function getRewardSharePrivateKeyCase(request, event) {
+  try {
+    const { recipientPublicKey } = request.payload;
+    const resKeyPair = await getKeyPair();
+    const parsedData = resKeyPair;
+    const uint8PrivateKey = Base58.decode(parsedData.privateKey);
+    const uint8PublicKey = Base58.decode(parsedData.publicKey);
+    const keyPair = {
+      privateKey: uint8PrivateKey,
+      publicKey: uint8PublicKey,
+    };
+    let lastRef = await getLastRef();
+
+    const tx = await createTransaction(38, keyPair, {
+      recipientPublicKey,
+      percentageShare: 0,
+      lastReference: lastRef,
+    });
+
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'getRewardSharePrivateKey',
+        payload: tx?._base58RewardShareSeed,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
+  } catch (error) {
+    event.source.postMessage(
+      {
+        requestId: request.requestId,
+        action: 'getRewardSharePrivateKey',
+        error: error?.message,
+        type: 'backgroundMessageResponse',
+      },
+      event.origin
+    );
+  }
+}
diff --git a/src/components/Apps/AppPublish.tsx b/src/components/Apps/AppPublish.tsx
index c63cee8..163f619 100644
--- a/src/components/Apps/AppPublish.tsx
+++ b/src/components/Apps/AppPublish.tsx
@@ -178,7 +178,7 @@ export const AppPublish = ({ names, categories }) => {
       const fee = await getFee('ARBITRARY');
 
       await show({
-        message: t('core:question.publish_app', {
+        message: t('core:message.question.publish_app', {
           postProcess: 'capitalizeFirst',
         }),
         publishFee: fee.fee + ' QORT',
diff --git a/src/components/Apps/AppRating.tsx b/src/components/Apps/AppRating.tsx
index 8ae7e99..860dfc4 100644
--- a/src/components/Apps/AppRating.tsx
+++ b/src/components/Apps/AppRating.tsx
@@ -113,7 +113,7 @@ export const AppRating = ({ app, myName, ratingCountPosition = 'right' }) => {
       const fee = await getFee('CREATE_POLL');
 
       await show({
-        message: t('core:question.rate_app', {
+        message: t('core:message.question.rate_app', {
           rate: newValue,
           postProcess: 'capitalizeFirst',
         }),
diff --git a/src/components/Apps/AppsPrivate.tsx b/src/components/Apps/AppsPrivate.tsx
index d3af274..de2c744 100644
--- a/src/components/Apps/AppsPrivate.tsx
+++ b/src/components/Apps/AppsPrivate.tsx
@@ -192,7 +192,7 @@ export const AppsPrivate = ({ myName }) => {
       const fee = await getFee('ARBITRARY');
 
       await show({
-        message: t('core:question.publish_app', {
+        message: t('core:message.question.publish_app', {
           postProcess: 'capitalizeFirst',
         }),
         publishFee: fee.fee + ' QORT',
diff --git a/src/components/Auth/DownloadWallet.tsx b/src/components/Auth/DownloadWallet.tsx
index eb85a20..9683b02 100644
--- a/src/components/Auth/DownloadWallet.tsx
+++ b/src/components/Auth/DownloadWallet.tsx
@@ -216,7 +216,9 @@ export const DownloadWallet = ({
               </Box>
             }
           />
+
           <Spacer height="20px" />
+
           {!keepCurrentPassword && (
             <>
               <CustomLabel htmlFor="standard-adornment-password">
@@ -226,11 +228,13 @@ export const DownloadWallet = ({
               </CustomLabel>
 
               <Spacer height="5px" />
+
               <PasswordField
                 id="standard-adornment-password"
                 value={newPassword}
                 onChange={(e) => setNewPassword(e.target.value)}
               />
+
               <Spacer height="20px" />
             </>
           )}
diff --git a/src/components/Chat/AdminSpace.tsx b/src/components/Chat/AdminSpace.tsx
index 49109aa..ca080d8 100644
--- a/src/components/Chat/AdminSpace.tsx
+++ b/src/components/Chat/AdminSpace.tsx
@@ -1,7 +1,7 @@
-import { useContext, useEffect, useState } from 'react';
-import { MyContext } from '../../App';
+import { useEffect, useState } from 'react';
 import { Box, Typography } from '@mui/material';
 import { AdminSpaceInner } from './AdminSpaceInner';
+import { useTranslation } from 'react-i18next';
 
 export const AdminSpace = ({
   selectedGroup,
@@ -19,6 +19,8 @@ export const AdminSpace = ({
   isOwner,
 }) => {
   const [isMoved, setIsMoved] = useState(false);
+  const { t } = useTranslation(['core', 'group']);
+
   useEffect(() => {
     if (hide) {
       setTimeout(() => setIsMoved(true), 300); // Wait for the fade-out to complete before moving
@@ -35,10 +37,10 @@ export const AdminSpace = ({
         height: 'calc(100vh - 70px)',
         left: hide && '-1000px',
         opacity: hide ? 0 : 1,
+        overflow: 'auto',
         position: hide ? 'fixed' : 'relative',
         visibility: hide && 'hidden',
         width: '100%',
-        overflow: 'auto',
       }}
     >
       {!isAdmin && (
@@ -50,9 +52,14 @@ export const AdminSpace = ({
             width: '100%',
           }}
         >
-          <Typography>Sorry, this space is only for Admins.</Typography>
+          <Typography>
+            {t('core:message.generic.space_for_admins', {
+              postProcess: 'capitalizeFirst',
+            })}
+          </Typography>
         </Box>
       )}
+
       {isAdmin && (
         <AdminSpaceInner
           setIsForceShowCreationKeyPopup={setIsForceShowCreationKeyPopup}
diff --git a/src/components/Chat/AdminSpaceInner.tsx b/src/components/Chat/AdminSpaceInner.tsx
index 1d1dc26..f70e813 100644
--- a/src/components/Chat/AdminSpaceInner.tsx
+++ b/src/components/Chat/AdminSpaceInner.tsx
@@ -16,6 +16,8 @@ import { uint8ArrayToObject } from '../../backgroundFunctions/encryption';
 import { formatTimestampForum } from '../../utils/time';
 import { Spacer } from '../../common/Spacer';
 import { GroupAvatar } from './GroupAvatar';
+import { useTranslation } from 'react-i18next';
+import i18next from 'i18next';
 
 export const getPublishesFromAdminsAdminSpace = async (
   admins: string[],
@@ -26,7 +28,7 @@ export const getPublishesFromAdminsAdminSpace = async (
   const response = await fetch(url);
 
   if (!response.ok) {
-    throw new Error('network error');
+    throw new Error(i18next.t('core:message.error.network_generic'));
   }
   const adminData = await response.json();
 
@@ -72,6 +74,7 @@ export const AdminSpaceInner = ({
   const [isLoadingPublishKey, setIsLoadingPublishKey] = useState(false);
   const { show, setInfoSnackCustom, setOpenSnackGlobal } =
     useContext(MyContext);
+  const { t } = useTranslation(['auth', 'core', 'group']);
 
   const getAdminGroupSecretKey = useCallback(async () => {
     try {
@@ -81,20 +84,24 @@ export const AdminSpaceInner = ({
         selectedGroup
       );
       if (getLatestPublish === false) return;
-      let data;
 
       const res = await fetch(
         `${getBaseApiReact()}/arbitrary/DOCUMENT_PRIVATE/${
           getLatestPublish.name
         }/${getLatestPublish.identifier}?encoding=base64&rebuild=true`
       );
-      data = await res.text();
 
+      const data = await res.text();
       const decryptedKey: any = await decryptResource(data);
       const dataint8Array = base64ToUint8Array(decryptedKey.data);
       const decryptedKeyToObject = uint8ArrayToObject(dataint8Array);
+
       if (!validateSecretKey(decryptedKeyToObject))
-        throw new Error('SecretKey is not valid');
+        throw new Error(
+          t('auth:message.error.invalid_secret_key', {
+            postProcess: 'capitalizeFirst',
+          })
+        );
       setAdminGroupSecretKey(decryptedKeyToObject);
       setAdminGroupSecretKeyPublishDetails(getLatestPublish);
     } catch (error) {
@@ -125,7 +132,10 @@ export const AdminSpaceInner = ({
       const fee = await getFee('ARBITRARY');
 
       await show({
-        message: 'Would you like to perform an ARBITRARY transaction?',
+        message: t('core:message.question.perform_transaction', {
+          action: 'ARBITRARY',
+          postProcess: 'capitalizeFirst',
+        }),
         publishFee: fee.fee + ' QORT',
       });
 
@@ -141,22 +151,31 @@ export const AdminSpaceInner = ({
           if (!response?.error) {
             setInfoSnackCustom({
               type: 'success',
-              message:
-                'Successfully re-encrypted secret key. It may take a couple of minutes for the changes to propagate. Refresh the group in 5 mins.',
+              message: t('auth:message.success.reencrypted_secret_key', {
+                postProcess: 'capitalizeFirst',
+              }),
             });
             setOpenSnackGlobal(true);
             return;
           }
           setInfoSnackCustom({
             type: 'error',
-            message: response?.error || 'unable to re-encrypt secret key',
+            message:
+              response?.error ||
+              t('auth:message.error.unable_reencrypt_secret_key', {
+                postProcess: 'capitalizeFirst',
+              }),
           });
           setOpenSnackGlobal(true);
         })
         .catch((error) => {
           setInfoSnackCustom({
             type: 'error',
-            message: error?.message || 'unable to re-encrypt secret key',
+            message:
+              error?.message ||
+              t('auth:message.error.unable_reencrypt_secret_key', {
+                postProcess: 'capitalizeFirst',
+              }),
           });
           setOpenSnackGlobal(true);
         });
@@ -184,10 +203,13 @@ export const AdminSpaceInner = ({
           fontSize: '14px',
         }}
       >
-        Reminder: After publishing the key, it will take a couple of minutes for
-        it to appear. Please just wait.
+        {t('auth:message.error.publishing_key', {
+          postProcess: 'capitalizeFirst',
+        })}
       </Typography>
+
       <Spacer height="25px" />
+
       <Box
         sx={{
           border: '1px solid gray',
@@ -201,28 +223,43 @@ export const AdminSpaceInner = ({
         }}
       >
         {isFetchingGroupSecretKey && (
-          <Typography>Fetching Group secret key publishes</Typography>
-        )}
-        {!isFetchingGroupSecretKey &&
-          groupSecretKeyPublishDetails === false && (
-            <Typography>No secret key published yet</Typography>
-          )}
-        {groupSecretKeyPublishDetails && (
           <Typography>
-            Last encryption date:{' '}
-            {formatTimestampForum(
-              groupSecretKeyPublishDetails?.updated ||
-                groupSecretKeyPublishDetails?.created
-            )}{' '}
-            {` by ${groupSecretKeyPublishDetails?.name}`}
+            {t('auth:message.generic.fetching_group_secret_key', {
+              postProcess: 'capitalizeFirst',
+            })}
           </Typography>
         )}
+
+        {!isFetchingGroupSecretKey &&
+          groupSecretKeyPublishDetails === false && (
+            <Typography>
+              {t('auth:message.generic.no_secret_key_published', {
+                postProcess: 'capitalizeFirst',
+              })}
+            </Typography>
+          )}
+
+        {groupSecretKeyPublishDetails && (
+          <Typography>
+            {t('auth:message.generic.last_encryption_date', {
+              date: formatTimestampForum(
+                groupSecretKeyPublishDetails?.updated ||
+                  groupSecretKeyPublishDetails?.created
+              ),
+              name: groupSecretKeyPublishDetails?.name,
+              postProcess: 'capitalizeFirst',
+            })}
+          </Typography>
+        )}
+
         <Button
           disabled={isFetchingGroupSecretKey}
           onClick={() => setIsForceShowCreationKeyPopup(true)}
           variant="contained"
         >
-          Publish group secret key
+          {t('auth:action.publish_group_secret_key', {
+            postProcess: 'capitalizeFirst',
+          })}
         </Button>
 
         <Spacer height="20px" />
@@ -232,9 +269,9 @@ export const AdminSpaceInner = ({
             fontSize: '14px',
           }}
         >
-          This key is to encrypt GROUP related content. This is the only one
-          used in this UI as of now. All group members will be able to see
-          content encrypted with this key.
+          {t('auth:tips.key_encrypt_group', {
+            postProcess: 'capitalizeFirst',
+          })}
         </Typography>
       </Box>
 
@@ -253,26 +290,41 @@ export const AdminSpaceInner = ({
         }}
       >
         {isFetchingAdminGroupSecretKey && (
-          <Typography>Fetching Admins secret key</Typography>
-        )}
-        {!isFetchingAdminGroupSecretKey && !adminGroupSecretKey && (
-          <Typography>No secret key published yet</Typography>
-        )}
-        {adminGroupSecretKeyPublishDetails && (
           <Typography>
-            Last encryption date:{' '}
-            {formatTimestampForum(
-              adminGroupSecretKeyPublishDetails?.updated ||
-                adminGroupSecretKeyPublishDetails?.created
-            )}
+            {t('auth:message.generic.fetching_admin_secret_key', {
+              postProcess: 'capitalizeFirst',
+            })}
           </Typography>
         )}
+
+        {!isFetchingAdminGroupSecretKey && !adminGroupSecretKey && (
+          <Typography>
+            {t('auth:message.generic.no_secret_key_published', {
+              postProcess: 'capitalizeFirst',
+            })}
+          </Typography>
+        )}
+
+        {adminGroupSecretKeyPublishDetails && (
+          <Typography>
+            {t('auth:message.generic.last_encryption_date', {
+              date: formatTimestampForum(
+                adminGroupSecretKeyPublishDetails?.updated ||
+                  adminGroupSecretKeyPublishDetails?.created
+              ),
+              postProcess: 'capitalizeFirst',
+            })}
+          </Typography>
+        )}
+
         <Button
           disabled={isFetchingAdminGroupSecretKey}
           onClick={createCommonSecretForAdmins}
           variant="contained"
         >
-          Publish admin secret key
+          {t('auth:action.publish_admin_secret_key', {
+            postProcess: 'capitalizeFirst',
+          })}
         </Button>
 
         <Spacer height="20px" />
@@ -282,11 +334,14 @@ export const AdminSpaceInner = ({
             fontSize: '14px',
           }}
         >
-          This key is to encrypt ADMIN related content. Only admins would see
-          content encrypted with it.
+          {t('auth:tips.key_encrypt_admin', {
+            postProcess: 'capitalizeFirst',
+          })}
         </Typography>
       </Box>
+
       <Spacer height="25px" />
+
       {isOwner && (
         <Box
           sx={{
@@ -301,7 +356,11 @@ export const AdminSpaceInner = ({
             alignItems: 'center',
           }}
         >
-          <Typography>Group Avatar</Typography>
+          <Typography>
+            {t('group:group.avatar', {
+              postProcess: 'capitalizeFirst',
+            })}
+          </Typography>
 
           <GroupAvatar
             setOpenSnack={setOpenSnackGlobal}
diff --git a/src/components/Chat/AnnouncementDiscussion.tsx b/src/components/Chat/AnnouncementDiscussion.tsx
index e4c2538..4ab4771 100644
--- a/src/components/Chat/AnnouncementDiscussion.tsx
+++ b/src/components/Chat/AnnouncementDiscussion.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo, useRef, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import TipTap from './TipTap';
 import {
   AuthenticatedContainerInnerTop,
@@ -8,7 +8,7 @@ import { Box, CircularProgress, useTheme } from '@mui/material';
 import { objectToBase64 } from '../../qdn/encryption/group-encryption';
 import ShortUniqueId from 'short-unique-id';
 import { LoadingSnackbar } from '../Snackbar/LoadingSnackbar';
-import { getBaseApi, getFee } from '../../background';
+import { getFee } from '../../background';
 import {
   decryptPublishes,
   getTempPublish,
@@ -24,6 +24,7 @@ import {
   pauseAllQueues,
   resumeAllQueues,
 } from '../../App';
+import { useTranslation } from 'react-i18next';
 
 const tempKey = 'accouncement-comment';
 
@@ -39,10 +40,10 @@ export const AnnouncementDiscussion = ({
   isPrivate,
 }) => {
   const theme = useTheme();
+  const { t } = useTranslation(['auth', 'core', 'group']);
   const [isSending, setIsSending] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
   const [isFocusedParent, setIsFocusedParent] = useState(false);
-
   const [comments, setComments] = useState([]);
   const [tempPublishedList, setTempPublishedList] = useState([]);
   const firstMountRef = useRef(false);
@@ -100,7 +101,12 @@ export const AnnouncementDiscussion = ({
             rej(response.error);
           })
           .catch((error) => {
-            rej(error.message || 'An error occurred');
+            rej(
+              error.message ||
+                t('core:message.error.generic', {
+                  postProcess: 'capitalizeFirst',
+                })
+            );
           });
       });
     } catch (error) {
@@ -131,9 +137,13 @@ export const AnnouncementDiscussion = ({
       pauseAllQueues();
       const fee = await getFee('ARBITRARY');
       await show({
-        message: 'Would you like to perform a ARBITRARY transaction?',
+        message: t('core:message.question.perform_transaction', {
+          action: 'ARBITRARY',
+          postProcess: 'capitalizeFirst',
+        }),
         publishFee: fee.fee + ' QORT',
       });
+
       if (isSending) return;
       if (editorRef.current) {
         const htmlContent = editorRef.current.getHTML();
@@ -155,10 +165,11 @@ export const AnnouncementDiscussion = ({
             : await encryptChatMessage(message64, secretKeyObject);
         const randomUid = uid.rnd();
         const identifier = `cm-${selectedAnnouncement.identifier}-${randomUid}`;
+
         const res = await publishAnc({
           encryptedData: encryptSingle,
           identifier,
-        });
+        }); // TODO remove unused?
 
         const dataToSaveToStorage = {
           name: myName,
@@ -168,12 +179,13 @@ export const AnnouncementDiscussion = ({
           created: Date.now(),
           announcementId: selectedAnnouncement.identifier,
         };
+
         await saveTempPublish({ data: dataToSaveToStorage, key: tempKey });
         setTempData();
 
         clearEditorContent();
       }
-      // send chat message
+      // TODO send chat message
     } catch (error) {
       console.error(error);
     } finally {
@@ -182,14 +194,12 @@ export const AnnouncementDiscussion = ({
     }
   };
 
-  const getComments = React.useCallback(
+  const getComments = useCallback(
     async (selectedAnnouncement, isPrivate) => {
       try {
         setIsLoading(true);
 
         const offset = 0;
-
-        // dispatch(setIsLoadingGlobal(true))
         const identifier = `cm-${selectedAnnouncement.identifier}`;
         const url = `${getBaseApiReact()}${getArbitraryEndpointReact()}?mode=ALL&service=DOCUMENT&identifier=${identifier}&limit=20&includemetadata=false&offset=${offset}&reverse=true&prefix=true`;
         const response = await fetch(url, {
@@ -209,8 +219,6 @@ export const AnnouncementDiscussion = ({
         console.log(error);
       } finally {
         setIsLoading(false);
-
-        // dispatch(setIsLoadingGlobal(false))
       }
     },
     [secretKey]
@@ -259,7 +267,7 @@ export const AnnouncementDiscussion = ({
     return sortedList;
   }, [tempPublishedList, comments]);
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (!secretKey && isPrivate) return;
     if (selectedAnnouncement && !firstMountRef.current && isPrivate !== null) {
       getComments(selectedAnnouncement, isPrivate);
@@ -299,6 +307,7 @@ export const AnnouncementDiscussion = ({
 
         <Spacer height="20px" />
       </div>
+
       <AnnouncementList
         announcementData={data}
         initialMessages={combinedListTempAndReal}
@@ -308,6 +317,7 @@ export const AnnouncementDiscussion = ({
         loadMore={loadMore}
         myName={myName}
       />
+
       <div
         style={{
           backgroundColor: theme.palette.background.default,
@@ -343,6 +353,7 @@ export const AnnouncementDiscussion = ({
             setIsFocusedParent={setIsFocusedParent}
           />
         </div>
+
         <Box
           sx={{
             display: 'flex',
@@ -359,7 +370,7 @@ export const AnnouncementDiscussion = ({
                 if (isSending) return;
                 setIsFocusedParent(false);
                 clearEditorContent();
-                // Unfocus the editor
+                // TODO Unfocus the editor
               }}
               style={{
                 alignSelf: 'center',
@@ -371,7 +382,7 @@ export const AnnouncementDiscussion = ({
                 padding: '5px',
               }}
             >
-              {` Close`}
+              {t('core:action.close', { postProcess: 'capitalizeFirst' })}
             </CustomButton>
           )}
           <CustomButton
@@ -402,7 +413,9 @@ export const AnnouncementDiscussion = ({
                 }}
               />
             )}
-            {` Publish Comment`}
+            {t('core:action.publish_comment', {
+              postProcess: 'capitalizeFirst',
+            })}
           </CustomButton>
         </Box>
       </div>
@@ -410,7 +423,9 @@ export const AnnouncementDiscussion = ({
       <LoadingSnackbar
         open={isLoading}
         info={{
-          message: 'Loading comments... please wait.',
+          message: t('core:loading.comments', {
+            postProcess: 'capitalizeFirst',
+          }),
         }}
       />
     </div>
diff --git a/src/components/Chat/AnnouncementItem.tsx b/src/components/Chat/AnnouncementItem.tsx
index e6ad671..e8d8ced 100644
--- a/src/components/Chat/AnnouncementItem.tsx
+++ b/src/components/Chat/AnnouncementItem.tsx
@@ -1,14 +1,14 @@
-import React, { useEffect, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 import { MessageDisplay } from './MessageDisplay';
 import { Avatar, Box, Typography, useTheme } from '@mui/material';
 import { formatTimestamp } from '../../utils/time';
 import ChatBubbleIcon from '@mui/icons-material/ChatBubble';
 import ArrowForwardIosIcon from '@mui/icons-material/ArrowForwardIos';
-import { getBaseApi } from '../../background';
 import { requestQueueCommentCount } from './GroupAnnouncements';
 import { CustomLoader } from '../../common/CustomLoader';
 import { getArbitraryEndpointReact, getBaseApiReact } from '../../App';
 import { WrapperUserAction } from '../WrapperUserAction';
+import { useTranslation } from 'react-i18next';
 
 export const AnnouncementItem = ({
   message,
@@ -18,12 +18,12 @@ export const AnnouncementItem = ({
   myName,
 }) => {
   const theme = useTheme();
+  const { t } = useTranslation(['auth', 'core', 'group']);
   const [commentLength, setCommentLength] = useState(0);
-  const getNumberOfComments = React.useCallback(async () => {
+
+  const getNumberOfComments = useCallback(async () => {
     try {
       const offset = 0;
-
-      // dispatch(setIsLoadingGlobal(true))
       const identifier = `cm-${message.identifier}`;
       const url = `${getBaseApiReact()}${getArbitraryEndpointReact()}?mode=ALL&service=DOCUMENT&identifier=${identifier}&limit=0&includemetadata=false&offset=${offset}&reverse=true&prefix=true`;
 
@@ -84,6 +84,7 @@ export const AnnouncementItem = ({
             {message?.name?.charAt(0)}
           </Avatar>
         </WrapperUserAction>
+
         <Box
           sx={{
             display: 'flex',
@@ -106,6 +107,7 @@ export const AnnouncementItem = ({
               {message?.name}
             </Typography>
           </WrapperUserAction>
+
           {!messageData?.decryptedData && (
             <Box
               sx={{
@@ -117,6 +119,7 @@ export const AnnouncementItem = ({
               <CustomLoader />
             </Box>
           )}
+
           {messageData?.decryptedData?.message && (
             <>
               {messageData?.type === 'notification' ? (
@@ -150,6 +153,7 @@ export const AnnouncementItem = ({
           </Box>
         </Box>
       </Box>
+
       {!disableComment && (
         <Box
           sx={{
@@ -189,10 +193,13 @@ export const AnnouncementItem = ({
                   fontSize: '14px',
                 }}
               >
-                Leave comment
+                {t('core:action.leave_comment', {
+                  postProcess: 'capitalizeFirst',
+                })}
               </Typography>
             )}
           </Box>
+
           <ArrowForwardIosIcon
             sx={{
               fontSize: '20px',
diff --git a/src/components/Chat/AnnouncementList.tsx b/src/components/Chat/AnnouncementList.tsx
index 5f3c75b..1fb0f19 100644
--- a/src/components/Chat/AnnouncementList.tsx
+++ b/src/components/Chat/AnnouncementList.tsx
@@ -3,6 +3,7 @@ import { CellMeasurerCache } from 'react-virtualized';
 import { AnnouncementItem } from './AnnouncementItem';
 import { Box } from '@mui/material';
 import { CustomButton } from '../../styles/App-styles';
+import { useTranslation } from 'react-i18next';
 
 const cache = new CellMeasurerCache({
   fixedWidth: true,
@@ -18,8 +19,8 @@ export const AnnouncementList = ({
   loadMore,
   myName,
 }) => {
-  const listRef = useRef(null);
   const [messages, setMessages] = useState(initialMessages);
+  const { t } = useTranslation(['auth', 'core', 'group']);
 
   useEffect(() => {
     cache.clearAll();
@@ -36,9 +37,9 @@ export const AnnouncementList = ({
         flexDirection: 'column',
         flexGrow: 1,
         flexShrink: 1,
+        overflow: 'auto',
         position: 'relative',
         width: '100%',
-        overflow: 'auto',
       }}
     >
       {messages.map((message) => {
@@ -69,19 +70,7 @@ export const AnnouncementList = ({
           </div>
         );
       })}
-      {/* <AutoSizer>
-        {({ height, width }) => (
-          <List
-            ref={listRef}
-            width={width}
-            height={height}
-            rowCount={messages.length}
-            rowHeight={cache.rowHeight}
-            rowRenderer={rowRenderer}
-            deferredMeasurementCache={cache}
-          />
-        )}
-      </AutoSizer> */}
+
       <Box
         sx={{
           display: 'flex',
@@ -92,7 +81,9 @@ export const AnnouncementList = ({
       >
         {showLoadMore && (
           <CustomButton onClick={loadMore}>
-            Load older announcements
+            {t('core:action.load_announcements', {
+              postProcess: 'capitalizeFirst',
+            })}
           </CustomButton>
         )}
       </Box>
diff --git a/src/components/Chat/ChatDirect.tsx b/src/components/Chat/ChatDirect.tsx
index 1b6b256..a3c12a9 100644
--- a/src/components/Chat/ChatDirect.tsx
+++ b/src/components/Chat/ChatDirect.tsx
@@ -1,12 +1,4 @@
-import React, {
-  useCallback,
-  useEffect,
-  useMemo,
-  useReducer,
-  useRef,
-  useState,
-} from 'react';
-
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { ChatList } from './ChatList';
 import Tiptap from './TipTap';
 import { CustomButton } from '../../styles/App-styles';
@@ -31,9 +23,9 @@ import {
 } from '../../utils/events';
 import ArrowBackIcon from '@mui/icons-material/ArrowBack';
 import ShortUniqueId from 'short-unique-id';
-import { ReturnIcon } from '../../assets/Icons/ReturnIcon';
 import { ExitIcon } from '../../assets/Icons/ExitIcon';
 import { ReplyPreview } from './MessageItem';
+import { useTranslation } from 'react-i18next';
 
 const uid = new ShortUniqueId({ length: 5 });
 
@@ -50,21 +42,20 @@ export const ChatDirect = ({
   setMobileViewModeKeepOpen,
 }) => {
   const theme = useTheme();
+  const { t } = useTranslation(['auth', 'core', 'group']);
   const { queueChats, addToQueue, processWithNewMessages } = useMessageQueue();
   const [isFocusedParent, setIsFocusedParent] = useState(false);
   const [onEditMessage, setOnEditMessage] = useState(null);
-
   const [messages, setMessages] = useState([]);
   const [isSending, setIsSending] = useState(false);
   const [directToValue, setDirectToValue] = useState('');
   const hasInitialized = useRef(false);
   const [isLoading, setIsLoading] = useState(false);
-  const [openSnack, setOpenSnack] = React.useState(false);
-  const [infoSnack, setInfoSnack] = React.useState(null);
-  const [publicKeyOfRecipient, setPublicKeyOfRecipient] = React.useState('');
+  const [openSnack, setOpenSnack] = useState(false);
+  const [infoSnack, setInfoSnack] = useState(null);
+  const [publicKeyOfRecipient, setPublicKeyOfRecipient] = useState('');
   const hasInitializedWebsocket = useRef(false);
   const [chatReferences, setChatReferences] = useState({});
-
   const editorRef = useRef(null);
   const socketRef = useRef(null);
   const timeoutIdRef = useRef(null);
@@ -74,12 +65,8 @@ export const ChatDirect = ({
   const setEditorRef = (editorInstance) => {
     editorRef.current = editorInstance;
   };
-  const [, forceUpdate] = useReducer((x) => x + 1, 0);
-
-  const triggerRerender = () => {
-    forceUpdate(); // Trigger re-render by updating the state
-  };
   const publicKeyOfRecipientRef = useRef(null);
+
   const getPublicKeyFunc = async (address) => {
     try {
       const publicKey = await getPublicKey(address);
@@ -229,7 +216,12 @@ export const ChatDirect = ({
             rej(response.error);
           })
           .catch((error) => {
-            rej(error.message || 'An error occurred');
+            rej(
+              error.message ||
+                t('core:message.error.generic', {
+                  postProcess: 'capitalizeFirst',
+                })
+            );
           });
       });
     } catch (error) {
@@ -397,11 +389,20 @@ export const ChatDirect = ({
             rej(response.error);
           })
           .catch((error) => {
-            rej(error.message || 'An error occurred');
+            rej(
+              error.message ||
+                t('core:message.error.generic', {
+                  postProcess: 'capitalizeFirst',
+                })
+            );
           });
       });
     } catch (error) {
-      throw new Error(error);
+      if (error instanceof Error) {
+        throw new Error(error.message);
+      } else {
+        throw new Error(String(error));
+      }
     }
   };
   const clearEditorContent = () => {
@@ -432,8 +433,14 @@ export const ChatDirect = ({
     try {
       if (messageSize > 4000) return;
 
+      // TODO set magic number in a proper file
       if (+balance < 4)
-        throw new Error('You need at least 4 QORT to send a message');
+        throw new Error(
+          t('group:message.error.qortals_required', {
+            quantity: 4,
+            postProcess: 'capitalizeFirst',
+          })
+        );
       if (isSending) return;
       if (editorRef.current) {
         const htmlContent = editorRef.current.getHTML();
@@ -500,7 +507,10 @@ export const ChatDirect = ({
         type: 'error',
         message:
           errorMsg === 'invalid signature'
-            ? 'You need at least 4 QORT to send a message'
+            ? t('group:message.error.qortals_required', {
+                quantity: 4,
+                postProcess: 'capitalizeFirst',
+              })
             : errorMsg,
       });
       setOpenSnack(true);
@@ -566,13 +576,14 @@ export const ChatDirect = ({
             fontSize: '14px',
           }}
         >
-          Close Direct Chat
+          {t('core:action.close_chat', { postProcess: 'capitalizeFirst' })}
         </Typography>
       </Box>
 
       {isNewChat && (
         <>
           <Spacer height="30px" />
+
           <Input
             sx={{
               fontSize: '18px',
@@ -686,13 +697,19 @@ export const ChatDirect = ({
                 width: '100%',
               }}
             >
-              <Typography
+              <Typography // TODO set magic number in a proper file
                 sx={{
                   fontSize: '12px',
                   color:
                     messageSize > 4000 ? theme.palette.other.danger : 'unset',
                 }}
-              >{`Your message size is of ${messageSize} bytes out of a maximum of 4000`}</Typography>
+              >
+                {t('core:message.error.message_size', {
+                  maximum: 4000,
+                  size: messageSize,
+                  postProcess: 'capitalizeFirst',
+                })}
+              </Typography>
             </Box>
           )}
         </div>
@@ -746,7 +763,7 @@ export const ChatDirect = ({
       <LoadingSnackbar
         open={isLoading}
         info={{
-          message: 'Loading chat... please wait.',
+          message: t('core:loading.chat', { postProcess: 'capitalizeFirst' }),
         }}
       />
 
diff --git a/src/components/Chat/ChatGroup.tsx b/src/components/Chat/ChatGroup.tsx
index a4f6e5a..5b9c660 100644
--- a/src/components/Chat/ChatGroup.tsx
+++ b/src/components/Chat/ChatGroup.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
   useCallback,
   useContext,
   useEffect,
@@ -50,6 +50,8 @@ import CloseIcon from '@mui/icons-material/Close';
 import { throttle } from 'lodash';
 import ImageIcon from '@mui/icons-material/Image';
 import { messageHasImage } from '../../utils/chat';
+import { useTranslation } from 'react-i18next';
+
 const uid = new ShortUniqueId({ length: 5 });
 const uidImages = new ShortUniqueId({ length: 12 });
 
@@ -75,8 +77,8 @@ export const ChatGroup = ({
   const [isSending, setIsSending] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
   const [isMoved, setIsMoved] = useState(false);
-  const [openSnack, setOpenSnack] = React.useState(false);
-  const [infoSnack, setInfoSnack] = React.useState(null);
+  const [openSnack, setOpenSnack] = useState(false);
+  const [infoSnack, setInfoSnack] = useState(null);
   const hasInitialized = useRef(false);
   const [isFocusedParent, setIsFocusedParent] = useState(false);
   const [replyMessage, setReplyMessage] = useState(null);
@@ -93,8 +95,8 @@ export const ChatGroup = ({
   const { queueChats, addToQueue, processWithNewMessages } = useMessageQueue();
   const [, forceUpdate] = useReducer((x) => x + 1, 0);
   const lastReadTimestamp = useRef(null);
-
   const handleUpdateRef = useRef(null);
+  const { t } = useTranslation(['auth', 'core', 'group']);
 
   const getTimestampEnterChat = async (selectedGroup) => {
     try {
@@ -129,7 +131,12 @@ export const ChatGroup = ({
             rej(response.error);
           })
           .catch((error) => {
-            rej(error.message || 'An error occurred');
+            rej(
+              error.message ||
+                t('core:message.error.generic', {
+                  postProcess: 'capitalizeFirst',
+                })
+            );
           });
       });
     } catch (error) {
@@ -154,9 +161,6 @@ export const ChatGroup = ({
     return Array.from(uniqueMembers);
   }, [messages]);
 
-  const triggerRerender = () => {
-    forceUpdate(); // Trigger re-render by updating the state
-  };
   const setEditorRef = (editorInstance) => {
     editorRef.current = editorInstance;
   };
@@ -168,6 +172,7 @@ export const ChatGroup = ({
     }
     return [];
   }, [selectedGroup, queueChats]);
+
   const tempChatReferences = useMemo(() => {
     if (!selectedGroup) return [];
     if (queueChats[selectedGroup]) {
@@ -184,12 +189,6 @@ export const ChatGroup = ({
     }
   }, [secretKey]);
 
-  // const getEncryptedSecretKey = useCallback(()=> {
-  //     const response = getResource()
-  //     const decryptResponse = decryptResource()
-  //     return
-  // }, [])
-
   const checkForFirstSecretKeyNotification = (messages) => {
     messages?.forEach((message) => {
       try {
@@ -250,7 +249,6 @@ export const ChatGroup = ({
       const dataRemovedBlock = responseData?.filter((item) => {
         return !isUserBlocked(item?.sender, item?.senderName);
       });
-
       decryptMessages(dataRemovedBlock, false);
     } catch (error) {
       console.error(error);
@@ -273,6 +271,7 @@ export const ChatGroup = ({
               const filterUIMessages = encryptedMessages.filter(
                 (item) => !isExtMsg(item.data)
               );
+
               const decodedUIMessages =
                 decodeBase64ForUIChatMessages(filterUIMessages);
 
@@ -280,6 +279,7 @@ export const ChatGroup = ({
                 ...decodedUIMessages,
                 ...response,
               ];
+
               const combineUIAndExtensionMsgs = processWithNewMessages(
                 combineUIAndExtensionMsgsBefore.map((item) => ({
                   ...item,
@@ -287,16 +287,24 @@ export const ChatGroup = ({
                 })),
                 selectedGroup
               );
+
               res(combineUIAndExtensionMsgs);
 
               if (isInitiated) {
                 const formatted = combineUIAndExtensionMsgs
                   .filter((rawItem) => !rawItem?.chatReference)
                   .map((item) => {
+                    const message = (
+                      <p>
+                        {t('group:message.generic.group_key_created', {
+                          postProcess: 'capitalizeFirst',
+                        })}
+                      </p>
+                    );
                     const additionalFields =
-                      item?.data === 'NDAwMQ=='
+                      item?.data === 'NDAwMQ==' // TODO put magic string somewhere in a file
                         ? {
-                            text: '<p>First group key created.</p>',
+                            text: message,
                           }
                         : {};
                     return {
@@ -362,7 +370,9 @@ export const ChatGroup = ({
                             !newTimestamp
                           ) {
                             console.warn(
-                              'Invalid content, sender, or timestamp in reaction data',
+                              t('group:message.generic.invalid_content', {
+                                postProcess: 'capitalizeFirst',
+                              }),
                               item
                             );
                             return;
@@ -435,10 +445,17 @@ export const ChatGroup = ({
                 const formatted = combineUIAndExtensionMsgs
                   .filter((rawItem) => !rawItem?.chatReference)
                   .map((item) => {
+                    const message = (
+                      <p>
+                        {t('group:message.generic.group_key_created', {
+                          postProcess: 'capitalizeFirst',
+                        })}
+                      </p>
+                    );
                     const additionalFields =
                       item?.data === 'NDAwMQ=='
                         ? {
-                            text: '<p>First group key created.</p>',
+                            text: message,
                           }
                         : {};
                     const divide =
@@ -510,7 +527,9 @@ export const ChatGroup = ({
                             !newTimestamp
                           ) {
                             console.warn(
-                              'Invalid content, sender, or timestamp in reaction data',
+                              t('group:message.generic.invalid_content', {
+                                postProcess: 'capitalizeFirst',
+                              }),
                               item
                             );
                             return;
@@ -583,7 +602,12 @@ export const ChatGroup = ({
             rej(response.error);
           })
           .catch((error) => {
-            rej(error.message || 'An error occurred');
+            rej(
+              error.message ||
+                t('core:message.error.generic', {
+                  postProcess: 'capitalizeFirst',
+                })
+            );
           });
       });
     } catch (error) {
@@ -615,6 +639,7 @@ export const ChatGroup = ({
       console.error('Error during ping:', error);
     }
   };
+
   const initWebsocketMessageGroup = () => {
     let socketLink = `${getBaseApiReactSocket()}/websockets/chat/messages?txGroupId=${selectedGroup}&encoding=BASE64&limit=100`;
     socketRef.current = new WebSocket(socketLink);
@@ -709,7 +734,12 @@ export const ChatGroup = ({
             rej(response.error);
           })
           .catch((error) => {
-            rej(error.message || 'An error occurred');
+            rej(
+              error.message ||
+                t('core:message.error.generic', {
+                  postProcess: 'capitalizeFirst',
+                })
+            );
           });
       });
     } catch (error) {
@@ -744,7 +774,12 @@ export const ChatGroup = ({
             rej(response.error);
           })
           .catch((error) => {
-            rej(error.message || 'An error occurred');
+            rej(
+              error.message ||
+                t('core:message.error.generic', {
+                  postProcess: 'capitalizeFirst',
+                })
+            );
           });
       });
     } catch (error) {
@@ -760,12 +795,22 @@ export const ChatGroup = ({
 
   const sendMessage = async () => {
     try {
-      if (messageSize > 4000) return;
+      if (messageSize > 4000) return; // TODO magic number
       if (isPrivate === null)
-        throw new Error('Unable to determine if group is private');
+        throw new Error(
+          t('group:message.error.unable_determine_group_private', {
+            postProcess: 'capitalizeFirst',
+          })
+        );
       if (isSending) return;
       if (+balance < 4)
-        throw new Error('You need at least 4 QORT to send a message');
+        // TODO magic number
+        throw new Error(
+          t('group:message.error.qortals_required', {
+            quantity: 4,
+            postProcess: 'capitalizeFirst',
+          })
+        );
       pauseAllQueues();
       if (editorRef.current) {
         const htmlContent = editorRef.current.getHTML();
@@ -782,35 +827,50 @@ export const ChatGroup = ({
         if (replyMessage?.chatReference) {
           repliedTo = replyMessage?.chatReference;
         }
-        let chatReference = onEditMessage?.signature;
+
+        const chatReference = onEditMessage?.signature;
 
         const publicData = isPrivate
           ? {}
           : {
               isEdited: chatReference ? true : false,
             };
-        const imagesToPublish = [];
+
+        interface ImageToPublish {
+          service: string;
+          identifier: string;
+          name: string;
+          base64: string;
+        }
+
+        const imagesToPublish: ImageToPublish[] = [];
         const deleteImage =
           onEditMessage && isDeleteImage && messageHasImage(onEditMessage);
+
         if (deleteImage) {
           const fee = await getFee('ARBITRARY');
-
           await show({
             publishFee: fee.fee + ' QORT',
-            message: 'Would you like to delete your previous chat image?',
+            message: t('core:message.question.delete_chat_image', {
+              postProcess: 'capitalizeFirst',
+            }),
           });
+
+          // TODO magic string
           await window.sendMessage('publishOnQDN', {
             data: 'RA==',
             identifier: onEditMessage?.images[0]?.identifier,
             service: onEditMessage?.images[0]?.service,
           });
         }
+
         if (chatImagesToSave?.length > 0) {
           const imageToSave = chatImagesToSave[0];
 
           const base64ToSave = isPrivate
             ? await encryptChatMessage(imageToSave, secretKeyObject)
             : imageToSave;
+
           // 1 represents public group, 0 is private
           const identifier = `grp-q-manager_${isPrivate ? 0 : 1}_group_${selectedGroup}_${uidImages.rnd()}`;
           imagesToPublish.push({
@@ -822,14 +882,18 @@ export const ChatGroup = ({
 
           const res = await window.sendMessage(
             'PUBLISH_MULTIPLE_QDN_RESOURCES',
-
             {
               resources: imagesToPublish,
             },
             240000,
             true
           );
-          if (res !== true) throw new Error('Unable to publish images');
+          if (res !== true)
+            throw new Error(
+              t('core:message.error.unable_publish_image', {
+                postProcess: 'capitalizeFirst',
+              })
+            );
         }
 
         const images =
@@ -868,7 +932,6 @@ export const ChatGroup = ({
           isPrivate === false
             ? JSON.stringify(objectMessage)
             : await encryptChatMessage(message64, secretKeyObject);
-        // const res = await sendChatGroup({groupId: selectedGroup,messageText: encryptSingle})
 
         const sendMessageFunc = async () => {
           return await sendChatGroup({
@@ -979,18 +1042,25 @@ export const ChatGroup = ({
       .setContent(message?.messageText || message?.text)
       .run();
   }, []);
+
   const handleReaction = useCallback(
     async (reaction, chatMessage, reactionState = true) => {
       try {
         if (isSending) return;
         if (+balance < 4)
-          throw new Error('You need at least 4 QORT to send a message');
-        pauseAllQueues();
+          // TODO magic number
+          throw new Error(
+            t('group:message.error.qortals_required', {
+              quantity: 4,
+              postProcess: 'capitalizeFirst',
+            })
+          );
 
+        pauseAllQueues();
         setIsSending(true);
+
         const message = '';
         const secretKeyObject = await getSecretKey(false, true);
-
         const otherData = {
           specialId: uid.rnd(),
           type: 'reaction',
@@ -1011,8 +1081,6 @@ export const ChatGroup = ({
                 secretKeyObject,
                 reactiontypeNumber
               );
-        // const res = await sendChatGroup({groupId: selectedGroup,messageText: encryptSingle})
-
         const sendMessageFunc = async () => {
           return await sendChatGroup({
             groupId: selectedGroup,
@@ -1033,12 +1101,6 @@ export const ChatGroup = ({
           chatReference: chatMessage.signature,
         };
         addToQueue(sendMessageFunc, messageObj, 'chat-reaction', selectedGroup);
-        // setTimeout(() => {
-        //   executeEvent("sent-new-message-group", {})
-        // }, 150);
-        // clearEditorContent()
-        // setReplyMessage(null)
-
         // send chat message
       } catch (error) {
         const errorMsg = error?.message || error;
@@ -1070,7 +1132,9 @@ export const ChatGroup = ({
       ) {
         setInfoSnack({
           type: 'error',
-          message: 'This message already has an image',
+          message: t('core:message.generic.message_with_image', {
+            postProcess: 'capitalizeFirst',
+          }),
         });
         setOpenSnack(true);
         return;
@@ -1079,6 +1143,7 @@ export const ChatGroup = ({
     },
     [chatImagesToSave, onEditMessage?.images, isDeleteImage]
   );
+
   return (
     <div
       style={{
@@ -1087,34 +1152,36 @@ export const ChatGroup = ({
         height: '100%',
         left: hide && '-100000px',
         opacity: hide ? 0 : 1,
+        padding: '10px',
         position: hide ? 'absolute' : 'relative',
         width: '100%',
-        padding: '10px',
       }}
     >
       <ChatList
-        isPrivate={isPrivate}
-        hasSecretKey={!!secretKey}
-        openQManager={openQManager}
-        enableMentions
-        onReply={onReply}
-        onEdit={onEdit}
         chatId={selectedGroup}
-        initialMessages={messages}
-        myAddress={myAddress}
-        tempMessages={tempMessages}
-        handleReaction={handleReaction}
         chatReferences={chatReferences}
-        tempChatReferences={tempChatReferences}
+        enableMentions
+        handleReaction={handleReaction}
+        hasSecretKey={!!secretKey}
+        initialMessages={messages}
+        isPrivate={isPrivate}
         members={members}
+        myAddress={myAddress}
         myName={myName}
+        onEdit={onEdit}
+        onReply={onReply}
+        openQManager={openQManager}
         selectedGroup={selectedGroup}
+        tempChatReferences={tempChatReferences}
+        tempMessages={tempMessages}
       />
 
       {(!!secretKey || isPrivate === false) && (
         <div
           style={{
             backgroundColor: theme.palette.background.surface,
+            border: `1px solid ${theme.palette.border.subtle}`,
+            borderRadius: '10px',
             bottom: isFocusedParent ? '0px' : 'unset',
             boxSizing: 'border-box',
             display: 'flex',
@@ -1127,8 +1194,6 @@ export const ChatGroup = ({
             top: isFocusedParent ? '0px' : 'unset',
             width: '100%',
             zIndex: isFocusedParent ? 5 : 'unset',
-            border: `1px solid ${theme.palette.border.subtle}`,
-            borderRadius: '10px',
           }}
         >
           <div
@@ -1146,9 +1211,9 @@ export const ChatGroup = ({
               sx={{
                 alignItems: 'flex-start',
                 display: 'flex',
-                width: '100%',
-                gap: '10px',
                 flexWrap: 'wrap',
+                gap: '10px',
+                width: '100%',
               }}
             >
               {!isDeleteImage &&
@@ -1158,19 +1223,20 @@ export const ChatGroup = ({
                   <div
                     key={index}
                     style={{
-                      position: 'relative',
                       height: '50px',
+                      position: 'relative',
                       width: '50px',
                     }}
                   >
                     <ImageIcon
                       color="primary"
                       sx={{
+                        borderRadius: '3px',
                         height: '100%',
                         width: '100%',
-                        borderRadius: '3px',
                       }}
                     />
+
                     <Tooltip title="Delete image">
                       <IconButton
                         onClick={() => setIsDeleteImage(true)}
@@ -1200,12 +1266,13 @@ export const ChatGroup = ({
                     </Tooltip>
                   </div>
                 ))}
+
               {chatImagesToSave.map((imgBase64, index) => (
                 <div
                   key={index}
                   style={{
-                    position: 'relative',
                     height: '50px',
+                    position: 'relative',
                     width: '50px',
                   }}
                 >
@@ -1218,6 +1285,7 @@ export const ChatGroup = ({
                       borderRadius: '3px',
                     }}
                   />
+
                   <Tooltip title="Remove image">
                     <IconButton
                       onClick={() =>
@@ -1252,6 +1320,7 @@ export const ChatGroup = ({
                 </div>
               ))}
             </Box>
+
             {replyMessage && (
               <Box
                 sx={{
@@ -1276,6 +1345,7 @@ export const ChatGroup = ({
                 </ButtonBase>
               </Box>
             )}
+
             {onEditMessage && (
               <Box
                 sx={{
@@ -1321,13 +1391,19 @@ export const ChatGroup = ({
                   width: '100%',
                 }}
               >
-                <Typography
+                <Typography //TODO magic number
                   sx={{
                     fontSize: '12px',
                     color:
                       messageSize > 4000 ? theme.palette.other.danger : 'unset',
                   }}
-                >{`Your message size is of ${messageSize} bytes out of a maximum of 4000`}</Typography>
+                >
+                  {t('core:message.error.message_size', {
+                    maximum: 4000,
+                    size: messageSize,
+                    postProcess: 'capitalizeFirst',
+                  })}
+                </Typography>
               </Box>
             )}
           </div>
@@ -1378,6 +1454,7 @@ export const ChatGroup = ({
           </Box>
         </div>
       )}
+
       {isOpenQManager !== null && (
         <Box
           sx={{
@@ -1417,6 +1494,7 @@ export const ChatGroup = ({
               }}
             >
               <Typography>Q-Manager</Typography>
+
               <ButtonBase
                 onClick={() => {
                   setIsOpenQManager(false);
@@ -1429,14 +1507,16 @@ export const ChatGroup = ({
                 />
               </ButtonBase>
             </Box>
+
             <Divider />
+
             <AppViewerContainer
               customHeight="560px"
               app={{
-                tabId: '5558588',
                 name: 'Q-Manager',
-                service: 'APP',
                 path: `?groupId=${selectedGroup}`,
+                service: 'APP',
+                tabId: '5558588',
               }}
               isSelected
             />
@@ -1447,7 +1527,7 @@ export const ChatGroup = ({
       <LoadingSnackbar
         open={isLoading}
         info={{
-          message: 'Loading chat... please wait.',
+          message: t('core:loading.chat', { postProcess: 'capitalizeFirst' }),
         }}
       />
 
diff --git a/src/components/Chat/ChatList.tsx b/src/components/Chat/ChatList.tsx
index a7adc41..0589832 100644
--- a/src/components/Chat/ChatList.tsx
+++ b/src/components/Chat/ChatList.tsx
@@ -5,6 +5,7 @@ import { subscribeToEvent, unsubscribeFromEvent } from '../../utils/events';
 import { Box, Button, Typography, useTheme } from '@mui/material';
 import { ChatOptions } from './ChatOptions';
 import ErrorBoundary from '../../common/ErrorBoundary';
+import { useTranslation } from 'react-i18next';
 
 export const ChatList = ({
   initialMessages,
@@ -180,6 +181,7 @@ export const ChatList = ({
   }, []);
 
   const theme = useTheme();
+  const { t } = useTranslation(['auth', 'core', 'group']);
 
   return (
     <Box
@@ -202,11 +204,11 @@ export const ChatList = ({
           ref={parentRef}
           className="List"
           style={{
+            display: 'flex',
             flexGrow: 1,
+            height: '0px',
             overflow: 'auto',
             position: 'relative',
-            display: 'flex',
-            height: '0px',
           }}
         >
           <div
@@ -324,19 +326,23 @@ export const ChatList = ({
                     <div
                       key={virtualRow.index}
                       style={{
-                        position: 'absolute',
-                        top: 0,
-                        left: '50%',
-                        transform: `translateY(${virtualRow.start}px) translateX(-50%)`,
-                        width: '100%',
-                        padding: '10px 0',
-                        display: 'flex',
                         alignItems: 'center',
+                        display: 'flex',
                         flexDirection: 'column',
                         gap: '5px',
+                        left: '50%',
+                        padding: '10px 0',
+                        position: 'absolute',
+                        top: 0,
+                        transform: `translateY(${virtualRow.start}px) translateX(-50%)`,
+                        width: '100%',
                       }}
                     >
-                      <Typography>Error loading message.</Typography>
+                      <Typography>
+                        {t('core:message.error.message_loading', {
+                          postProcess: 'capitalizeFirst',
+                        })}
+                      </Typography>
                     </div>
                   );
                 }
@@ -363,26 +369,28 @@ export const ChatList = ({
                     <ErrorBoundary
                       fallback={
                         <Typography>
-                          Error loading content: Invalid Data
+                          {t('group:message.generic.invalid_data', {
+                            postProcess: 'capitalizeFirst',
+                          })}
                         </Typography>
                       }
                     >
                       <MessageItem
+                        handleReaction={handleReaction}
                         isLast={index === messages.length - 1}
+                        isPrivate={isPrivate}
+                        isTemp={!!message?.isTemp}
+                        isUpdating={isUpdating}
                         lastSignature={lastSignature}
                         message={message}
-                        onSeen={handleMessageSeen}
-                        isTemp={!!message?.isTemp}
                         myAddress={myAddress}
-                        onReply={onReply}
                         onEdit={onEdit}
+                        onReply={onReply}
+                        onSeen={handleMessageSeen}
+                        reactions={reactions}
                         reply={reply}
                         replyIndex={replyIndex}
                         scrollToItem={goToMessage}
-                        handleReaction={handleReaction}
-                        reactions={reactions}
-                        isUpdating={isUpdating}
-                        isPrivate={isPrivate}
                       />
                     </ErrorBoundary>
                   </div>
@@ -391,6 +399,7 @@ export const ChatList = ({
             </div>
           </div>
         </div>
+
         {showScrollButton && (
           <button
             onClick={() => scrollToBottom()}
@@ -408,9 +417,12 @@ export const ChatList = ({
               zIndex: 10,
             }}
           >
-            Scroll to Unread Messages
+            {t('group:action.scroll_unread_messages', {
+              postProcess: 'capitalizeFirst',
+            })}
           </button>
         )}
+
         {showScrollDownButton && !showScrollButton && (
           <Button
             onClick={() => scrollToBottom()}
@@ -431,10 +443,13 @@ export const ChatList = ({
               textTransform: 'none',
             }}
           >
-            Scroll to bottom
+            {t('group:action.scroll_unread_messages', {
+              postProcess: 'capitalizeFirst',
+            })}
           </Button>
         )}
       </div>
+
       {enableMentions && (hasSecretKey || isPrivate === false) && (
         <ChatOptions
           openQManager={openQManager}
diff --git a/src/components/Chat/ChatOptions.tsx b/src/components/Chat/ChatOptions.tsx
index 0ec1866..9afd134 100644
--- a/src/components/Chat/ChatOptions.tsx
+++ b/src/components/Chat/ChatOptions.tsx
@@ -24,7 +24,6 @@ import {
   AppsSearchLeft,
   AppsSearchRight,
 } from '../Apps/Apps-styles';
-
 import IconClearInput from '../../assets/svgs/ClearInput.svg';
 import { CellMeasurerCache } from 'react-virtualized';
 import { getBaseApiReact } from '../../App';
@@ -35,6 +34,7 @@ import { ContextMenuMentions } from '../ContextMenuMentions';
 import { convert } from 'html-to-text';
 import { generateHTML } from '@tiptap/react';
 import ErrorBoundary from '../../common/ErrorBoundary';
+import { useTranslation } from 'react-i18next';
 
 const extractTextFromHTML = (htmlString = '') => {
   return convert(htmlString, {
@@ -60,10 +60,12 @@ export const ChatOptions = ({
   const [searchValue, setSearchValue] = useState('');
   const [selectedMember, setSelectedMember] = useState(0);
   const theme = useTheme();
+  const { t } = useTranslation(['auth', 'core', 'group']);
   const parentRef = useRef(null);
   const parentRefMentions = useRef(null);
   const [lastMentionTimestamp, setLastMentionTimestamp] = useState(null);
   const [debouncedValue, setDebouncedValue] = useState(''); // Debounced value
+
   const messages = useMemo(() => {
     return untransformedMessages?.map((item) => {
       if (item?.messageText) {
@@ -80,7 +82,7 @@ export const ChatOptions = ({
             messageText: transformedMessage,
           };
         } catch (error) {
-          // error
+          console.log(error);
         }
       } else return item;
     });
@@ -102,7 +104,12 @@ export const ChatOptions = ({
             rej(response.error);
           })
           .catch((error) => {
-            rej(error.message || 'An error occurred');
+            rej(
+              error.message ||
+                t('core:message.error.generic', {
+                  postProcess: 'capitalizeFirst',
+                })
+            );
           });
       });
     } catch (error) {
@@ -154,6 +161,7 @@ export const ChatOptions = ({
       }
       return [];
     }
+
     if (selectedMember) {
       return messages
         .filter(
@@ -165,6 +173,7 @@ export const ChatOptions = ({
         )
         ?.sort((a, b) => b?.timestamp - a?.timestamp);
     }
+
     return messages
       .filter((message) =>
         extractTextFromHTML(
@@ -187,6 +196,7 @@ export const ChatOptions = ({
         )
         ?.sort((a, b) => b?.timestamp - a?.timestamp);
     }
+
     return messages
       .filter((message) =>
         extractTextFromHTML(message?.decryptedData?.message)?.includes(
@@ -251,6 +261,7 @@ export const ChatOptions = ({
             }}
           />
         </Box>
+
         <Box
           sx={{
             alignItems: 'center',
@@ -268,9 +279,12 @@ export const ChatOptions = ({
                 color: theme.palette.text.primary,
               }}
             >
-              No results
+              {t('core:message.generic.no_results', {
+                postProcess: 'capitalizeFirst',
+              })}
             </Typography>
           )}
+
           <Box
             sx={{
               display: 'flex',
@@ -387,6 +401,7 @@ export const ChatOptions = ({
             }}
           />
         </Box>
+
         <Box
           sx={{
             alignItems: 'center',
@@ -415,6 +430,7 @@ export const ChatOptions = ({
                 }}
               />
             </AppsSearchLeft>
+
             <AppsSearchRight>
               {searchValue && (
                 <ButtonBase
@@ -427,6 +443,7 @@ export const ChatOptions = ({
               )}
             </AppsSearchRight>
           </AppsSearchContainer>
+
           <Box
             sx={{
               alignItems: 'center',
@@ -444,8 +461,11 @@ export const ChatOptions = ({
               value={selectedMember}
             >
               <MenuItem value={0}>
-                <em>By member</em>
+                <em>
+                  {t('core:sort.by_member', { postProcess: 'capitalizeFirst' })}
+                </em>
               </MenuItem>
+
               {members?.map((member) => {
                 return (
                   <MenuItem key={member} value={member}>
@@ -454,6 +474,7 @@ export const ChatOptions = ({
                 );
               })}
             </Select>
+
             {!!selectedMember && (
               <CloseIcon
                 onClick={() => {
@@ -475,9 +496,12 @@ export const ChatOptions = ({
                 color: theme.palette.text.secondary,
               }}
             >
-              No results
+              {t('core:message.generic.no_results', {
+                postProcess: 'capitalizeFirst',
+              })}
             </Typography>
           )}
+
           <Box
             sx={{
               display: 'flex',
@@ -544,7 +568,9 @@ export const ChatOptions = ({
                           <ErrorBoundary
                             fallback={
                               <Typography>
-                                Error loading content: Invalid Data
+                                {t('group:message.generic.invalid_data', {
+                                  postProcess: 'capitalizeFirst',
+                                })}
                               </Typography>
                             }
                           >
@@ -566,6 +592,7 @@ export const ChatOptions = ({
       </Box>
     );
   }
+
   return (
     <Box
       sx={{
@@ -605,7 +632,7 @@ export const ChatOptions = ({
                   fontWeight: 700,
                 }}
               >
-                SEARCH
+                {t('core:action.search', { postProcess: 'capitalizeAll' })}
               </span>
             }
             placement="left"
@@ -628,6 +655,7 @@ export const ChatOptions = ({
             <SearchIcon />
           </Tooltip>
         </ButtonBase>
+
         <ButtonBase
           onClick={() => {
             setMode('default');
@@ -645,7 +673,7 @@ export const ChatOptions = ({
                   fontWeight: 700,
                 }}
               >
-                Q-MANAGER
+                {t('core:q_apps.q_manager', { postProcess: 'capitalizeAll' })}
               </span>
             }
             placement="left"
@@ -668,6 +696,7 @@ export const ChatOptions = ({
             <InsertLinkIcon sx={{ color: theme.palette.text.primary }} />
           </Tooltip>
         </ButtonBase>
+
         <ContextMenuMentions
           getTimestampMention={getTimestampMention}
           groupId={selectedGroup}
@@ -688,7 +717,9 @@ export const ChatOptions = ({
                     fontWeight: 700,
                   }}
                 >
-                  MENTIONED
+                  {t('core:message.generic.mentioned', {
+                    postProcess: 'capitalizeAll',
+                  })}
                 </span>
               }
               placement="left"
@@ -767,6 +798,7 @@ const ShowMessage = ({ message, goToMessage, messages }) => {
           >
             {message?.senderName?.charAt(0)}
           </Avatar>
+
           <Typography
             sx={{
               fontWight: 600,
@@ -787,6 +819,7 @@ const ShowMessage = ({ message, goToMessage, messages }) => {
       >
         {formatTimestamp(message.timestamp)}
       </Typography>
+
       <Box
         style={{
           cursor: 'pointer',
diff --git a/src/components/Chat/CreateCommonSecret.tsx b/src/components/Chat/CreateCommonSecret.tsx
index 9cf3b79..b123a51 100644
--- a/src/components/Chat/CreateCommonSecret.tsx
+++ b/src/components/Chat/CreateCommonSecret.tsx
@@ -1,4 +1,4 @@
-import React, { useContext } from 'react';
+import { useContext, useState } from 'react';
 import { Box, Button, Typography, useTheme } from '@mui/material';
 import { CustomizedSnackbars } from '../Snackbar/Snackbar';
 import { LoadingButton } from '@mui/lab';
@@ -18,6 +18,7 @@ import { base64ToUint8Array } from '../../qdn/encryption/group-encryption';
 import { uint8ArrayToObject } from '../../backgroundFunctions/encryption';
 import { useSetAtom } from 'jotai';
 import { txListAtom } from '../../atoms/global';
+import { useTranslation } from 'react-i18next';
 
 export const CreateCommonSecret = ({
   groupId,
@@ -34,14 +35,14 @@ export const CreateCommonSecret = ({
   const { show } = useContext(MyContext);
   const setTxList = useSetAtom(txListAtom);
 
-  const [openSnack, setOpenSnack] = React.useState(false);
-  const [infoSnack, setInfoSnack] = React.useState(null);
-  const [isLoading, setIsLoading] = React.useState(false);
+  const [openSnack, setOpenSnack] = useState(false);
+  const [infoSnack, setInfoSnack] = useState(null);
+  const [isLoading, setIsLoading] = useState(false);
 
   const theme = useTheme();
+  const { t } = useTranslation(['auth', 'core', 'group']);
 
   const getPublishesFromAdmins = async (admins: string[]) => {
-    // const validApi = await findUsableApi();
     const queryString = admins.map((name) => `name=${name}`).join('&');
     const url = `${getBaseApiReact()}${getArbitraryEndpointReact()}?mode=ALL&service=DOCUMENT_PRIVATE&identifier=symmetric-qchat-group-${
       groupId
@@ -55,9 +56,11 @@ export const CreateCommonSecret = ({
     const filterId = adminData.filter(
       (data: any) => data.identifier === `symmetric-qchat-group-${groupId}`
     );
+
     if (filterId?.length === 0) {
       return false;
     }
+
     const sortedData = filterId.sort((a: any, b: any) => {
       // Get the most recent date for both a and b
       const dateA = a.updated ? new Date(a.updated) : new Date(a.created);
@@ -78,8 +81,13 @@ export const CreateCommonSecret = ({
       pauseAllQueues();
 
       const { names } = await getGroupAdmins(groupId);
+
       if (!names.length) {
-        throw new Error('Network error');
+        throw new Error(
+          t('core:message.error.network_generic', {
+            postProcess: 'capitalizeFirst',
+          })
+        );
       }
       const publish = await getPublishesFromAdmins(names);
 
@@ -92,15 +100,18 @@ export const CreateCommonSecret = ({
           publish.identifier
         }?encoding=base64&rebuild=true`
       );
+
       const data = await res.text();
-
       const decryptedKey: any = await decryptResource(data);
-
       const dataint8Array = base64ToUint8Array(decryptedKey.data);
       const decryptedKeyToObject = uint8ArrayToObject(dataint8Array);
 
       if (!validateSecretKey(decryptedKeyToObject))
-        throw new Error('SecretKey is not valid');
+        throw new Error(
+          t('auth:message.error.invalid_secret_key', {
+            postProcess: 'capitalizeFirst',
+          })
+        );
 
       if (decryptedKeyToObject) {
         return decryptedKeyToObject;
@@ -113,17 +124,31 @@ export const CreateCommonSecret = ({
   const createCommonSecret = async () => {
     try {
       const fee = await getFee('ARBITRARY');
+
       await show({
-        message: 'Would you like to perform an ARBITRARY transaction?',
+        message: t('core:message.question.perform_transaction', {
+          action: 'ARBITRARY',
+          postProcess: 'capitalizeFirst',
+        }),
         publishFee: fee.fee + ' QORT',
       });
       setIsLoading(true);
 
       const secretKey2 = await getSecretKey();
+
       if (!secretKey2 && secretKey2 !== false)
-        throw new Error('invalid secret key');
+        throw new Error(
+          t('auth:message.error.invalid_secret_key', {
+            postProcess: 'capitalizeFirst',
+          })
+        );
+
       if (secretKey2 && !validateSecretKey(secretKey2))
-        throw new Error('invalid secret key');
+        throw new Error(
+          t('auth:message.error.invalid_secret_key', {
+            postProcess: 'capitalizeFirst',
+          })
+        );
 
       const secretKeyToSend = !secretKey2 ? null : secretKey2;
 
@@ -136,16 +161,26 @@ export const CreateCommonSecret = ({
           if (!response?.error) {
             setInfoSnack({
               type: 'success',
-              message:
-                'Successfully re-encrypted secret key. It may take a couple of minutes for the changes to propagate. Refresh the group in 5 mins.',
+              message: t('auth:message.success.reencrypted_secret_key', {
+                postProcess: 'capitalizeFirst',
+              }),
             });
             setOpenSnack(true);
             setTxList((prev) => [
               {
                 ...response,
                 type: 'created-common-secret',
-                label: `Published secret key for group ${groupId}: awaiting confirmation`,
-                labelDone: `Published secret key for group ${groupId}: success!`,
+                label: t('group:message.success.published_secret_key', {
+                  group_id: groupId,
+                  postProcess: 'capitalizeFirst',
+                }),
+                labelDone: t(
+                  'group:message.success.published_secret_key_label',
+                  {
+                    group_id: groupId,
+                    postProcess: 'capitalizeFirst',
+                  }
+                ),
                 done: false,
                 groupId,
               },
@@ -187,13 +222,15 @@ export const CreateCommonSecret = ({
         variant="contained"
         onClick={createCommonSecret}
       >
-        Re-encrypt key
+        {t('auth:action.reencrypt_key', { postProcess: 'capitalizeFirst' })}
       </LoadingButton>
 
       {noSecretKey ? (
         <Box>
           <Typography>
-            There is no group secret key. Be the first admin to publish one!
+            {t('group:message.generic.group_no_secret_key', {
+              postProcess: 'capitalizeFirst',
+            })}
           </Typography>
         </Box>
       ) : isOwner &&
@@ -202,14 +239,17 @@ export const CreateCommonSecret = ({
         userInfo.name !== secretKeyDetails?.name ? (
         <Box>
           <Typography>
-            The latest group secret key was published by a non-owner. As the
-            owner of the group please re-encrypt the key as a safeguard
+            {t('group:message.generic.group_secret_key_no_owner', {
+              postProcess: 'capitalizeFirst',
+            })}
           </Typography>
         </Box>
       ) : isForceShowCreationKeyPopup ? null : (
         <Box>
           <Typography>
-            The group member list has changed. Please re-encrypt the secret key.
+            {t('group:message.generic.group_member_list_changed', {
+              postProcess: 'capitalizeFirst',
+            })}
           </Typography>
         </Box>
       )}
@@ -228,7 +268,7 @@ export const CreateCommonSecret = ({
           }}
           size="small"
         >
-          Hide
+          {t('core:action.hide', { postProcess: 'capitalizeFirst' })}
         </Button>
       </Box>
 
diff --git a/src/components/Chat/GroupAnnouncements.tsx b/src/components/Chat/GroupAnnouncements.tsx
index abb4860..584e9bd 100644
--- a/src/components/Chat/GroupAnnouncements.tsx
+++ b/src/components/Chat/GroupAnnouncements.tsx
@@ -1,7 +1,9 @@
-import React, {
+import {
   useCallback,
+  useContext,
   useEffect,
   useMemo,
+  useReducer,
   useRef,
   useState,
 } from 'react';
@@ -140,9 +142,9 @@ export const GroupAnnouncements = ({
   const [selectedAnnouncement, setSelectedAnnouncement] = useState(null);
   const [isFocusedParent, setIsFocusedParent] = useState(false);
 
-  const { show } = React.useContext(MyContext);
-  const [openSnack, setOpenSnack] = React.useState(false);
-  const [infoSnack, setInfoSnack] = React.useState(null);
+  const { show } = useContext(MyContext);
+  const [openSnack, setOpenSnack] = useState(false);
+  const [infoSnack, setInfoSnack] = useState(null);
   const hasInitialized = useRef(false);
   const hasInitializedWebsocket = useRef(false);
   const editorRef = useRef(null);
@@ -150,12 +152,13 @@ export const GroupAnnouncements = ({
   const setEditorRef = (editorInstance) => {
     editorRef.current = editorInstance;
   };
-  const [, forceUpdate] = React.useReducer((x) => x + 1, 0);
-  const { t } = useTranslation(['core', 'group']);
+  const [, forceUpdate] = useReducer((x) => x + 1, 0);
+  const { t } = useTranslation(['auth', 'core', 'group']);
 
   const triggerRerender = () => {
     forceUpdate(); // Trigger re-render by updating the state
   };
+
   useEffect(() => {
     if (!selectedGroup) return;
     (async () => {
@@ -231,7 +234,12 @@ export const GroupAnnouncements = ({
             rej(response.error);
           })
           .catch((error) => {
-            rej(error.message || 'An error occurred');
+            rej(
+              error.message ||
+                t('core:message.error.generic', {
+                  postProcess: 'capitalizeFirst',
+                })
+            );
           });
       });
     } catch (error) {
@@ -254,7 +262,12 @@ export const GroupAnnouncements = ({
           rej(response.error);
         })
         .catch((error) => {
-          rej(error.message || 'An error occurred');
+          rej(
+            error.message ||
+              t('core:message.error.generic', {
+                postProcess: 'capitalizeFirst',
+              })
+          );
         });
     });
   };
@@ -289,7 +302,7 @@ export const GroupAnnouncements = ({
       const fee = await getFee('ARBITRARY');
 
       await show({
-        message: t('core:question.perform_transaction', {
+        message: t('core:message.question.perform_transaction', {
           action: 'ARBITRARY',
           postProcess: 'capitalizeFirst',
         }),
@@ -334,7 +347,7 @@ export const GroupAnnouncements = ({
         setTempData(selectedGroup);
         clearEditorContent();
       }
-      // TODO send chat message
+      // send chat message
     } catch (error) {
       if (!error) return;
       setInfoSnack({
@@ -348,7 +361,7 @@ export const GroupAnnouncements = ({
     }
   };
 
-  const getAnnouncements = React.useCallback(
+  const getAnnouncements = useCallback(
     async (selectedGroup, isPrivate) => {
       try {
         const offset = 0;
@@ -384,7 +397,7 @@ export const GroupAnnouncements = ({
     [secretKey]
   );
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (!secretKey && isPrivate) return;
     if (
       selectedGroup &&
@@ -429,7 +442,7 @@ export const GroupAnnouncements = ({
 
   const theme = useTheme();
 
-  const checkNewMessages = React.useCallback(async () => {
+  const checkNewMessages = useCallback(async () => {
     try {
       const identifier = `grp-${selectedGroup}-anc-`;
       const url = `${getBaseApiReact()}${getArbitraryEndpointReact()}?mode=ALL&service=DOCUMENT&identifier=${identifier}&limit=20&includemetadata=false&offset=${0}&reverse=true&prefix=true`;
@@ -583,7 +596,9 @@ export const GroupAnnouncements = ({
               fontSize: '30px',
             }}
           />
-          Group Announcements
+          {t('group:message.generic.group_announcement', {
+            postProcess: 'capitalizeFirst',
+          })}
         </Box>
 
         <Spacer height={'25px'} />
@@ -602,10 +617,13 @@ export const GroupAnnouncements = ({
               fontSize: '16px',
             }}
           >
-            No announcements
+            {t('group:message.generic.no_announcement', {
+              postProcess: 'capitalizeFirst',
+            })}
           </Typography>
         </Box>
       )}
+
       <AnnouncementList
         announcementData={announcementData}
         initialMessages={combinedListTempAndReal}
@@ -686,7 +704,7 @@ export const GroupAnnouncements = ({
                   padding: '5px',
                 }}
               >
-                {` Close`}
+                {t('core:action.close', { postProcess: 'capitalizeFirst' })}
               </CustomButton>
             )}
 
@@ -720,7 +738,9 @@ export const GroupAnnouncements = ({
                   }}
                 />
               )}
-              {` Publish Announcement`}
+              {t('group:action.publish_announcement', {
+                postProcess: 'capitalizeFirst',
+              })}
             </CustomButton>
           </Box>
         </div>
@@ -736,7 +756,9 @@ export const GroupAnnouncements = ({
       <LoadingSnackbar
         open={isLoading}
         info={{
-          message: 'Loading announcements... please wait.',
+          message: t('core:loading.announcements', {
+            postProcess: 'capitalizeFirst',
+          }),
         }}
       />
     </div>
diff --git a/src/components/Chat/GroupAvatar.tsx b/src/components/Chat/GroupAvatar.tsx
index 8e00911..0ef86ed 100644
--- a/src/components/Chat/GroupAvatar.tsx
+++ b/src/components/Chat/GroupAvatar.tsx
@@ -20,6 +20,7 @@ import { getFee } from '../../background';
 import { fileToBase64 } from '../../utils/fileReading';
 import { LoadingButton } from '@mui/lab';
 import ErrorIcon from '@mui/icons-material/Error';
+import { useTranslation } from 'react-i18next';
 
 export const GroupAvatar = ({
   myName,
@@ -32,7 +33,7 @@ export const GroupAvatar = ({
   const [avatarFile, setAvatarFile] = useState(null);
   const [tempAvatar, setTempAvatar] = useState(null);
   const { show } = useContext(MyContext);
-
+  const { t } = useTranslation(['auth', 'core', 'group']);
   const [anchorEl, setAnchorEl] = useState(null);
   const [isLoading, setIsLoading] = useState(false);
   // Handle child element click to open Popover
@@ -68,6 +69,7 @@ export const GroupAvatar = ({
       console.log(error);
     }
   }, []);
+
   useEffect(() => {
     if (!myName || !groupId) return;
     checkIfAvatarExists(myName, groupId);
@@ -77,14 +79,24 @@ export const GroupAvatar = ({
     try {
       if (!groupId) return;
       const fee = await getFee('ARBITRARY');
+
       if (+balance < +fee.fee)
-        throw new Error(`Publishing an Avatar requires ${fee.fee}`);
+        throw new Error(
+          t('core:message.generic.avatar_publish_fee', {
+            fee: fee.fee,
+            postProcess: 'capitalizeFirst',
+          })
+        );
+
       await show({
-        message: 'Would you like to publish an avatar?',
+        message: t('core:message.question.publish_avatar', {
+          postProcess: 'capitalizeFirst',
+        }),
         publishFee: fee.fee + ' QORT',
       });
       setIsLoading(true);
       const avatarBase64 = await fileToBase64(avatarFile);
+
       await new Promise((res, rej) => {
         window
           .sendMessage('publishOnQDN', {
@@ -100,7 +112,12 @@ export const GroupAvatar = ({
             rej(response.error);
           })
           .catch((error) => {
-            rej(error.message || 'An error occurred');
+            rej(
+              error.message ||
+                t('core:message.error.generic', {
+                  postProcess: 'capitalizeFirst',
+                })
+            );
           });
       });
       setAvatarFile(null);
@@ -132,6 +149,7 @@ export const GroupAvatar = ({
         >
           {myName?.charAt(0)}
         </Avatar>
+
         <ButtonBase onClick={handleChildClick}>
           <Typography
             sx={{
@@ -139,9 +157,10 @@ export const GroupAvatar = ({
               opacity: 0.5,
             }}
           >
-            change avatar
+            {t('core:action.change_avatar', { postProcess: 'capitalizeFirst' })}
           </Typography>
         </ButtonBase>
+
         <PopoverComp
           myName={myName}
           avatarFile={avatarFile}
@@ -170,6 +189,7 @@ export const GroupAvatar = ({
         >
           {myName?.charAt(0)}
         </Avatar>
+
         <ButtonBase onClick={handleChildClick}>
           <Typography
             sx={{
@@ -177,9 +197,10 @@ export const GroupAvatar = ({
               opacity: 0.5,
             }}
           >
-            change avatar
+            {t('core:action.change_avatar', { postProcess: 'capitalizeFirst' })}
           </Typography>
         </ButtonBase>
+
         <PopoverComp
           myName={myName}
           avatarFile={avatarFile}
@@ -205,9 +226,10 @@ export const GroupAvatar = ({
             opacity: 0.5,
           }}
         >
-          set avatar
+          {t('core:action.set_avatar', { postProcess: 'capitalizeFirst' })}
         </Typography>
       </ButtonBase>
+
       <PopoverComp
         myName={myName}
         avatarFile={avatarFile}
@@ -235,6 +257,8 @@ const PopoverComp = ({
   myName,
 }) => {
   const theme = useTheme();
+  const { t } = useTranslation(['auth', 'core', 'group']);
+
   return (
     <Popover
       id={id}
@@ -256,19 +280,28 @@ const PopoverComp = ({
             fontSize: '12px',
           }}
         >
-          (500 KB max. for GIFS){' '}
+          {t('core:message.generic.avatar_size', {
+            size: 500, // TODO magic number
+            postProcess: 'capitalizeFirst',
+          })}
         </Typography>
+
         <ImageUploader onPick={(file) => setAvatarFile(file)}>
-          <Button variant="contained">Choose Image</Button>
+          <Button variant="contained">
+            {t('core:action.choose_image', { postProcess: 'capitalizeFirst' })}
+          </Button>
         </ImageUploader>
+
         {avatarFile?.name}
+
         <Spacer height="25px" />
+
         {!myName && (
           <Box
             sx={{
+              alignItems: 'center',
               display: 'flex',
               gap: '5px',
-              alignItems: 'center',
             }}
           >
             <ErrorIcon
@@ -277,19 +310,22 @@ const PopoverComp = ({
               }}
             />
             <Typography>
-              A registered name is required to set an avatar
+              {t('core:message.generic.avatar_registered_name', {
+                postProcess: 'capitalizeFirst',
+              })}
             </Typography>
           </Box>
         )}
 
         <Spacer height="25px" />
+
         <LoadingButton
           loading={isLoading}
           disabled={!avatarFile || !myName}
           onClick={publishAvatar}
           variant="contained"
         >
-          Publish avatar
+          {t('group:action.publish_avatar', { postProcess: 'capitalizeFirst' })}
         </LoadingButton>
       </Box>
     </Popover>
diff --git a/src/components/Chat/MentionList.tsx b/src/components/Chat/MentionList.tsx
index 06cea5c..e9f0f86 100644
--- a/src/components/Chat/MentionList.tsx
+++ b/src/components/Chat/MentionList.tsx
@@ -1,6 +1,9 @@
 import { forwardRef, useEffect, useImperativeHandle, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 export default forwardRef((props, ref) => {
+  const { t } = useTranslation(['auth', 'core', 'group']);
+
   const [selectedIndex, setSelectedIndex] = useState(0);
 
   const selectItem = (index) => {
@@ -61,7 +64,11 @@ export default forwardRef((props, ref) => {
           </button>
         ))
       ) : (
-        <div className="item">No result</div>
+        <div className="item">
+          {t('core:message.generic.no_results', {
+            postProcess: 'capitalizeFirst',
+          })}
+        </div>
       )}
     </div>
   );
diff --git a/src/components/Chat/MessageDisplay.tsx b/src/components/Chat/MessageDisplay.tsx
index 2bf3d6f..ac5cda3 100644
--- a/src/components/Chat/MessageDisplay.tsx
+++ b/src/components/Chat/MessageDisplay.tsx
@@ -171,8 +171,9 @@ export const MessageDisplay = ({ htmlContent, isReply }) => {
           }
         }
       } catch (error) {
-        //error
+        console.log(error);
       }
+
       const res = extractComponents(url);
       if (res) {
         const { service, name, identifier, path } = res;
diff --git a/src/components/Chat/MessageItem.tsx b/src/components/Chat/MessageItem.tsx
index a29e417..cc19ee3 100644
--- a/src/components/Chat/MessageItem.tsx
+++ b/src/components/Chat/MessageItem.tsx
@@ -1,4 +1,5 @@
-import React, {
+import {
+  memo,
   useCallback,
   useContext,
   useEffect,
@@ -47,6 +48,7 @@ import level9Img from '../../assets/badges/level-9.png';
 import level10Img from '../../assets/badges/level-10.png';
 import { Embed } from '../Embeds/Embed';
 import { buildImageEmbedLink, messageHasImage } from '../../utils/chat';
+import { useTranslation } from 'react-i18next';
 
 const getBadgeImg = (level) => {
   switch (level?.toString()) {
@@ -77,7 +79,7 @@ const getBadgeImg = (level) => {
   }
 };
 
-const UserBadge = React.memo(({ userInfo }) => {
+const UserBadge = memo(({ userInfo }) => {
   return (
     <Tooltip disableFocusListener title={`level ${userInfo ?? 0}`}>
       <img
@@ -92,7 +94,7 @@ const UserBadge = React.memo(({ userInfo }) => {
   );
 });
 
-export const MessageItem = React.memo(
+export const MessageItem = memo(
   ({
     message,
     onSeen,
@@ -168,12 +170,15 @@ export const MessageItem = React.memo(
     }, [message?.id]);
 
     const theme = useTheme();
+    const { t } = useTranslation(['auth', 'core', 'group']);
 
     return (
       <>
         {message?.divide && (
           <div className="unread-divider" id="unread-divider-id">
-            Unread messages below
+            {t('core:message.generic.unread_messages', {
+              postProcess: 'capitalizeFirst',
+            })}
           </div>
         )}
 
@@ -261,6 +266,7 @@ export const MessageItem = React.memo(
                     {message?.senderName || message?.sender}
                   </Typography>
                 </WrapperUserAction>
+
                 <Box
                   sx={{
                     display: 'flex',
@@ -278,6 +284,7 @@ export const MessageItem = React.memo(
                         <EditIcon />
                       </ButtonBase>
                     )}
+
                   {!isShowingAsReply && (
                     <ButtonBase
                       onClick={() => {
@@ -287,6 +294,7 @@ export const MessageItem = React.memo(
                       <ReplyIcon />
                     </ButtonBase>
                   )}
+
                   {!isShowingAsReply && handleReaction && (
                     <ReactionPicker
                       onReaction={(val) => {
@@ -306,6 +314,7 @@ export const MessageItem = React.memo(
                   )}
                 </Box>
               </Box>
+
               {reply && (
                 <>
                   <Spacer height="20px" />
@@ -332,6 +341,7 @@ export const MessageItem = React.memo(
                         flexShrink: 0,
                       }}
                     />
+
                     <Box
                       sx={{
                         padding: '5px',
@@ -343,11 +353,16 @@ export const MessageItem = React.memo(
                           fontWeight: 600,
                         }}
                       >
-                        Replied to {reply?.senderName || reply?.senderAddress}
+                        {t('core:message.generic.replied_to', {
+                          person: reply?.senderName || reply?.senderAddress,
+                          postProcess: 'capitalizeFirst',
+                        })}
                       </Typography>
+
                       {reply?.messageText && (
                         <MessageDisplay htmlContent={htmlReply} />
                       )}
+
                       {reply?.decryptedData?.type === 'notification' ? (
                         <MessageDisplay
                           htmlContent={reply.decryptedData?.data?.message}
@@ -359,6 +374,7 @@ export const MessageItem = React.memo(
                   </Box>
                 </>
               )}
+
               {htmlText && <MessageDisplay htmlContent={htmlText} />}
 
               {message?.decryptedData?.type === 'notification' ? (
@@ -453,14 +469,17 @@ export const MessageItem = React.memo(
                   >
                     <Box sx={{ p: 2 }}>
                       <Typography variant="subtitle1" sx={{ marginBottom: 1 }}>
-                        People who reacted with {selectedReaction}
+                        {t('core:message.generic.people_reaction', {
+                          reaction: selectedReaction,
+                          postProcess: 'capitalizeFirst',
+                        })}
                       </Typography>
 
                       <List
                         sx={{
-                          overflow: 'auto',
-                          maxWidth: '300px',
                           maxHeight: '300px',
+                          maxWidth: '300px',
+                          overflow: 'auto',
                         }}
                       >
                         {reactions[selectedReaction]?.map((reactionItem) => (
@@ -473,6 +492,7 @@ export const MessageItem = React.memo(
                           </ListItem>
                         ))}
                       </List>
+
                       <Button
                         variant="contained"
                         color="primary"
@@ -494,12 +514,17 @@ export const MessageItem = React.memo(
                         {reactions[selectedReaction]?.find(
                           (item) => item?.sender === myAddress
                         )
-                          ? 'Remove Reaction'
-                          : 'Add Reaction'}
+                          ? t('core:action.remove_reaction', {
+                              postProcess: 'capitalizeFirst',
+                            })
+                          : t('core:action.add_reaction', {
+                              postProcess: 'capitalizeFirst',
+                            })}
                       </Button>
                     </Box>
                   </Popover>
                 )}
+
                 <Box
                   sx={{
                     alignItems: 'center',
@@ -525,8 +550,12 @@ export const MessageItem = React.memo(
                       }}
                     >
                       {message?.status === 'failed-permanent'
-                        ? 'Failed to update'
-                        : 'Updating...'}
+                        ? t('core:message.error.update_failed', {
+                            postProcess: 'capitalizeFirst',
+                          })
+                        : t('core:message.generic.updating', {
+                            postProcess: 'capitalizeFirst',
+                          })}
                     </Typography>
                   ) : isTemp ? (
                     <Typography
@@ -537,8 +566,12 @@ export const MessageItem = React.memo(
                       }}
                     >
                       {message?.status === 'failed-permanent'
-                        ? 'Failed to send'
-                        : 'Sending...'}
+                        ? t('core:message.error.send_failed', {
+                            postProcess: 'capitalizeFirst',
+                          })
+                        : t('core:message.generic.sending', {
+                            postProcess: 'capitalizeFirst',
+                          })}
                     </Typography>
                   ) : (
                     <>
@@ -551,7 +584,9 @@ export const MessageItem = React.memo(
                             fontStyle: 'italic',
                           }}
                         >
-                          Edited
+                          {t('core:message.generic.edited', {
+                            postProcess: 'capitalizeFirst',
+                          })}
                         </Typography>
                       )}
                       <Typography
@@ -577,6 +612,7 @@ export const MessageItem = React.memo(
 
 export const ReplyPreview = ({ message, isEdit = false }) => {
   const theme = useTheme();
+  const { t } = useTranslation(['auth', 'core', 'group']);
 
   return (
     <Box
@@ -612,7 +648,9 @@ export const ReplyPreview = ({ message, isEdit = false }) => {
               fontWeight: 600,
             }}
           >
-            Editing Message
+            {t('core:message.generic.editing_message', {
+              postProcess: 'capitalizeFirst',
+            })}
           </Typography>
         ) : (
           <Typography
@@ -621,7 +659,10 @@ export const ReplyPreview = ({ message, isEdit = false }) => {
               fontWeight: 600,
             }}
           >
-            Replied to {message?.senderName || message?.senderAddress}
+            {t('core:message.generic.replied_to', {
+              person: message?.senderName || message?.senderAddress,
+              postProcess: 'capitalizeFirst',
+            })}
           </Typography>
         )}
 
diff --git a/src/components/Chat/TipTap.tsx b/src/components/Chat/TipTap.tsx
index 5890736..aad7f1b 100644
--- a/src/components/Chat/TipTap.tsx
+++ b/src/components/Chat/TipTap.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo, useRef } from 'react';
+import { memo, useCallback, useEffect, useMemo, useRef } from 'react';
 import { EditorProvider, useCurrentEditor } from '@tiptap/react';
 import StarterKit from '@tiptap/starter-kit';
 import { Color } from '@tiptap/extension-color';
@@ -31,6 +31,8 @@ import { isDisabledEditorEnterAtom } from '../../atoms/global.js';
 import { Box, Checkbox, Typography, useTheme } from '@mui/material';
 import { useAtom } from 'jotai';
 import { fileToBase64 } from '../../utils/fileReading/index.js';
+import { useTranslation } from 'react-i18next';
+import i18next from 'i18next';
 
 function textMatcher(doc, from) {
   const textBeforeCursor = doc.textBetween(0, from, ' ', ' ');
@@ -42,7 +44,7 @@ function textMatcher(doc, from) {
   return { start, query };
 }
 
-const MenuBar = React.memo(
+const MenuBar = memo(
   ({
     setEditorRef,
     isChat,
@@ -52,6 +54,7 @@ const MenuBar = React.memo(
     const { editor } = useCurrentEditor();
     const fileInputRef = useRef(null);
     const theme = useTheme();
+    const { t } = useTranslation(['auth', 'core', 'group']);
 
     useEffect(() => {
       if (editor && setEditorRef) {
@@ -143,6 +146,7 @@ const MenuBar = React.memo(
           >
             <FormatBoldIcon />
           </IconButton>
+
           <IconButton
             onClick={() => editor.chain().focus().toggleItalic().run()}
             disabled={!editor.can().chain().focus().toggleItalic().run()}
@@ -155,6 +159,7 @@ const MenuBar = React.memo(
           >
             <FormatItalicIcon />
           </IconButton>
+
           <IconButton
             onClick={() => editor.chain().focus().toggleStrike().run()}
             disabled={!editor.can().chain().focus().toggleStrike().run()}
@@ -167,6 +172,7 @@ const MenuBar = React.memo(
           >
             <StrikethroughSIcon />
           </IconButton>
+
           <IconButton
             onClick={() => editor.chain().focus().toggleCode().run()}
             disabled={!editor.can().chain().focus().toggleCode().run()}
@@ -179,6 +185,7 @@ const MenuBar = React.memo(
           >
             <CodeIcon />
           </IconButton>
+
           <IconButton
             onClick={() => editor.chain().focus().unsetAllMarks().run()}
             sx={{
@@ -194,6 +201,7 @@ const MenuBar = React.memo(
           >
             <FormatClearIcon />
           </IconButton>
+
           <IconButton
             onClick={() => editor.chain().focus().toggleBulletList().run()}
             sx={{
@@ -205,6 +213,7 @@ const MenuBar = React.memo(
           >
             <FormatListBulletedIcon />
           </IconButton>
+
           <IconButton
             onClick={() => editor.chain().focus().toggleOrderedList().run()}
             sx={{
@@ -216,6 +225,7 @@ const MenuBar = React.memo(
           >
             <FormatListNumberedIcon />
           </IconButton>
+
           <IconButton
             onClick={() => editor.chain().focus().toggleCodeBlock().run()}
             sx={{
@@ -227,6 +237,7 @@ const MenuBar = React.memo(
           >
             <DeveloperModeIcon />
           </IconButton>
+
           <IconButton
             onClick={() => editor.chain().focus().toggleBlockquote().run()}
             sx={{
@@ -238,6 +249,7 @@ const MenuBar = React.memo(
           >
             <FormatQuoteIcon />
           </IconButton>
+
           <IconButton
             onClick={() => editor.chain().focus().setHorizontalRule().run()}
             disabled={!editor.can().chain().focus().setHorizontalRule().run()}
@@ -245,6 +257,7 @@ const MenuBar = React.memo(
           >
             <HorizontalRuleIcon />
           </IconButton>
+
           <IconButton
             onClick={() =>
               editor.chain().focus().toggleHeading({ level: 1 }).run()
@@ -258,6 +271,7 @@ const MenuBar = React.memo(
           >
             <FormatHeadingIcon fontSize="small" />
           </IconButton>
+
           <IconButton
             onClick={() => editor.chain().focus().undo().run()}
             disabled={!editor.can().chain().focus().undo().run()}
@@ -265,6 +279,7 @@ const MenuBar = React.memo(
           >
             <UndoIcon />
           </IconButton>
+
           <IconButton
             onClick={() => editor.chain().focus().redo().run()}
             disabled={!editor.can().chain().focus().redo().run()}
@@ -272,13 +287,14 @@ const MenuBar = React.memo(
           >
             <RedoIcon />
           </IconButton>
+
           {isChat && (
             <Box
               sx={{
-                display: 'flex',
                 alignItems: 'center',
-                marginLeft: '5px',
                 cursor: 'pointer',
+                display: 'flex',
+                marginLeft: '5px',
               }}
               onClick={() => {
                 setIsDisabledEditorEnter(!isDisabledEditorEnter);
@@ -304,10 +320,13 @@ const MenuBar = React.memo(
                   color: theme.palette.text.primary,
                 }}
               >
-                disable enter
+                {t('core:action.disable_enter', {
+                  postProcess: 'capitalizeFirst',
+                })}
               </Typography>
             </Box>
           )}
+
           {!isChat && (
             <>
               <IconButton
@@ -319,6 +338,7 @@ const MenuBar = React.memo(
               >
                 <ImageIcon />
               </IconButton>
+
               <input
                 type="file"
                 ref={fileInputRef}
@@ -348,7 +368,7 @@ const extensions = [
     },
   }),
   Placeholder.configure({
-    placeholder: 'Start typing here...',
+    placeholder: 'Start typing here...', // doesn't work i18next.t('core:action.start_typing'),
   }),
   ImageResize,
 ];
@@ -416,12 +436,6 @@ export default ({
     setEditorRef(editorInstance);
   }, []);
 
-  // const users = [
-  //   { id: 1, label: 'Alice' },
-  //   { id: 2, label: 'Bob' },
-  //   { id: 3, label: 'Charlie' },
-  // ];
-
   const users = useMemo(() => {
     return (membersWithNames || [])?.map((item) => {
       return {
diff --git a/src/components/GlobalActions/JoinGroup.tsx b/src/components/GlobalActions/JoinGroup.tsx
index fc77d85..6b63257 100644
--- a/src/components/GlobalActions/JoinGroup.tsx
+++ b/src/components/GlobalActions/JoinGroup.tsx
@@ -70,7 +70,7 @@ export const JoinGroup = () => {
       const fee = await getFee('JOIN_GROUP');
 
       await show({
-        message: t('core:question.perform_transaction', {
+        message: t('core:message.question.perform_transaction', {
           action: 'JOIN_GROUP',
           postProcess: 'capitalizeFirst',
         }),
diff --git a/src/components/Group/AddGroup.tsx b/src/components/Group/AddGroup.tsx
index 24ac2da..dc12ed3 100644
--- a/src/components/Group/AddGroup.tsx
+++ b/src/components/Group/AddGroup.tsx
@@ -118,7 +118,7 @@ export const AddGroup = ({ address, open, setOpen }) => {
       const fee = await getFee('CREATE_GROUP');
 
       await show({
-        message: t('core:question.perform_transaction', {
+        message: t('core:message.question.perform_transaction', {
           action: 'CREATE_GROUP',
           postProcess: 'capitalizeFirst',
         }),
diff --git a/src/components/Group/AddGroupList.tsx b/src/components/Group/AddGroupList.tsx
index 06113a4..daf509c 100644
--- a/src/components/Group/AddGroupList.tsx
+++ b/src/components/Group/AddGroupList.tsx
@@ -113,7 +113,7 @@ export const AddGroupList = ({ setInfoSnack, setOpenSnack }) => {
       const fee = await getFee('JOIN_GROUP');
 
       await show({
-        message: t('core:question.perform_transaction', {
+        message: t('core:message.question.perform_transaction', {
           action: 'JOIN_GROUP',
           postProcess: 'capitalizeFirst',
         }),
diff --git a/src/components/Group/Forum/NewThread.tsx b/src/components/Group/Forum/NewThread.tsx
index 802f4a4..d37eedd 100644
--- a/src/components/Group/Forum/NewThread.tsx
+++ b/src/components/Group/Forum/NewThread.tsx
@@ -182,7 +182,7 @@ export const NewThread = ({
       const missingFields: string[] = [];
 
       if (!isMessage && !threadTitle) {
-        errorMsg = t('core:question.provide_thread', {
+        errorMsg = t('core:message.question.provide_thread', {
           postProcess: 'capitalizeFirst',
         });
       }
@@ -229,7 +229,7 @@ export const NewThread = ({
         feeToShow = +feeToShow * 2;
       }
       await show({
-        message: t('core:question.perform_transaction', {
+        message: t('core:message.question.perform_transaction', {
           action: 'ARBITRARY',
           postProcess: 'capitalizeFirst',
         }),
diff --git a/src/components/Group/Forum/Thread.tsx b/src/components/Group/Forum/Thread.tsx
index 447200e..3ab2862 100644
--- a/src/components/Group/Forum/Thread.tsx
+++ b/src/components/Group/Forum/Thread.tsx
@@ -1073,7 +1073,7 @@ export const Thread = ({
       <LoadingSnackbar
         open={isLoading}
         info={{
-          message: t('core:loading_posts', { postProcess: 'capitalizeFirst' }),
+          message: t('core:loading.posts', { postProcess: 'capitalizeFirst' }),
         }}
       />
     </GroupContainer>
diff --git a/src/components/Group/Group.tsx b/src/components/Group/Group.tsx
index b524697..10e39a4 100644
--- a/src/components/Group/Group.tsx
+++ b/src/components/Group/Group.tsx
@@ -373,7 +373,6 @@ export const Group = ({
   desktopViewMode,
 }: GroupProps) => {
   const [desktopSideView, setDesktopSideView] = useState('groups');
-
   const [secretKey, setSecretKey] = useState(null);
   const [secretKeyPublishDate, setSecretKeyPublishDate] = useState(null);
   const lastFetchedSecretKey = useRef(null);
@@ -396,14 +395,11 @@ export const Group = ({
   const [openAddGroup, setOpenAddGroup] = useState(false);
   const [isInitialGroups, setIsInitialGroups] = useState(false);
   const [openManageMembers, setOpenManageMembers] = useState(false);
-
   const setMemberGroups = useSetAtom(memberGroupsAtom);
-
   const lastGroupNotification = useRef<null | number>(null);
   const [timestampEnterData, setTimestampEnterData] = useAtom(
     timestampEnterDataAtom
   );
-
   const [chatMode, setChatMode] = useState('groups');
   const [newChat, setNewChat] = useState(false);
   const [openSnack, setOpenSnack] = useState(false);
diff --git a/src/components/Group/GroupList.tsx b/src/components/Group/GroupList.tsx
index 1057281..2c2e844 100644
--- a/src/components/Group/GroupList.tsx
+++ b/src/components/Group/GroupList.tsx
@@ -32,6 +32,7 @@ import {
 
 import { timeDifferenceForNotificationChats } from './Group';
 import { useAtom, useAtomValue } from 'jotai';
+import { useTranslation } from 'react-i18next';
 
 export const GroupList = ({
   selectGroupFunc,
@@ -49,6 +50,7 @@ export const GroupList = ({
   myAddress,
 }) => {
   const theme = useTheme();
+  const { t } = useTranslation(['auth', 'core', 'group']);
   const [isRunningPublicNode] = useAtom(isRunningPublicNodeAtom);
 
   return (
@@ -86,7 +88,9 @@ export const GroupList = ({
                   ? theme.palette.text.primary
                   : theme.palette.text.secondary
             }
-            label="Groups"
+            label={t('group:group.group_other', {
+              postProcess: 'capitalizeFirst',
+            })}
             selected={desktopSideView === 'groups'}
             customWidth="75px"
           >
@@ -102,6 +106,7 @@ export const GroupList = ({
             />
           </IconWrapper>
         </ButtonBase>
+
         <ButtonBase
           onClick={() => {
             setDesktopSideView('directs');
@@ -116,7 +121,9 @@ export const GroupList = ({
                   ? theme.palette.text.primary
                   : theme.palette.text.secondary
             }
-            label="Messaging"
+            label={t('group:group.messaging', {
+              postProcess: 'capitalizeFirst',
+            })}
             selected={desktopSideView === 'directs'}
           >
             <MessagingIcon
@@ -165,6 +172,7 @@ export const GroupList = ({
           ))}
         </List>
       </div>
+
       <div
         style={{
           display: 'flex',
@@ -185,7 +193,7 @@ export const GroupList = ({
                 color: theme.palette.text.primary,
               }}
             />
-            Group
+            {t('group:group.group', { postProcess: 'capitalizeFirst' })}
           </CustomButton>
 
           {!isRunningPublicNode && (
@@ -273,6 +281,7 @@ const GroupItem = React.memo(
                 </Avatar>
               )}
             </ListItemAvatar>
+
             <ListItemText
               primary={group.groupId === '0' ? 'General' : group.groupName}
               secondary={
@@ -302,6 +311,7 @@ const GroupItem = React.memo(
                 fontSize: '16px',
               }}
             />
+
             {announcement && !announcement?.seentimestamp && (
               <CampaignIcon
                 sx={{
@@ -311,6 +321,7 @@ const GroupItem = React.memo(
                 }}
               />
             )}
+
             <Box
               sx={{
                 display: 'flex',
@@ -335,6 +346,7 @@ const GroupItem = React.memo(
                     }}
                   />
                 )}
+
               {groupProperty?.isOpen === false && (
                 <LockIcon
                   sx={{
diff --git a/src/components/Group/InviteMember.tsx b/src/components/Group/InviteMember.tsx
index 8d7bcf2..ad027e4 100644
--- a/src/components/Group/InviteMember.tsx
+++ b/src/components/Group/InviteMember.tsx
@@ -17,7 +17,7 @@ export const InviteMember = ({ groupId, setInfoSnack, setOpenSnack, show }) => {
       const fee = await getFee('GROUP_INVITE');
 
       await show({
-        message: t('core:question.perform_transaction', {
+        message: t('core:message.question.perform_transaction', {
           action: 'GROUP_INVITE',
           postProcess: 'capitalizeFirst',
         }),
diff --git a/src/components/Group/ListOfBans.tsx b/src/components/Group/ListOfBans.tsx
index 650c418..dda3760 100644
--- a/src/components/Group/ListOfBans.tsx
+++ b/src/components/Group/ListOfBans.tsx
@@ -88,7 +88,7 @@ export const ListOfBans = ({ groupId, setInfoSnack, setOpenSnack, show }) => {
     try {
       const fee = await getFee('CANCEL_GROUP_BAN');
       await show({
-        message: t('core:question.perform_transaction', {
+        message: t('core:message.question.perform_transaction', {
           action: 'CANCEL_GROUP_BAN',
           postProcess: 'capitalizeFirst',
         }),
diff --git a/src/components/Group/ListOfGroupPromotions.tsx b/src/components/Group/ListOfGroupPromotions.tsx
index 4e4be16..8ca13d4 100644
--- a/src/components/Group/ListOfGroupPromotions.tsx
+++ b/src/components/Group/ListOfGroupPromotions.tsx
@@ -276,7 +276,7 @@ export const ListOfGroupPromotions = () => {
       const groupId = group.groupId;
       const fee = await getFee('JOIN_GROUP');
       await show({
-        message: t('core:question.perform_transaction', {
+        message: t('core:message.question.perform_transaction', {
           action: 'JOIN_GROUP',
           postProcess: 'capitalizeFirst',
         }),
@@ -575,7 +575,7 @@ export const ListOfGroupPromotions = () => {
                           <ErrorBoundary
                             fallback={
                               <Typography>
-                                {t('group.message.generic.invalid_data', {
+                                {t('group:message.generic.invalid_data', {
                                   postProcess: 'capitalizeFirst',
                                 })}
                               </Typography>
diff --git a/src/components/Group/ListOfInvites.tsx b/src/components/Group/ListOfInvites.tsx
index fc63464..574a9d1 100644
--- a/src/components/Group/ListOfInvites.tsx
+++ b/src/components/Group/ListOfInvites.tsx
@@ -94,7 +94,7 @@ export const ListOfInvites = ({
       const fee = await getFee('CANCEL_GROUP_INVITE');
 
       await show({
-        message: t('core:question.perform_transaction', {
+        message: t('core:message.question.perform_transaction', {
           action: 'CANCEL_GROUP_INVITE',
           postProcess: 'capitalizeFirst',
         }),
diff --git a/src/components/Group/ListOfJoinRequests.tsx b/src/components/Group/ListOfJoinRequests.tsx
index 6d9c38a..3b2f740 100644
--- a/src/components/Group/ListOfJoinRequests.tsx
+++ b/src/components/Group/ListOfJoinRequests.tsx
@@ -97,7 +97,7 @@ export const ListOfJoinRequests = ({
       const fee = await getFee('GROUP_INVITE');
 
       await show({
-        message: t('core:question.perform_transaction', {
+        message: t('core:message.question.perform_transaction', {
           action: 'GROUP_INVITE',
           postProcess: 'capitalizeFirst',
         }),
diff --git a/src/components/Group/ListOfMembers.tsx b/src/components/Group/ListOfMembers.tsx
index bfdc11f..783c18c 100644
--- a/src/components/Group/ListOfMembers.tsx
+++ b/src/components/Group/ListOfMembers.tsx
@@ -59,7 +59,7 @@ const ListOfMembers = ({
     try {
       const fee = await getFee('GROUP_KICK');
       await show({
-        message: t('core:question.perform_transaction', {
+        message: t('core:message.question.perform_transaction', {
           action: 'GROUP_KICK',
           postProcess: 'capitalizeFirst',
         }),
@@ -117,7 +117,7 @@ const ListOfMembers = ({
       const fee = await getFee('GROUP_BAN');
 
       await show({
-        message: t('core:question.perform_transaction', {
+        message: t('core:message.question.perform_transaction', {
           action: 'GROUP_BAN',
           postProcess: 'capitalizeFirst',
         }),
@@ -177,7 +177,7 @@ const ListOfMembers = ({
     try {
       const fee = await getFee('ADD_GROUP_ADMIN');
       await show({
-        message: t('core:question.perform_transaction', {
+        message: t('core:message.question.perform_transaction', {
           action: 'ADD_GROUP_ADMIN',
           postProcess: 'capitalizeFirst',
         }),
@@ -234,7 +234,7 @@ const ListOfMembers = ({
     try {
       const fee = await getFee('REMOVE_GROUP_ADMIN');
       await show({
-        message: t('core:question.perform_transaction', {
+        message: t('core:message.question.perform_transaction', {
           action: 'REMOVE_GROUP_ADMIN',
           postProcess: 'capitalizeFirst',
         }),
diff --git a/src/components/Group/ManageMembers.tsx b/src/components/Group/ManageMembers.tsx
index d996184..30a2ef2 100644
--- a/src/components/Group/ManageMembers.tsx
+++ b/src/components/Group/ManageMembers.tsx
@@ -84,7 +84,7 @@ export const ManageMembers = ({
       setIsLoadingLeave(true);
       const fee = await getFee('LEAVE_GROUP');
       await show({
-        message: t('core:question.perform_transaction', {
+        message: t('core:message.question.perform_transaction', {
           action: 'LEAVE_GROUP',
           postProcess: 'capitalizeFirst',
         }),
diff --git a/src/components/Group/ThingsToDoInitial.tsx b/src/components/Group/ThingsToDoInitial.tsx
index f85099e..b57b9da 100644
--- a/src/components/Group/ThingsToDoInitial.tsx
+++ b/src/components/Group/ThingsToDoInitial.tsx
@@ -76,7 +76,7 @@ export const ThingsToDoInitial = ({
           }}
         >
           {!isLoaded
-            ? t('core:loading', { postProcess: 'capitalizeFirst' })
+            ? t('core:loading.generic', { postProcess: 'capitalizeFirst' })
             : t('tutorial:initial.getting_started', {
                 postProcess: 'capitalizeFirst',
               })}
diff --git a/src/components/Group/UserListOfInvites.tsx b/src/components/Group/UserListOfInvites.tsx
index fd22d58..1e348d2 100644
--- a/src/components/Group/UserListOfInvites.tsx
+++ b/src/components/Group/UserListOfInvites.tsx
@@ -99,7 +99,7 @@ export const UserListOfInvites = ({
       const fee = await getFee('JOIN_GROUP');
 
       await show({
-        message: t('core:question.perform_transaction', {
+        message: t('core:message.question.perform_transaction', {
           action: 'JOIN_GROUP',
           postProcess: 'capitalizeFirst',
         }),
diff --git a/src/components/Minting/Minting.tsx b/src/components/Minting/Minting.tsx
index 9bffeb7..b0e1763 100644
--- a/src/components/Minting/Minting.tsx
+++ b/src/components/Minting/Minting.tsx
@@ -301,7 +301,7 @@ export const Minting = ({ setIsOpenMinting, myAddress, show }) => {
   const createRewardShare = useCallback(async (publicKey, recipient) => {
     const fee = await getFee('REWARD_SHARE');
     await show({
-      message: t('core:question.perform_transaction', {
+      message: t('core:message.question.perform_transaction', {
         // TODO move from group into core namespace
         action: 'REWARD_SHARE',
         postProcess: 'capitalizeFirst',
diff --git a/src/components/QortPayment.tsx b/src/components/QortPayment.tsx
index 3b48590..dab6ec2 100644
--- a/src/components/QortPayment.tsx
+++ b/src/components/QortPayment.tsx
@@ -37,7 +37,8 @@ export const QortPayment = ({ balance, show, onSuccess, defaultPaymentTo }) => {
         setSendPaymentError('Please enter your wallet password');
         return;
       }
-      const fee = await getFee('PAYMENT');
+
+      const fee = await getFee('PAYMENT'); // TODO translate
 
       await show({
         message: `Would you like to transfer ${Number(paymentAmount)} QORT?`,
@@ -148,7 +149,7 @@ export const QortPayment = ({ balance, show, onSuccess, defaultPaymentTo }) => {
         <Spacer height="6px" />
 
         <CustomLabel htmlFor="standard-adornment-password">
-          Confirm Wallet Password
+          Confirm wallet password
         </CustomLabel>
 
         <Spacer height="5px" />
diff --git a/src/components/RegisterName.tsx b/src/components/RegisterName.tsx
index 85f4390..e9a4116 100644
--- a/src/components/RegisterName.tsx
+++ b/src/components/RegisterName.tsx
@@ -127,7 +127,7 @@ export const RegisterName = ({
 
       const fee = await getFee('REGISTER_NAME');
       await show({
-        message: t('core:question.register_name', {
+        message: t('core:message.question.register_name', {
           postProcess: 'capitalizeFirst',
         }),
         publishFee: fee.fee + ' QORT',
diff --git a/src/components/Save/Save.tsx b/src/components/Save/Save.tsx
index 70faac8..38e328b 100644
--- a/src/components/Save/Save.tsx
+++ b/src/components/Save/Save.tsx
@@ -155,7 +155,7 @@ export const Save = ({ isDesktop, disableWidth, myName }) => {
         const fee = await getFee('ARBITRARY');
 
         await show({
-          message: t('core:save_options.publish_qnd', {
+          message: t('core:message.generic.publish_qnd', {
             postProcess: 'capitalizeFirst',
           }),
           publishFee: fee.fee + ' QORT',
@@ -306,7 +306,7 @@ export const Save = ({ isDesktop, disableWidth, myName }) => {
                   fontSize: '14px',
                 }}
               >
-                {t('core:save_options.settings', {
+                {t('core:message.generic.settings', {
                   postProcess: 'capitalizeFirst',
                 })}
               </Typography>{' '}
@@ -335,7 +335,7 @@ export const Save = ({ isDesktop, disableWidth, myName }) => {
                   },
                 }}
               >
-                {t('core:save_options.qdn', {
+                {t('core:message.generic.qdn', {
                   postProcess: 'capitalizeFirst',
                 })}
               </Button>
@@ -366,7 +366,7 @@ export const Save = ({ isDesktop, disableWidth, myName }) => {
                     fontSize: '14px',
                   }}
                 >
-                  {t('core:save_options.register_name', {
+                  {t('core:message.generic.register_name', {
                     postProcess: 'capitalizeFirst',
                   })}
                 </Typography>
@@ -387,7 +387,7 @@ export const Save = ({ isDesktop, disableWidth, myName }) => {
                         fontSize: '14px',
                       }}
                     >
-                      {t('core:save_options.unsaved_changes', {
+                      {t('core:message.generic.unsaved_changes', {
                         postProcess: 'capitalizeFirst',
                       })}
                     </Typography>
@@ -424,7 +424,7 @@ export const Save = ({ isDesktop, disableWidth, myName }) => {
                               fontSize: '14px',
                             }}
                           >
-                            {t('core:question.reset_qdn', {
+                            {t('core:message.question.reset_qdn', {
                               postProcess: 'capitalizeFirst',
                             })}
                           </Typography>
@@ -446,7 +446,7 @@ export const Save = ({ isDesktop, disableWidth, myName }) => {
                               },
                             }}
                           >
-                            {t('core:save_options.revert_qdn', {
+                            {t('core:message.generic.revert_qdn', {
                               postProcess: 'capitalizeFirst',
                             })}
                           </LoadingButton>
@@ -461,7 +461,7 @@ export const Save = ({ isDesktop, disableWidth, myName }) => {
                             }}
                           >
                             {' '}
-                            {t('core:question.reset_pinned', {
+                            {t('core:message.question.reset_pinned', {
                               postProcess: 'capitalizeFirst',
                             })}
                           </Typography>
@@ -471,7 +471,7 @@ export const Save = ({ isDesktop, disableWidth, myName }) => {
                             onClick={revertChanges}
                             variant="contained"
                           >
-                            {t('core:save_options.revert_default', {
+                            {t('core:message.generic.revert_default', {
                               postProcess: 'capitalizeFirst',
                             })}
                           </LoadingButton>
@@ -495,7 +495,7 @@ export const Save = ({ isDesktop, disableWidth, myName }) => {
                           fontSize: '14px',
                         }}
                       >
-                        {t('core:question.overwrite_changes', {
+                        {t('core:message.question.overwrite_changes', {
                           postProcess: 'capitalizeFirst',
                         })}
                       </Typography>
@@ -517,7 +517,7 @@ export const Save = ({ isDesktop, disableWidth, myName }) => {
                           },
                         }}
                       >
-                        {t('core:save_options.overwrite_qdn', {
+                        {t('core:message.generic.overwrite_qdn', {
                           postProcess: 'capitalizeFirst',
                         })}
                       </LoadingButton>
@@ -537,7 +537,7 @@ export const Save = ({ isDesktop, disableWidth, myName }) => {
                         fontSize: '14px',
                       }}
                     >
-                      {t('core:save_options.no_pinned_changes', {
+                      {t('core:message.generic.no_pinned_changes', {
                         postProcess: 'capitalizeFirst',
                       })}
                     </Typography>
diff --git a/src/constants/constants.ts b/src/constants/constants.ts
index 5b5e427..ee96c68 100644
--- a/src/constants/constants.ts
+++ b/src/constants/constants.ts
@@ -1,175 +1,186 @@
-
-
 // Qortal TX types
 const TX_TYPES = {
-	1: "Genesis",
-	2: "Payment",
-	3: "Name registration",
-	4: "Name update",
-	5: "Sell name",
-	6: "Cancel sell name",
-	7: "Buy name",
-	8: "Create poll",
-	9: "Vote in poll",
-	10: "Arbitrary",
-	11: "Issue asset",
-	12: "Transfer asset",
-	13: "Create asset order",
-	14: "Cancel asset order",
-	15: "Multi-payment transaction",
-	16: "Deploy AT",
-	17: "Message",
-	18: "Chat",
-	19: "Publicize",
-	20: "Airdrop",
-	21: "AT",
-	22: "Create group",
-	23: "Update group",
-	24: "Add group admin",
-	25: "Remove group admin",
-	26: "Group ban",
-	27: "Cancel group ban",
-	28: "Group kick",
-	29: "Group invite",
-	30: "Cancel group invite",
-	31: "Join group",
-	32: "Leave group",
-	33: "Group approval",
-	34: "Set group",
-	35: "Update asset",
-	36: "Account flags",
-	37: "Enable forging",
-	38: "Reward share",
-	39: "Account level",
-	40: "Transfer privs",
-	41: "Presence"
-}
+  1: 'Genesis',
+  2: 'Payment',
+  3: 'Name registration',
+  4: 'Name update',
+  5: 'Sell name',
+  6: 'Cancel sell name',
+  7: 'Buy name',
+  8: 'Create poll',
+  9: 'Vote in poll',
+  10: 'Arbitrary',
+  11: 'Issue asset',
+  12: 'Transfer asset',
+  13: 'Create asset order',
+  14: 'Cancel asset order',
+  15: 'Multi-payment transaction',
+  16: 'Deploy AT',
+  17: 'Message',
+  18: 'Chat',
+  19: 'Publicize',
+  20: 'Airdrop',
+  21: 'AT',
+  22: 'Create group',
+  23: 'Update group',
+  24: 'Add group admin',
+  25: 'Remove group admin',
+  26: 'Group ban',
+  27: 'Cancel group ban',
+  28: 'Group kick',
+  29: 'Group invite',
+  30: 'Cancel group invite',
+  31: 'Join group',
+  32: 'Leave group',
+  33: 'Group approval',
+  34: 'Set group',
+  35: 'Update asset',
+  36: 'Account flags',
+  37: 'Enable forging',
+  38: 'Reward share',
+  39: 'Account level',
+  40: 'Transfer privs',
+  41: 'Presence',
+};
 
 // Qortal error codes
 const ERROR_CODES = {
-	1: "Valid OK",
-	2: "Invalid address",
-	3: "Negative amount",
-	4: "Nagative fee",
-	5: "No balance",
-	6: "Invalid reference",
-	7: "Invalid time length",
-	8: "Invalid value length",
-	9: "Name already registered",
-	10: "Name does not exist",
-	11: "Invalid name owner",
-	12: "Name already for sale",
-	13: "Name not for sale",
-	14: "Name buyer already owner",
-	15: "Invalid amount",
-	16: "Invalid seller",
-	17: "Name not lowercase",
-	18: "Invalid description length",
-	19: "Invalid options length",
-	20: "Invalid option length",
-	21: "Duplicate option",
-	22: "Poll already created",
-	23: "Poll already has votes",
-	24: "Poll does not exist",
-	25: "Option does not exist",
-	26: "Already voted for that option",
-	27: "Invalid data length",
-	28: "Invalid quantity",
-	29: "Asset does not exist",
-	30: "Invalid return",
-	31: "Have equals want",
-	32: "Order does not exist",
-	33: "Invalid order creator",
-	34: "Invalid payments length",
-	35: "Negative price",
-	36: "Invalid creation bytes",
-	37: "Invalid tags length",
-	38: "Invalid type length",
-	39: "Invalid AT transaction",
-	40: "Insufficient fee",
-	41: "Asset does not match AT",
+  1: 'Valid OK',
+  2: 'Invalid address',
+  3: 'Negative amount',
+  4: 'Nagative fee',
+  5: 'No balance',
+  6: 'Invalid reference',
+  7: 'Invalid time length',
+  8: 'Invalid value length',
+  9: 'Name already registered',
+  10: 'Name does not exist',
+  11: 'Invalid name owner',
+  12: 'Name already for sale',
+  13: 'Name not for sale',
+  14: 'Name buyer already owner',
+  15: 'Invalid amount',
+  16: 'Invalid seller',
+  17: 'Name not lowercase',
+  18: 'Invalid description length',
+  19: 'Invalid options length',
+  20: 'Invalid option length',
+  21: 'Duplicate option',
+  22: 'Poll already created',
+  23: 'Poll already has votes',
+  24: 'Poll does not exist',
+  25: 'Option does not exist',
+  26: 'Already voted for that option',
+  27: 'Invalid data length',
+  28: 'Invalid quantity',
+  29: 'Asset does not exist',
+  30: 'Invalid return',
+  31: 'Have equals want',
+  32: 'Order does not exist',
+  33: 'Invalid order creator',
+  34: 'Invalid payments length',
+  35: 'Negative price',
+  36: 'Invalid creation bytes',
+  37: 'Invalid tags length',
+  38: 'Invalid type length',
+  39: 'Invalid AT transaction',
+  40: 'Insufficient fee',
+  41: 'Asset does not match AT',
 
-	43: "Asset already exists",
-	44: "Missing creator",
-	45: "Timestamp too old",
-	46: "Timestamp too new",
-	47: "Too many unconfirmed",
-	48: "Group already exists",
-	49: "Group does not exist",
-	50: "Invalid group owner",
-	51: "Already group memeber",
-	52: "Group owner can not leave",
-	53: "Not group member",
-	54: "Already group admin",
-	55: "Not group admin",
-	56: "Invalid lifetime",
-	57: "Invite unknown",
-	58: "Ban exists",
-	59: "Ban unknown",
-	60: "Banned from group",
-	61: "Join request",
-	62: "Invalid group approval threshold",
-	63: "Group ID mismatch",
-	64: "Invalid group ID",
-	65: "Transaction unknown",
-	66: "Transaction already confirmed",
-	67: "Invalid TX group",
-	68: "TX group ID mismatch",
-	69: "Multiple names forbidden",
-	70: "Invalid asset owner",
-	71: "AT is finished",
-	72: "No flag permission",
-	73: "Not minting accout",
+  43: 'Asset already exists',
+  44: 'Missing creator',
+  45: 'Timestamp too old',
+  46: 'Timestamp too new',
+  47: 'Too many unconfirmed',
+  48: 'Group already exists',
+  49: 'Group does not exist',
+  50: 'Invalid group owner',
+  51: 'Already group memeber',
+  52: 'Group owner can not leave',
+  53: 'Not group member',
+  54: 'Already group admin',
+  55: 'Not group admin',
+  56: 'Invalid lifetime',
+  57: 'Invite unknown',
+  58: 'Ban exists',
+  59: 'Ban unknown',
+  60: 'Banned from group',
+  61: 'Join request',
+  62: 'Invalid group approval threshold',
+  63: 'Group ID mismatch',
+  64: 'Invalid group ID',
+  65: 'Transaction unknown',
+  66: 'Transaction already confirmed',
+  67: 'Invalid TX group',
+  68: 'TX group ID mismatch',
+  69: 'Multiple names forbidden',
+  70: 'Invalid asset owner',
+  71: 'AT is finished',
+  72: 'No flag permission',
+  73: 'Not minting accout',
 
-	77: "Invalid rewardshare percent",
-	78: "Public key unknown",
-	79: "Invalid public key",
-	80: "AT unknown",
-	81: "AT already exists",
-	82: "Group approval not required",
-	83: "Group approval decided",
-	84: "Maximum reward shares",
-	85: "Transaction already exists",
-	86: "No blockchain lock",
-	87: "Order already closed",
-	88: "Clock not synced",
-	89: "Asset not spendable",
-	90: "Account can not reward share",
-	91: "Self share exists",
-	92: "Account already exists",
-	93: "Invalid group block delay",
-	94: "Incorrect nonce",
-	95: "Ivalid timestamp signature",
-	96: "Address blocked",
-	97: "Name Blocked",
-	98: "Group approval required",
-	99: "Account not transferable",
+  77: 'Invalid rewardshare percent',
+  78: 'Public key unknown',
+  79: 'Invalid public key',
+  80: 'AT unknown',
+  81: 'AT already exists',
+  82: 'Group approval not required',
+  83: 'Group approval decided',
+  84: 'Maximum reward shares',
+  85: 'Transaction already exists',
+  86: 'No blockchain lock',
+  87: 'Order already closed',
+  88: 'Clock not synced',
+  89: 'Asset not spendable',
+  90: 'Account can not reward share',
+  91: 'Self share exists',
+  92: 'Account already exists',
+  93: 'Invalid group block delay',
+  94: 'Incorrect nonce',
+  95: 'Ivalid timestamp signature',
+  96: 'Address blocked',
+  97: 'Name Blocked',
+  98: 'Group approval required',
+  99: 'Account not transferable',
 
-	999: "Ivalid but ok",
-	1000: "Not yet released."
-}
+  999: 'Ivalid but ok',
+  1000: 'Not yet released.',
+};
 
 // Qortal 8 decimals
-const QORT_DECIMALS = 1e8
+const QORT_DECIMALS = 1e8;
 
 // Q for Qortal
-const ADDRESS_VERSION = 58
+const ADDRESS_VERSION = 58;
 
 // Proxy for api calls
-const PROXY_URL = "/proxy/"
+const PROXY_URL = '/proxy/';
 
 // Chat reference timestamp
-const CHAT_REFERENCE_FEATURE_TRIGGER_TIMESTAMP = 1674316800000
+const CHAT_REFERENCE_FEATURE_TRIGGER_TIMESTAMP = 1674316800000;
 
 // Dynamic fee timestamp
-const DYNAMIC_FEE_TIMESTAMP = 1692118800000
-
+const DYNAMIC_FEE_TIMESTAMP = 1692118800000;
 
 // Used as a salt for all Qora addresses. Salts used for storing your private keys in local storage will be randomly generated
-const STATIC_SALT = new Uint8Array([54, 190, 201, 206, 65, 29, 123, 129, 147, 231, 180, 166, 171, 45, 95, 165, 78, 200, 208, 194, 44, 207, 221, 146, 45, 238, 68, 68, 69, 102, 62, 6])
-const BCRYPT_ROUNDS = 10 // Remember that the total work spent on key derivation is BCRYPT_ROUNDS * KDF_THREADS
-const BCRYPT_VERSION = "2a"
-const STATIC_BCRYPT_SALT = `$${BCRYPT_VERSION}$${BCRYPT_ROUNDS}$IxVE941tXVUD4cW0TNVm.O`
-const KDF_THREADS = 16
+const STATIC_SALT = new Uint8Array([
+  54, 190, 201, 206, 65, 29, 123, 129, 147, 231, 180, 166, 171, 45, 95, 165, 78,
+  200, 208, 194, 44, 207, 221, 146, 45, 238, 68, 68, 69, 102, 62, 6,
+]);
+const BCRYPT_ROUNDS = 10; // Remember that the total work spent on key derivation is BCRYPT_ROUNDS * KDF_THREADS
+const BCRYPT_VERSION = '2a';
+const STATIC_BCRYPT_SALT = `$${BCRYPT_VERSION}$${BCRYPT_ROUNDS}$IxVE941tXVUD4cW0TNVm.O`;
+const KDF_THREADS = 16;
 
-export { TX_TYPES, ERROR_CODES, QORT_DECIMALS, PROXY_URL, STATIC_SALT, ADDRESS_VERSION, KDF_THREADS, STATIC_BCRYPT_SALT, CHAT_REFERENCE_FEATURE_TRIGGER_TIMESTAMP, DYNAMIC_FEE_TIMESTAMP }
+export {
+  TX_TYPES,
+  ERROR_CODES,
+  QORT_DECIMALS,
+  PROXY_URL,
+  STATIC_SALT,
+  ADDRESS_VERSION,
+  KDF_THREADS,
+  STATIC_BCRYPT_SALT,
+  CHAT_REFERENCE_FEATURE_TRIGGER_TIMESTAMP,
+  DYNAMIC_FEE_TIMESTAMP,
+};
diff --git a/src/i18n/locales/de/auth.json b/src/i18n/locales/de/auth.json
index 5b14183..3445eb6 100644
--- a/src/i18n/locales/de/auth.json
+++ b/src/i18n/locales/de/auth.json
@@ -1,8 +1,26 @@
 {
   "account": {
-    "your": "ihr Konto",
+    "your": "dein Konto",
     "account_many": "Konten",
-    "account_one": "Konto"
+    "account_one": "Konto",
+    "selected": "ausgewähltes Konto"
+  },
+  "action": {
+    "add": {
+      "account": "Konto hinzufügen",
+      "seed_phrase": "Seed-Phrase hinzufügen"
+    },
+    "authenticate": "authentifizieren",
+    "create_account": "Konto erstellen",
+    "create_qortal_account": "erstelle dein Qortal-Konto, indem du unten auf <next>WEITER</next> klickst.",
+    "choose_password": "neues Passwort wählen",
+    "download_account": "Konto herunterladen",
+    "export_seedphrase": "Seedphrase exportieren",
+    "publish_admin_secret_key": "Admin-Geheimschlüssel veröffentlichen",
+    "publish_group_secret_key": "Gruppen-Geheimschlüssel veröffentlichen",
+    "reencrypt_key": "Schlüssel neu verschlüsseln",
+    "return_to_list": "zur Liste zurückkehren",
+    "setup_qortal_account": "Qortal-Konto einrichten"
   },
   "advanced_users": "für fortgeschrittene Benutzer",
   "apikey": {
@@ -13,11 +31,33 @@
     "key": "API-Schlüssel",
     "select_valid": "gültigen API-Schlüssel auswählen"
   },
-  "authenticate": "authentifizieren",
   "build_version": "Build-Version",
-  "create_account": "Konto erstellen",
-  "download_account": "Konto herunterladen",
-  "keep_secure": "Bewahren Sie Ihre Kontodatei sicher auf",
+  "message": {
+    "error": {
+      "account_creation": "Konto konnte nicht erstellt werden.",
+      "field_not_found_json": "{{ field }} nicht im JSON gefunden",
+      "incorrect_password": "falsches Passwort",
+      "invalid_secret_key": "Geheimschlüssel ist ungültig",
+      "unable_reencrypt_secret_key": "Geheimschlüssel konnte nicht neu verschlüsselt werden"
+    },
+    "generic": {
+      "congrats_setup": "Glückwunsch, du bist startklar!",
+      "no_account": "keine gespeicherten Konten",
+      "no_minimum_length": "es gibt keine Mindestlängenanforderung",
+      "no_secret_key_published": "noch kein Geheimschlüssel veröffentlicht",
+      "fetching_admin_secret_key": "Admin-Geheimschlüssel wird abgerufen",
+      "fetching_group_secret_key": "Gruppen-Geheimschlüssel wird veröffentlicht",
+      "last_encryption_date": "letztes Verschlüsselungsdatum: {{ date }} von {{ name }}",
+      "keep_secure": "halte deine Kontodatei sicher",
+      "publishing_key": "Hinweis: Nach der Veröffentlichung des Schlüssels dauert es ein paar Minuten, bis er erscheint. Bitte etwas Geduld.",
+      "seedphrase_notice": "eine <seed>SEEDPHRASE</seed> wurde im Hintergrund zufällig generiert.",
+      "type_seed": "gib deine Seed-Phrase ein oder füge sie ein",
+      "your_accounts": "deine gespeicherten Konten"
+    },
+    "success": {
+      "reencrypted_secret_key": "Geheimschlüssel erfolgreich neu verschlüsselt. Die Änderungen werden in ein paar Minuten wirksam. Bitte die Gruppe in 5 Minuten aktualisieren."
+    }
+  },
   "node": {
     "choose": "benutzerdefinierten Node auswählen",
     "custom_many": "benutzerdefinierte Nodes",
@@ -26,17 +66,31 @@
     "using": "verwende Node",
     "using_public": "öffentlichen Node verwenden"
   },
+  "note": "Hinweis",
   "password": "Passwort",
   "password_confirmation": "Passwort bestätigen",
-  "return_to_list": "zurück zur Liste",
+  "seed": "Seed-Phrase",
+  "seed_your": "deine Seedphrase",
+  "tips": {
+    "additional_wallet": "verwende diese Option, um weitere Qortal-Wallets zu verbinden, die du bereits erstellt hast, um dich später mit ihnen anzumelden. Du benötigst deine Sicherungs-JSON-Datei.",
+    "digital_id": "deine Wallet ist wie deine digitale ID auf Qortal und dient zur Anmeldung im Qortal-Interface. Sie enthält deine öffentliche Adresse und den Qortal-Namen, den du später auswählst. Jede Transaktion ist mit deiner ID verknüpft. Hier verwaltest du dein QORT und andere handelbare Kryptowährungen auf Qortal.",
+    "existing_account": "du hast bereits ein Qortal-Konto? Gib hier deine geheime Sicherungsphrase ein, um darauf zuzugreifen. Diese Phrase ist eine Möglichkeit zur Wiederherstellung deines Kontos.",
+    "key_encrypt_admin": "dieser Schlüssel dient der Verschlüsselung von ADMIN-Inhalten. Nur Admins können diese Inhalte sehen.",
+    "key_encrypt_group": "dieser Schlüssel dient der Verschlüsselung von GRUPPEN-Inhalten. Aktuell wird nur dieser Schlüssel in der Benutzeroberfläche verwendet. Alle Gruppenmitglieder können die Inhalte sehen.",
+    "new_account": "ein Konto zu erstellen bedeutet, eine neue Wallet und digitale ID für die Nutzung von Qortal zu generieren. Nach der Kontoerstellung kannst du QORT erhalten, einen Namen und Avatar kaufen, Videos und Blogs veröffentlichen und vieles mehr.",
+    "new_users": "neue Nutzer starten hier!",
+    "safe_place": "speichere dein Konto an einem Ort, den du nicht vergisst!",
+    "view_seedphrase": "wenn du die SEEDPHRASE ANZEIGEN möchtest, klicke auf das Wort 'SEEDPHRASE' in diesem Text. Seedphrases erzeugen den privaten Schlüssel für dein Qortal-Konto. Aus Sicherheitsgründen werden sie standardmäßig NICHT angezeigt.",
+    "wallet_secure": "halte deine Wallet-Datei sicher."
+  },
   "wallet": {
     "password_confirmation": "Wallet-Passwort bestätigen",
     "password": "Wallet-Passwort",
-    "keep_password": "aktuelles Passwort beibehalten",
+    "keep_password": "aktuelles Passwort behalten",
     "new_password": "neues Passwort",
     "error": {
-      "missing_new_password": "bitte neues Passwort eingeben",
-      "missing_password": "bitte Passwort eingeben"
+      "missing_new_password": "bitte ein neues Passwort eingeben",
+      "missing_password": "bitte dein Passwort eingeben"
     }
   },
   "welcome": "willkommen bei"
diff --git a/src/i18n/locales/en/auth.json b/src/i18n/locales/en/auth.json
index d212416..daf0c8d 100644
--- a/src/i18n/locales/en/auth.json
+++ b/src/i18n/locales/en/auth.json
@@ -12,9 +12,15 @@
     },
     "authenticate": "authenticate",
     "create_account": "create account",
+    "create_qortal_account": "create your Qortal account by clicking <next>NEXT</next> below.",
     "choose_password": "choose new password",
     "download_account": "download account",
-    "return_to_list": "return to list"
+    "export_seedphrase": "export Seedphrase",
+    "publish_admin_secret_key": "publish admin secret key",
+    "publish_group_secret_key": "publish group secret key",
+    "reencrypt_key": "re-encrypt key",
+    "return_to_list": "return to list",
+    "setup_qortal_account": "set up your Qortal account"
   },
   "advanced_users": "for advanced users",
   "apikey": {
@@ -28,13 +34,28 @@
   "build_version": "build version",
   "message": {
     "error": {
-      "account_creation": "could not create account."
+      "account_creation": "could not create account.",
+      "field_not_found_json": "{{ field }}  not found in JSON",
+      "incorrect_password": "incorrect password",
+      "invalid_secret_key": "secretKey is not valid",
+      "unable_reencrypt_secret_key": "unable to re-encrypt secret key"
     },
     "generic": {
-      "no_account": "No accounts saved",
+      "congrats_setup": "congrats, you’re all set up!",
+      "no_account": "no accounts saved",
+      "no_minimum_length": "there is no minimum length requirement",
+      "no_secret_key_published": "no secret key published yet",
+      "fetching_admin_secret_key": "fetching Admins secret key",
+      "fetching_group_secret_key": "fetching Group secret key publishes",
+      "last_encryption_date": "last encryption date: {{ date }} by {{ name }}",
       "keep_secure": "keep your account file secure",
+      "publishing_key": "reminder: After publishing the key, it will take a couple of minutes for it to appear. Please just wait.",
+      "seedphrase_notice": "a <seed>SEEDPHRASE</seed> has been randomly generated in the background.",
       "type_seed": "type or paste in your seed-phrase",
       "your_accounts": "your saved accounts"
+    },
+    "success": {
+      "reencrypted_secret_key": "successfully re-encrypted secret key. It may take a couple of minutes for the changes to propagate. Refresh the group in 5 mins."
     }
   },
   "node": {
@@ -49,12 +70,18 @@
   "password": "password",
   "password_confirmation": "confirm password",
   "seed": "seed phrase",
+  "seed_your": "your seedphrase",
   "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.",
+    "key_encrypt_admin": "this key is to encrypt ADMIN related content. Only admins would see content encrypted with it.",
+    "key_encrypt_group": "this key is to encrypt GROUP related content. This is the only one used in this UI as of now. All group members will be able to see content encrypted with this key.",
     "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!"
+    "new_users": "new users start here!",
+    "safe_place": "save your account in a place where you will remember it!",
+    "view_seedphrase": "if you wish to VIEW THE SEEDPHRASE, click the word 'SEEDPHRASE' in this text. Seedphrases are used to generate the private key for your Qortal account. For security by default, seedphrases are NOT displayed unless specifically chosen.",
+    "wallet_secure": "keep your wallet file secure."
   },
   "wallet": {
     "password_confirmation": "confirm wallet password",
diff --git a/src/i18n/locales/en/core.json b/src/i18n/locales/en/core.json
index 424c8d0..cc7d495 100644
--- a/src/i18n/locales/en/core.json
+++ b/src/i18n/locales/en/core.json
@@ -2,6 +2,7 @@
   "action": {
     "add": "add",
     "add_custom_framework": "add custom framework",
+    "add_reaction": "add reaction",
     "accept": "accept",
     "access": "access",
     "backup_account": "backup account",
@@ -9,11 +10,14 @@
     "cancel": "cancel",
     "cancel_invitation": "cancel invitation",
     "change": "change",
+    "change_avatar": "change avatar",
     "change_file": "change file",
     "change_language": "change language",
     "choose": "choose",
     "choose_file": "choose file",
+    "choose_image": "choose image",
     "close": "close",
+    "close_chat": "close Direct Chat",
     "continue": "continue",
     "continue_logout": "continue to logout",
     "copy_link": "copy link",
@@ -24,13 +28,18 @@
     "choose_name": "choose a name",
     "decline": "decline",
     "decrypt": "decrypt",
+    "disable_enter": "disable enter",
     "download": "download",
     "edit": "edit",
     "enter_name": "enter a name",
     "export": "export",
+    "get_qort": "get QORT at Q-Trade",
+    "hide": "hide",
     "import": "import",
     "invite": "invite",
     "join": "join",
+    "leave_comment": "leave comment",
+    "load_announcements": "load older announcements",
     "login": "login",
     "logout": "logout",
     "new": {
@@ -46,15 +55,21 @@
     "post_message": "post message",
     "publish": "publish",
     "publish_app": "publish your app",
+    "publish_comment": "publish comment",
     "register_name": "register name",
     "remove": "remove",
+    "remove_reaction": "remove reaction",
     "return_apps_dashboard": "return to Apps Dashboard",
     "save": "save",
+    "search": "search",
     "search_apps": "search for apps",
     "select_app_type": "select App Type",
     "select_category": "select Category",
     "select_name_app": "select Name/App",
+    "set_avatar": "set avatar",
     "start_minting": "start minting",
+    "start_typing": "start typing here...",
+    "transfer_qort": "Transfer QORT",
     "unpin": "unpin",
     "unpin_app": "unpin app",
     "unpin_from_dashboard": "unpin from dashboard",
@@ -93,6 +108,7 @@
     "payment": "payment fee",
     "publish": "publish fee"
   },
+  "for": "for",
   "general_settings": "general settings",
   "identifier": "identifier",
   "last_height": "last height",
@@ -103,8 +119,13 @@
     "join_request": "join request list",
     "member": "member list"
   },
-  "loading": "loading...",
-  "loading_posts": "loading posts... please wait.",
+  "loading": {
+    "announcements": "announcements",
+    "generic": "loading...",
+    "chat": "loading chat... please wait.",
+    "comments": "loading comments... please wait.",
+    "posts": "loading posts... please wait."
+  },
   "message_us": "please message us on Telegram or Discord if you need 4 QORT to start chatting without any limitations",
   "message": {
     "error": {
@@ -112,21 +133,38 @@
       "app_need_name": "your app needs a name",
       "file_too_large": "file {{ filename }} is too large. Max size allowed is {{ size }} MB.",
       "generic": "an error occurred",
-      "incorrect_password": "incorrect password",
+      "invalid_signature": "invalid signature",
       "invalid_zip": "invalid zip",
+      "message_loading": "error loading message.",
+      "message_size": "your message size is of {{ size }} bytes out of a maximum of {{ maximum }}",
       "minting_account_add": "unable to add minting account",
       "minting_account_remove": "unable to remove minting account",
       "missing_fields": "missing: {{ fields }}",
       "navigation_timeout": "navigation timeout",
+      "network_generic": "network error",
+      "password_not_matching": "password fields do not match!",
+      "password_wrong": "unable to authenticate. Wrong password",
       "publish_app": "unable to publish app",
       "rating_option": "cannot find rating option",
       "save_qdn": "unable to save to QDN",
+      "send_failed": "failed to send",
       "unable_encrypt_app": "unable to encrypt app. App not published'",
       "unable_publish_app": "unable to publish app",
-      "unable_rate": "unable to rate"
+      "unable_publish_image": "unable to publish image",
+      "unable_rate": "unable to rate",
+      "update_failed": "failed to update"
     },
     "generic": {
+      "avatar_size": "{{ size }} KB max. for GIFS",
+      "buy_order_request": "the Application <br/><italic>{{hostname}}</italic> <br/><span>is requesting {{count}} buy order</span>",
+      "buy_order_request_other": "the Application <br/><italic>{{hostname}}</italic> <br/><span>is requesting {{count}} buy orders</span>",
       "devmode_local_node": "please use your local node for dev mode! Logout and use Local node.",
+      "edited": "edited",
+      "editing_message": "editing message",
+      "fee_qort": "fee: {{ message }} QORT",
+      "foreign_fee": "foreign fee: {{ message }}",
+      "mentioned": "mentioned",
+      "message_with_image": "this message already has an image",
       "name_available": "{{ name }} is available",
       "name_benefits": "benefits of a name",
       "name_checking": "checking if name already exists",
@@ -136,19 +174,50 @@
       "name_registration": "your balance is {{ balance }} QORT. A name registration requires a {{ fee }} QORT fee",
       "name_unavailable": "{{ name }} is unavailable",
       "no_description": "no description",
+      "no_minting_details": "cannot view minting details on the gateway",
       "no_notifications": "no new notifications",
+      "no_pinned_changes": "you currently do not have any changes to your pinned apps",
       "no_results": "no results",
       "one_app_per_name": "note: Currently, only one App and Website is allowed per Name.",
+      "overwrite_qdn": "overwrite to QDN",
+      "password_confirm": "please confirm a password",
+      "password_enter": "please enter a password",
+      "payment_request": "the Application <br/><italic>{{hostname}}</italic> <br/><span>is requesting a payment</span>",
+      "people_reaction": "people who reacted with {{ reaction }}",
       "publish_data": "publish data to Qortal: anything from apps to videos. Fully decentralized!",
       "publishing": "publishing... Please wait.",
+      "qdn": "use QDN saving",
       "rating": "rating for {{ service }} {{ name }}",
+      "register_name": "you need a registered Qortal name to save your pinned apps to QDN.",
+      "replied_to": "replied to {{ person }}",
+      "revert_default": "revert to default",
+      "revert_qdn": "revert to QDN",
+      "save_qdn": "save to QDN",
       "secure_ownership": "secure ownership of data published by your name. You can even sell your name, along with your data to a third party.",
       "select_file": "please select a file",
       "select_image": "please select an image for a logo",
-      "select_zip": "select .zip file containing static content:"
+      "select_zip": "select .zip file containing static content:",
+      "sending": "sending...",
+      "settings": "you are using the export/import way of saving settings.",
+      "space_for_admins": "sorry, this space is only for Admins.",
+      "unread_messages": "unread messages below",
+      "unsaved_changes": "you have unsaved changes to your pinned apps. Save them to QDN.",
+      "updating": "updating"
     },
     "question": {
-      "new_user": "are you a new user?"
+      "logout": "are you sure you would like to logout?",
+      "new_user": "are you a new user?",
+      "delete_chat_image": "would you like to delete your previous chat image?",
+      "perform_transaction": "would you like to perform a {{action}} transaction?",
+      "provide_thread": "please provide a thread title",
+      "publish_app": "would you like to publish this app?",
+      "publish_avatar": "would you like to publish an avatar?",
+      "publish_qdn": "would you like to publish your settings to QDN (encrypted)?",
+      "overwrite_changes": "the app was unable to download your existing QDN-saved pinned apps. Would you like to overwrite those changes?",
+      "rate_app": "would you like to rate this app a rating of {{ rate }}?. It will create a POLL tx.",
+      "register_name": "would you like to register this name?",
+      "reset_pinned": "don't like your current local changes? Would you like to reset to the default pinned apps?",
+      "reset_qdn": "don't like your current local changes? Would you like to reset to your saved QDN pinned apps?"
     },
     "status": {
       "minting": "(minting)",
@@ -181,32 +250,14 @@
   "q_apps": {
     "about": "about this Q-App",
     "q_mail": "q-mail",
+    "q_manager": "q-manager",
     "q_sandbox": "q-Sandbox"
   },
-  "question": {
-    "perform_transaction": "would you like to perform a {{action}} transaction?",
-    "provide_thread": "please provide a thread title",
-    "publish_app": "would you like to publish this app?",
-    "publish_qdn": "would you like to publish your settings to QDN (encrypted)?",
-    "overwrite_changes": "the app was unable to download your existing QDN-saved pinned apps. Would you like to overwrite those changes?",
-    "rate_app": "would you like to rate this app a rating of {{ rate }}?. It will create a POLL tx.",
-    "register_name": "would you like to register this name?",
-    "reset_pinned": "don't like your current local changes? Would you like to reset to the default pinned apps?",
-    "reset_qdn": "don't like your current local changes? Would you like to reset to your saved QDN pinned apps?"
-  },
-  "save_options": {
-    "no_pinned_changes": "you currently do not have any changes to your pinned apps",
-    "overwrite_qdn": "overwrite to QDN",
-    "qdn": "use QDN saving",
-    "register_name": "you need a registered Qortal name to save your pinned apps to QDN.",
-    "revert_default": "revert to default",
-    "revert_qdn": "revert to QDN",
-    "save_qdn": "save to QDN",
-    "settings": "you are using the export/import way of saving settings.",
-    "unsaved_changes": "you have unsaved changes to your pinned apps. Save them to QDN."
-  },
   "server": "server",
   "settings": "settings",
+  "sort": {
+    "by_member": "by member"
+  },
   "supply": "supply",
   "tags": "tags",
   "theme": {
@@ -226,6 +277,8 @@
   "user_lookup": "user lookup",
   "zip": "zip",
   "wallet": {
+    "litecoin": "litecoin wallet",
+    "qortal": "qortal wallet",
     "wallet": "wallet",
     "wallet_other": "wallets"
   },
diff --git a/src/i18n/locales/en/group.json b/src/i18n/locales/en/group.json
index 21cb914..5b14b7c 100644
--- a/src/i18n/locales/en/group.json
+++ b/src/i18n/locales/en/group.json
@@ -18,10 +18,14 @@
     "make_admin": "make an admin",
     "manage_members": "manage members",
     "promote_group": "promote your group to non-members",
+    "publish_announcement": "publish announcement",
+    "publish_avatar": "publish avatar",
     "refetch_page": "refetch page",
     "remove_admin": "remove as admin",
     "remove_minting_account": "remove minting account",
     "return_to_thread": "return to threads",
+    "scroll_bottom": "scroll to bottom",
+    "scroll_unread_messages": "scroll to Unread Messages",
     "select_group": "select a group",
     "visit_q_mintership": "visit Q-Mintership"
   },
@@ -33,12 +37,16 @@
     "maximum": "maximum Block delay for Group Transaction Approvals"
   },
   "group": {
+    "avatar": "group avatar",
     "closed": "closed (private) - users need permission to join",
     "description": "description of group",
     "id": "group id",
     "invites": "group invites",
+    "group": "group",
+    "group_other": "groups",
     "management": "group management",
     "member_number": "number of members",
+    "messaging": "messaging",
     "name": "group name",
     "open": "open (public)",
     "private": "private group",
@@ -54,12 +62,20 @@
   "latest_mails": "latest Q-Mails",
   "message": {
     "generic": {
+      "avatar_publish_fee": "publishing an Avatar requires {{ fee }}",
+      "avatar_registered_name": "a registered name is required to set an avatar",
       "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_announcement": "group Announcements",
       "group_invited_you": "{{group}} has invited you",
+      "group_key_created": "first group key created.",
+      "group_member_list_changed": "the group member list has changed. Please re-encrypt the secret key.",
+      "group_no_secret_key": "there is no group secret key. Be the first admin to publish one!",
+      "group_secret_key_no_owner": "the latest group secret key was published by a non-owner. As the owner of the group please re-encrypt the key as a safeguard.",
+      "invalid_content": "invalid content, sender, or timestamp in reaction data",
       "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.",
@@ -74,6 +90,7 @@
       "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_announcement": "no announcements",
       "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.",
@@ -93,8 +110,10 @@
       "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:",
+      "qortals_required": "you need at least {{ quantity }} QORT to send a message",
       "timeout_reward": "timeout waiting for reward share confirmation",
       "thread_id": "unable to locate thread Id",
+      "unable_determine_group_private": "unable to determine if group is private",
       "unable_minting": "unable to start minting"
     },
     "success": {
@@ -119,6 +138,8 @@
       "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",
+      "published_secret_key": "published secret key for group {{ group_id }}: awaiting confirmation",
+      "published_secret_key_label": "published secret key for group {{ group_id }}: success!",
       "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!",
diff --git a/src/i18n/locales/es/auth.json b/src/i18n/locales/es/auth.json
index 5d4b8b6..d43014f 100644
--- a/src/i18n/locales/es/auth.json
+++ b/src/i18n/locales/es/auth.json
@@ -2,22 +2,62 @@
   "account": {
     "your": "tu cuenta",
     "account_many": "cuentas",
-    "account_one": "cuenta"
+    "account_one": "cuenta",
+    "selected": "cuenta seleccionada"
+  },
+  "action": {
+    "add": {
+      "account": "añadir cuenta",
+      "seed_phrase": "añadir frase semilla"
+    },
+    "authenticate": "autenticar",
+    "create_account": "crear cuenta",
+    "create_qortal_account": "crea tu cuenta Qortal haciendo clic en <next>SIGUIENTE</next> abajo.",
+    "choose_password": "elige nueva contraseña",
+    "download_account": "descargar cuenta",
+    "export_seedphrase": "exportar frase semilla",
+    "publish_admin_secret_key": "publicar clave secreta de administrador",
+    "publish_group_secret_key": "publicar clave secreta de grupo",
+    "reencrypt_key": "reencriptar clave",
+    "return_to_list": "volver a la lista",
+    "setup_qortal_account": "configurar tu cuenta Qortal"
   },
   "advanced_users": "para usuarios avanzados",
   "apikey": {
-    "alternative": "alternativa: Seleccionar archivo",
-    "change": "cambiar clave API",
-    "enter": "ingresar clave API",
-    "import": "importar clave API",
+    "alternative": "alternativa: seleccionar archivo",
+    "change": "cambiar API key",
+    "enter": "ingresar API key",
+    "import": "importar API key",
     "key": "clave API",
-    "select_valid": "selecciona una clave API válida"
+    "select_valid": "selecciona una API key válida"
   },
-  "authenticate": "autenticar",
   "build_version": "versión de compilación",
-  "create_account": "crear cuenta",
-  "download_account": "descargar cuenta",
-  "keep_secure": "mantén tu archivo de cuenta seguro",
+  "message": {
+    "error": {
+      "account_creation": "no se pudo crear la cuenta.",
+      "field_not_found_json": "{{ field }} no encontrado en el JSON",
+      "incorrect_password": "contraseña incorrecta",
+      "invalid_secret_key": "clave secreta no válida",
+      "unable_reencrypt_secret_key": "no se pudo reencriptar la clave secreta"
+    },
+    "generic": {
+      "congrats_setup": "¡felicidades, estás listo!",
+      "no_account": "no hay cuentas guardadas",
+      "no_minimum_length": "no hay un requisito de longitud mínima",
+      "no_secret_key_published": "aún no se ha publicado una clave secreta",
+      "fetching_admin_secret_key": "obteniendo clave secreta de administrador",
+      "fetching_group_secret_key": "publicando clave secreta de grupo",
+      "last_encryption_date": "última fecha de encriptación: {{ date }} por {{ name }}",
+      "keep_secure": "mantén tu archivo de cuenta seguro",
+      "publishing_key": "recordatorio: después de publicar la clave, tardará un par de minutos en aparecer. Por favor espera.",
+      "seedphrase_notice": "una <seed>FRASE SEMILLA</seed> se ha generado aleatoriamente en segundo plano.",
+      "type_seed": "escribe o pega tu frase semilla",
+      "your_accounts": "tus cuentas guardadas"
+    },
+    "success": {
+      "reencrypted_secret_key": "clave secreta reencriptada con éxito. Puede tardar unos minutos en reflejarse. Actualiza el grupo en 5 minutos."
+    }
+  },
   "node": {
     "choose": "elegir nodo personalizado",
     "custom_many": "nodos personalizados",
@@ -26,17 +66,31 @@
     "using": "usando nodo",
     "using_public": "usando nodo público"
   },
+  "note": "nota",
   "password": "contraseña",
   "password_confirmation": "confirmar contraseña",
-  "return_to_list": "volver a la lista",
+  "seed": "frase semilla",
+  "seed_your": "tu frase semilla",
+  "tips": {
+    "additional_wallet": "usa esta opción para conectar billeteras Qortal adicionales que ya hayas creado, para poder iniciar sesión con ellas más tarde. Necesitarás acceso a tu archivo de respaldo JSON.",
+    "digital_id": "tu billetera es como tu identificación digital en Qortal, y es la forma en que iniciarás sesión en la interfaz de usuario de Qortal. Contiene tu dirección pública y el nombre de Qortal que eventualmente elegirás. Cada transacción está vinculada a tu ID, y aquí es donde gestionas todo tu QORT y otras criptomonedas intercambiables en Qortal.",
+    "existing_account": "¿ya tienes una cuenta Qortal? Ingresa aquí tu frase de respaldo secreta para acceder. Esta frase es una de las formas de recuperar tu cuenta.",
+    "key_encrypt_admin": "esta clave es para cifrar contenido relacionado con ADMIN. Solo los administradores podrán ver el contenido cifrado con ella.",
+    "key_encrypt_group": "esta clave es para cifrar contenido relacionado con GRUPO. Es la única utilizada en esta interfaz. Todos los miembros del grupo podrán ver el contenido cifrado con esta clave.",
+    "new_account": "crear una cuenta significa crear una nueva billetera e identificación digital para comenzar a usar Qortal. Una vez que hayas creado tu cuenta, puedes empezar a obtener QORT, comprar un nombre y avatar, publicar videos y blogs, y mucho más.",
+    "new_users": "¡los nuevos usuarios comienzan aquí!",
+    "safe_place": "guarda tu cuenta en un lugar que recuerdes.",
+    "view_seedphrase": "si deseas VER LA FRASE SEMILLA, haz clic en la palabra 'FRASE SEMILLA' en este texto. Las frases semilla se usan para generar la clave privada de tu cuenta Qortal. Por seguridad, no se muestran por defecto.",
+    "wallet_secure": "mantén segura tu billetera."
+  },
   "wallet": {
-    "password_confirmation": "confirmar contraseña del monedero",
-    "password": "contraseña del monedero",
+    "password_confirmation": "confirmar contraseña de la billetera",
+    "password": "contraseña de la billetera",
     "keep_password": "mantener la contraseña actual",
     "new_password": "nueva contraseña",
     "error": {
-      "missing_new_password": "por favor ingresa una nueva contraseña",
-      "missing_password": "por favor ingresa tu contraseña"
+      "missing_new_password": "por favor, ingresa una nueva contraseña",
+      "missing_password": "por favor, ingresa tu contraseña"
     }
   },
   "welcome": "bienvenido a"
diff --git a/src/i18n/locales/fr/auth.json b/src/i18n/locales/fr/auth.json
index f314d3e..3a761ad 100644
--- a/src/i18n/locales/fr/auth.json
+++ b/src/i18n/locales/fr/auth.json
@@ -1,38 +1,92 @@
 {
   "account": {
-    "your": "ton compte",
+    "your": "votre compte",
     "account_many": "comptes",
-    "account_one": "compte"
+    "account_one": "compte",
+    "selected": "compte sélectionné"
+  },
+  "action": {
+    "add": {
+      "account": "ajouter un compte",
+      "seed_phrase": "ajouter une phrase secrète"
+    },
+    "authenticate": "authentifier",
+    "create_account": "créer un compte",
+    "create_qortal_account": "créez votre compte Qortal en cliquant sur <next>SUIVANT</next> ci-dessous.",
+    "choose_password": "choisissez un nouveau mot de passe",
+    "download_account": "télécharger le compte",
+    "export_seedphrase": "exporter la phrase secrète",
+    "publish_admin_secret_key": "publier la clé secrète admin",
+    "publish_group_secret_key": "publier la clé secrète du groupe",
+    "reencrypt_key": "re-chiffrer la clé",
+    "return_to_list": "retour à la liste",
+    "setup_qortal_account": "configurer votre compte Qortal"
   },
   "advanced_users": "pour les utilisateurs avancés",
   "apikey": {
-    "alternative": "alternative : Sélectionner un fichier",
+    "alternative": "alternative : sélection de fichier",
     "change": "changer la clé API",
     "enter": "entrer la clé API",
     "import": "importer la clé API",
     "key": "clé API",
-    "select_valid": "sélectionnez une clé API valide"
+    "select_valid": "sélectionner une clé API valide"
   },
-  "authenticate": "authentifier",
   "build_version": "version de build",
-  "create_account": "créer un compte",
-  "download_account": "télécharger le compte",
-  "keep_secure": "Gardez votre fichier de compte en sécurité",
+  "message": {
+    "error": {
+      "account_creation": "impossible de créer le compte.",
+      "field_not_found_json": "{{ field }} introuvable dans le JSON",
+      "incorrect_password": "mot de passe incorrect",
+      "invalid_secret_key": "clé secrète invalide",
+      "unable_reencrypt_secret_key": "impossible de re-chiffrer la clé secrète"
+    },
+    "generic": {
+      "congrats_setup": "félicitations, tout est prêt !",
+      "no_account": "aucun compte enregistré",
+      "no_minimum_length": "aucune exigence de longueur minimale",
+      "no_secret_key_published": "aucune clé secrète publiée pour le moment",
+      "fetching_admin_secret_key": "récupération de la clé secrète admin",
+      "fetching_group_secret_key": "publication de la clé secrète du groupe",
+      "last_encryption_date": "dernière date de chiffrement : {{ date }} par {{ name }}",
+      "keep_secure": "gardez votre fichier de compte en sécurité",
+      "publishing_key": "rappel : après publication, la clé peut mettre quelques minutes à apparaître. Veuillez patienter.",
+      "seedphrase_notice": "une <seed>PHRASE SECRÈTE</seed> a été générée aléatoirement en arrière-plan.",
+      "type_seed": "saisissez ou collez votre phrase secrète",
+      "your_accounts": "vos comptes enregistrés"
+    },
+    "success": {
+      "reencrypted_secret_key": "clé secrète re-chiffrée avec succès. Les modifications peuvent prendre quelques minutes pour se propager. Rafraîchissez le groupe dans 5 minutes."
+    }
+  },
   "node": {
     "choose": "choisir un nœud personnalisé",
     "custom_many": "nœuds personnalisés",
     "use_custom": "utiliser un nœud personnalisé",
     "use_local": "utiliser un nœud local",
-    "using": "utilise le nœud",
-    "using_public": "utilise un nœud public"
+    "using": "utilisation du nœud",
+    "using_public": "utilisation d’un nœud public"
   },
+  "note": "note",
   "password": "mot de passe",
   "password_confirmation": "confirmer le mot de passe",
-  "return_to_list": "retour à la liste",
+  "seed": "phrase secrète",
+  "seed_your": "votre phrase secrète",
+  "tips": {
+    "additional_wallet": "utilisez cette option pour connecter d'autres portefeuilles Qortal que vous avez déjà créés, afin de pouvoir vous y connecter ultérieurement. Vous aurez besoin de votre fichier de sauvegarde JSON.",
+    "digital_id": "votre portefeuille est comme votre identifiant numérique sur Qortal, et c’est ainsi que vous vous connecterez à l’interface utilisateur Qortal. Il contient votre adresse publique et le nom Qortal que vous choisirez. Chaque transaction est liée à votre ID, et c’est là que vous gérez votre QORT et d'autres cryptomonnaies échangeables sur Qortal.",
+    "existing_account": "vous avez déjà un compte Qortal ? Entrez ici votre phrase secrète de sauvegarde pour y accéder. C’est un des moyens de récupérer votre compte.",
+    "key_encrypt_admin": "cette clé est utilisée pour chiffrer le contenu ADMIN. Seuls les administrateurs peuvent voir ce contenu.",
+    "key_encrypt_group": "cette clé est utilisée pour chiffrer le contenu du GROUPE. C’est la seule utilisée dans cette interface pour le moment. Tous les membres du groupe pourront voir le contenu chiffré avec cette clé.",
+    "new_account": "créer un compte signifie créer un nouveau portefeuille et identifiant numérique pour commencer à utiliser Qortal. Une fois votre compte créé, vous pourrez obtenir du QORT, acheter un nom et un avatar, publier des vidéos et blogs, et bien plus.",
+    "new_users": "nouveaux utilisateurs, commencez ici !",
+    "safe_place": "sauvegardez votre compte dans un endroit sûr et mémorable !",
+    "view_seedphrase": "si vous souhaitez VOIR LA PHRASE SECRÈTE, cliquez sur le mot 'PHRASE SECRÈTE' dans ce texte. Les phrases secrètes servent à générer la clé privée de votre compte Qortal. Par sécurité, elles ne sont PAS affichées par défaut.",
+    "wallet_secure": "gardez votre fichier de portefeuille sécurisé."
+  },
   "wallet": {
     "password_confirmation": "confirmer le mot de passe du portefeuille",
     "password": "mot de passe du portefeuille",
-    "keep_password": "garder le mot de passe actuel",
+    "keep_password": "conserver le mot de passe actuel",
     "new_password": "nouveau mot de passe",
     "error": {
       "missing_new_password": "veuillez entrer un nouveau mot de passe",
diff --git a/src/i18n/locales/it/auth.json b/src/i18n/locales/it/auth.json
index 513378f..9e488fd 100644
--- a/src/i18n/locales/it/auth.json
+++ b/src/i18n/locales/it/auth.json
@@ -2,47 +2,96 @@
   "account": {
     "your": "il tuo account",
     "account_many": "account",
-    "account_one": "account"
+    "account_one": "account",
+    "selected": "account selezionato"
   },
-  "advanced_users": "per utenti avanzati",
+  "action": {
+    "add": {
+      "account": "aggiungi account",
+      "seed_phrase": "aggiungi frase segreta"
+    },
+    "authenticate": "autenticazione",
+    "create_account": "crea account",
+    "create_qortal_account": "crea il tuo account Qortal cliccando su <next>AVANTI</next> qui sotto.",
+    "choose_password": "scegli una nuova password",
+    "download_account": "scarica account",
+    "export_seedphrase": "esporta frase segreta",
+    "publish_admin_secret_key": "pubblica chiave segreta admin",
+    "publish_group_secret_key": "pubblica chiave segreta gruppo",
+    "reencrypt_key": "ricripta chiave",
+    "return_to_list": "torna alla lista",
+    "setup_qortal_account": "configura il tuo account Qortal"
+  },
+  "advanced_users": "per utenti esperti",
   "apikey": {
-    "alternative": "alternativa: selezione file",
-    "change": "cambia APIkey",
-    "enter": "inserisci APIkey",
-    "import": "importa APIkey",
+    "alternative": "alternativa: seleziona file",
+    "change": "cambia chiave API",
+    "enter": "inserisci chiave API",
+    "import": "importa chiave API",
     "key": "chiave API",
-    "select_valid": "seleziona una APIkey valida"
+    "select_valid": "seleziona una chiave API valida"
   },
-  "authenticate": "autentica",
   "build_version": "versione build",
-  "create_account": "crea account",
-  "download_account": "scarica account",
-  "keep_secure": "mantieni sicuro il file del tuo account",
+  "message": {
+    "error": {
+      "account_creation": "impossibile creare l’account.",
+      "field_not_found_json": "{{ field }} non trovato nel JSON",
+      "incorrect_password": "password errata",
+      "invalid_secret_key": "chiave segreta non valida",
+      "unable_reencrypt_secret_key": "impossibile ricriptare la chiave segreta"
+    },
+    "generic": {
+      "congrats_setup": "congratulazioni, sei pronto!",
+      "no_account": "nessun account salvato",
+      "no_minimum_length": "nessun requisito di lunghezza minima",
+      "no_secret_key_published": "nessuna chiave segreta pubblicata",
+      "fetching_admin_secret_key": "recupero chiave segreta admin",
+      "fetching_group_secret_key": "pubblicazione chiave segreta gruppo",
+      "last_encryption_date": "ultima data di cifratura: {{ date }} da {{ name }}",
+      "keep_secure": "mantieni sicuro il tuo file account",
+      "publishing_key": "promemoria: dopo la pubblicazione della chiave, ci vorranno alcuni minuti per vederla. Attendere cortesemente.",
+      "seedphrase_notice": "una <seed>FRASE SEGRETA</seed> è stata generata automaticamente in background.",
+      "type_seed": "digita o incolla la tua frase segreta",
+      "your_accounts": "i tuoi account salvati"
+    },
+    "success": {
+      "reencrypted_secret_key": "chiave segreta ricriptata con successo. Potrebbero volerci alcuni minuti per vedere le modifiche. Aggiorna il gruppo tra 5 minuti."
+    }
+  },
   "node": {
     "choose": "scegli nodo personalizzato",
     "custom_many": "nodi personalizzati",
     "use_custom": "usa nodo personalizzato",
     "use_local": "usa nodo locale",
     "using": "utilizzo nodo",
-    "using_public": "utilizzo nodo pubblico"
+    "using_public": "utilizzo di nodo pubblico"
   },
+  "note": "nota",
   "password": "password",
   "password_confirmation": "conferma password",
-  "return_to_list": "torna alla lista",
+  "seed": "frase segreta",
+  "seed_your": "la tua frase segreta",
   "tips": {
-    "digital_id": "il tuo wallet è come la tua identità digitale su Qortal ed è il modo in cui accederai all'interfaccia utente di Qortal. Contiene il tuo indirizzo pubblico e il nome Qortal che sceglierai. Ogni transazione che esegui è collegata alla tua identità ed è qui che gestisci tutti i tuoi QORT e altre criptovalute scambiabili su Qortal.",
-    "new_account": "creare un account significa creare un nuovo wallet e un'identità digitale per iniziare a usare Qortal. Una volta creato l'account, potrai iniziare a ottenere QORT, acquistare un nome e un avatar, pubblicare video e blog, e molto altro.",
-    "new_users": "i nuovi utenti iniziano qui!"
+    "additional_wallet": "usa questa opzione per connettere altri portafogli Qortal che hai già creato, per accedervi successivamente. Avrai bisogno del file JSON di backup.",
+    "digital_id": "il tuo portafoglio è come la tua ID digitale su Qortal, ed è il modo con cui accedi all’interfaccia utente. Contiene il tuo indirizzo pubblico e il nome Qortal che sceglierai. Ogni transazione è legata alla tua ID, e qui gestisci QORT e altre criptovalute scambiabili su Qortal.",
+    "existing_account": "hai già un account Qortal? Inserisci qui la tua frase di backup segreta per accedervi. Questa frase è uno dei modi per recuperare l'account.",
+    "key_encrypt_admin": "questa chiave serve a criptare contenuti legati agli ADMIN. Solo gli admin potranno vederli.",
+    "key_encrypt_group": "questa chiave serve a criptare contenuti di GRUPPO. È l’unica usata in questa interfaccia. Tutti i membri del gruppo potranno vederli.",
+    "new_account": "creare un account significa creare un nuovo portafoglio e una nuova ID digitale per iniziare a usare Qortal. Una volta creato l’account, potrai ottenere QORT, acquistare un nome e avatar, pubblicare video e blog, e molto altro.",
+    "new_users": "nuovi utenti, iniziate qui!",
+    "safe_place": "salva il tuo account in un posto sicuro che ricorderai!",
+    "view_seedphrase": "se vuoi VEDERE LA FRASE SEGRETA, clicca sulla parola 'FRASE SEGRETA' in questo testo. Le frasi segrete generano la chiave privata del tuo account. Per sicurezza, non vengono mostrate di default.",
+    "wallet_secure": "mantieni sicuro il tuo file portafoglio."
   },
   "wallet": {
-    "password_confirmation": "conferma password del wallet",
-    "password": "password del wallet",
-    "keep_password": "mantieni password corrente",
+    "password_confirmation": "conferma password portafoglio",
+    "password": "password del portafoglio",
+    "keep_password": "mantieni password attuale",
     "new_password": "nuova password",
     "error": {
-      "missing_new_password": "per favore inserisci una nuova password",
-      "missing_password": "per favore inserisci la tua password"
+      "missing_new_password": "inserisci una nuova password",
+      "missing_password": "inserisci la tua password"
     }
   },
-  "welcome": "benvenuto in"
+  "welcome": "benvenuto su"
 }
diff --git a/src/i18n/locales/it/core.json b/src/i18n/locales/it/core.json
index 730d95d..8bf930d 100644
--- a/src/i18n/locales/it/core.json
+++ b/src/i18n/locales/it/core.json
@@ -1,41 +1,98 @@
 {
   "action": {
     "add": "aggiungi",
+    "add_custom_framework": "aggiungi custom framework",
+    "add_reaction": "adaggiungid reazione",
     "accept": "accetta",
+    "access": "accedi",
     "backup_account": "esegui backup account",
-    "backup_wallet": "esegui backup portafoglio",
-    "cancel": "annulla",
-    "cancel_invitation": "annulla invito",
+    "backup_wallet": "esegui backup wallet",
+    "cancel": "cancella",
+    "cancel_invitation": "cancella invito",
     "change": "cambia",
+    "change_avatar": "cambia avatar",
+    "change_file": "cambia file",
     "change_language": "cambia lingua",
     "choose": "scegli",
+    "choose_file": "scegli file",
+    "choose_image": "scegli immagine",
     "close": "chiudi",
+    "close_chat": "chiudi Chat Diretta",
     "continue": "continua",
-    "continue_logout": "continua con il logout",
-    "create_thread": "crea discussione",
-    "decline": "rifiuta",
-    "decrypt": "decifra",
+    "continue_logout": "continua il logout",
+    "copy_link": "copia link",
+    "create_apps": "crea apps",
+    "create_file": "crea file",
+    "create_thread": "crea thread",
+    "choose_logo": "scegli a logo",
+    "choose_name": "scegli a name",
+    "decline": "declina",
+    "decrypt": "decripta",
+    "disable_enter": "disabilita invio",
+    "download": "download",
     "edit": "modifica",
+    "enter_name": "inserisci un nome",
     "export": "esporta",
+    "get_qort": "ottieni QORT in Q-Trade",
+    "hide": "nascondi",
     "import": "importa",
     "invite": "invita",
     "join": "unisciti",
-    "logout": "esci",
+    "leave_comment": "lascia un commento",
+    "load_announcements": "load older announcements",
+    "login": "login",
+    "logout": "logout",
     "new": {
       "post": "nuovo post",
       "thread": "nuova discussione"
     },
-    "notify": "notifica",
-    "post": "pubblica",
-    "post_message": "invia messaggio"
+    "notify": "notify",
+    "open": "open",
+    "pin": "pin",
+    "pin_app": "pin app",
+    "pin_from_dashboard": "pin from dashboard",
+    "post": "post",
+    "post_message": "post message",
+    "publish": "publish",
+    "publish_app": "publish your app",
+    "publish_comment": "publish comment",
+    "register_name": "register name",
+    "remove": "remove",
+    "remove_reaction": "remove reaction",
+    "return_apps_dashboard": "return to Apps Dashboard",
+    "save": "save",
+    "search": "search",
+    "search_apps": "search for apps",
+    "select_app_type": "select App Type",
+    "select_category": "select Category",
+    "select_name_app": "select Name/App",
+    "set_avatar": "set avatar",
+    "start_minting": "start minting",
+    "start_typing": "start typing here...",
+    "transfer_qort": "Transfer QORT",
+    "unpin": "unpin",
+    "unpin_app": "unpin app",
+    "unpin_from_dashboard": "unpin from dashboard",
+    "update": "update",
+    "update_app": "update your app"
   },
-  "admin": "amministratore",
+  "admin": "admin",
+  "all": "all",
+  "api": "API",
+  "app": "app",
+  "app_name": "app name",
+  "app_service_type": "app service type",
+  "apps_dashboard": "apps Dashboard",
+  "apps_official": "official Apps",
+  "category": "category",
+  "category_other": "categories",
   "core": {
     "block_height": "altezza blocco",
     "information": "informazioni core",
     "peers": "peer connessi",
     "version": "versione core"
   },
+  "domain": "domain",
   "ui": {
     "version": "versione UI"
   },
@@ -44,27 +101,123 @@
     "one": "uno"
   },
   "description": "descrizione",
-  "downloading_qdn": "scaricamento da QDN",
+  "devmode_apps": "dev Mode Apps",
+  "directory": "directory",
+  "downloading_qdn": "download da QDN",
   "fee": {
     "payment": "commissione di pagamento",
     "publish": "commissione di pubblicazione"
   },
+  "for": "per",
   "general_settings": "impostazioni generali",
-  "last_height": "ultima altezza",
+  "identifier": "identificatore",
+  "last_height": "altezza ultima",
+  "level": "livello",
+  "library": "libreria",
   "list": {
     "invite": "lista inviti",
     "join_request": "lista richieste di adesione",
     "member": "lista membri"
   },
-  "loading": "caricamento...",
-  "loading_posts": "caricamento post... attendere.",
-  "message_us": "contattaci su Telegram o Discord se hai bisogno di 4 QORT per iniziare a chattare senza limitazioni",
+  "loading": {
+    "announcements": "annunci",
+    "generic": "caricamento...",
+    "chat": "caricamento chat... attendere, per favore.",
+    "comments": "caricamento commenti... attendere, per favore.",
+    "posts": "caricamento post... attendere, per favore."
+  },
+  "message_us": "please message us on Telegram or Discord if you need 4 QORT to start chatting without any limitations",
   "message": {
     "error": {
-      "generic": "si è verificato un errore",
-      "incorrect_password": "password errata",
-      "missing_field": "manca: {{ field }}",
-      "save_qdn": "impossibile salvare su QDN"
+      "address_not_found": "your address was not found",
+      "app_need_name": "your app needs a name",
+      "file_too_large": "file {{ filename }} is too large. Max size allowed is {{ size }} MB.",
+      "generic": "an error occurred",
+      "invalid_signature": "invalid signature",
+      "invalid_zip": "invalid zip",
+      "message_loading": "error loading message.",
+      "message_size": "your message size is of {{ size }} bytes out of a maximum of {{ maximum }}",
+      "minting_account_add": "unable to add minting account",
+      "minting_account_remove": "unable to remove minting account",
+      "missing_fields": "missing: {{ fields }}",
+      "navigation_timeout": "navigation timeout",
+      "network_generic": "network error",
+      "password_not_matching": "password fields do not match!",
+      "password_wrong": "unable to authenticate. Wrong password",
+      "publish_app": "unable to publish app",
+      "rating_option": "cannot find rating option",
+      "save_qdn": "unable to save to QDN",
+      "send_failed": "failed to send",
+      "unable_encrypt_app": "unable to encrypt app. App not published'",
+      "unable_publish_app": "unable to publish app",
+      "unable_publish_image": "unable to publish image",
+      "unable_rate": "unable to rate",
+      "update_failed": "failed to update"
+    },
+    "generic": {
+      "avatar_size": "{{ size }} KB max. for GIFS",
+      "buy_order_request": "the Application <br/><italic>{{hostname}}</italic> <br/><span>is requesting {{count}} buy order</span>",
+      "buy_order_request_other": "the Application <br/><italic>{{hostname}}</italic> <br/><span>is requesting {{count}} buy orders</span>",
+      "devmode_local_node": "please use your local node for dev mode! Logout and use Local node.",
+      "edited": "edited",
+      "editing_message": "editing message",
+      "fee_qort": "fee: {{ message }} QORT",
+      "foreign_fee": "foreign fee: {{ message }}",
+      "mentioned": "mentioned",
+      "message_with_image": "this message already has an image",
+      "name_available": "{{ name }} is available",
+      "name_benefits": "benefits of a name",
+      "name_checking": "checking if name already exists",
+      "name_preview": "you need a name to use preview",
+      "name_publish": "you need a Qortal name to publish",
+      "name_rate": "you need a name to rate.",
+      "name_registration": "your balance is {{ balance }} QORT. A name registration requires a {{ fee }} QORT fee",
+      "name_unavailable": "{{ name }} is unavailable",
+      "no_description": "no description",
+      "no_minting_details": "cannot view minting details on the gateway",
+      "no_notifications": "no new notifications",
+      "no_pinned_changes": "you currently do not have any changes to your pinned apps",
+      "no_results": "no results",
+      "one_app_per_name": "note: Currently, only one App and Website is allowed per Name.",
+      "overwrite_qdn": "overwrite to QDN",
+      "password_confirm": "please confirm a password",
+      "password_enter": "please enter a password",
+      "payment_request": "the Application <br/><italic>{{hostname}}</italic> <br/><span>is requesting a payment</span>",
+      "people_reaction": "people who reacted with {{ reaction }}",
+      "publish_data": "publish data to Qortal: anything from apps to videos. Fully decentralized!",
+      "publishing": "publishing... Please wait.",
+      "qdn": "use QDN saving",
+      "rating": "rating for {{ service }} {{ name }}",
+      "register_name": "you need a registered Qortal name to save your pinned apps to QDN.",
+      "replied_to": "replied to {{ person }}",
+      "revert_default": "revert to default",
+      "revert_qdn": "revert to QDN",
+      "save_qdn": "save to QDN",
+      "secure_ownership": "secure ownership of data published by your name. You can even sell your name, along with your data to a third party.",
+      "select_file": "please select a file",
+      "select_image": "please select an image for a logo",
+      "select_zip": "select .zip file containing static content:",
+      "sending": "sending...",
+      "settings": "you are using the export/import way of saving settings.",
+      "space_for_admins": "sorry, this space is only for Admins.",
+      "unread_messages": "unread messages below",
+      "unsaved_changes": "you have unsaved changes to your pinned apps. Save them to QDN.",
+      "updating": "updating"
+    },
+    "question": {
+      "logout": "are you sure you would like to logout?",
+      "new_user": "are you a new user?",
+      "delete_chat_image": "would you like to delete your previous chat image?",
+      "perform_transaction": "would you like to perform a {{action}} transaction?",
+      "provide_thread": "please provide a thread title",
+      "publish_app": "would you like to publish this app?",
+      "publish_avatar": "would you like to publish an avatar?",
+      "publish_qdn": "would you like to publish your settings to QDN (encrypted)?",
+      "overwrite_changes": "the app was unable to download your existing QDN-saved pinned apps. Would you like to overwrite those changes?",
+      "rate_app": "would you like to rate this app a rating of {{ rate }}?. It will create a POLL tx.",
+      "register_name": "would you like to register this name?",
+      "reset_pinned": "don't like your current local changes? Would you like to reset to the default pinned apps?",
+      "reset_qdn": "don't like your current local changes? Would you like to reset to your saved QDN pinned apps?"
     },
     "status": {
       "minting": "(in conio)",
@@ -73,13 +226,18 @@
       "synchronizing": "sincronizzazione"
     },
     "success": {
-      "order_submitted": "il tuo ordine di acquisto è stato inviato",
-      "publish_qdn": "pubblicato con successo su QDN",
-      "request_read": "ho letto questa richiesta",
-      "transfer": "il trasferimento è riuscito!"
+      "order_submitted": "your buy order was submitted",
+      "published": "successfully published. Please wait a couple minutes for the network to propogate the changes.",
+      "published_qdn": "successfully published to QDN",
+      "rated_app": "successfully rated. Please wait a couple minutes for the network to propogate the changes.",
+      "request_read": "I have read this request",
+      "transfer": "the transfer was succesful!"
     }
   },
-  "minting_status": "stato conio",
+  "minting_status": "stato del conio",
+  "name": "nome",
+  "name_app": "nome/App",
+  "none": "nessuno",
   "page": {
     "last": "ultima",
     "first": "prima",
@@ -89,27 +247,13 @@
   "payment_notification": "notifica di pagamento",
   "price": "prezzo",
   "q_mail": "q-mail",
-  "question": {
-    "new_user": "sei un nuovo utente?"
+  "server": "server",
+  "settings": "settings",
+  "sort": {
+    "by_member": "by member"
   },
-  "save_options": {
-    "no_pinned_changes": "attualmente non hai modifiche nelle app fissate",
-    "overwrite_changes": "l'app non è riuscita a scaricare le tue app fissate salvate su QDN. Vuoi sovrascrivere le modifiche?",
-    "overwrite_qdn": "sovrascrivi su QDN",
-    "publish_qdn": "vuoi pubblicare le tue impostazioni su QDN (crittografate)?",
-    "qdn": "usa salvataggio QDN",
-    "register_name": "hai bisogno di un nome Qortal registrato per salvare le app fissate su QDN.",
-    "reset_pinned": "non ti piacciono le modifiche locali? Vuoi ripristinare le app fissate predefinite?",
-    "reset_qdn": "non ti piacciono le modifiche locali? Vuoi ripristinare le app fissate salvate su QDN?",
-    "revert_default": "ripristina ai valori predefiniti",
-    "revert_qdn": "ripristina da QDN",
-    "save_qdn": "salva su QDN",
-    "save": "salva",
-    "settings": "stai usando il metodo di esportazione/importazione per salvare le impostazioni.",
-    "unsaved_changes": "hai modifiche non salvate nelle app fissate. Salvale su QDN."
-  },
-  "settings": "impostazioni",
-  "supply": "offerta",
+  "supply": "supply",
+  "tags": "tags",
   "theme": {
     "dark": "modalità scura",
     "light": "modalità chiara"
@@ -125,9 +269,13 @@
   "title": "titolo",
   "tutorial": "tutorial",
   "user_lookup": "ricerca utente",
+  "zip": "zip",
   "wallet": {
+    "litecoin": "portafoglio litecoin",
+    "qortal": "portafoglio qortal",
     "wallet": "portafoglio",
     "wallet_other": "portafogli"
   },
+  "website": "website",
   "welcome": "benvenuto"
 }
diff --git a/src/i18n/locales/it/group.json b/src/i18n/locales/it/group.json
index e53b6c8..510565f 100644
--- a/src/i18n/locales/it/group.json
+++ b/src/i18n/locales/it/group.json
@@ -16,9 +16,17 @@
     "load_members": "carica membri con nomi",
     "make_admin": "rendi amministratore",
     "manage_members": "gestisci membri",
+    "promote_group": "promuovi il gruppo ai non-membri",
+    "publish_announcement": "pubblica annuncio",
+    "publish_avatar": "pubblica avatar",
     "refetch_page": "ricarica pagina",
     "remove_admin": "rimuovi come amministratore",
-    "return_to_thread": "torna alle discussioni"
+    "remove_minting_account": "rimuovi account di conio",
+    "return_to_thread": "torna alle discussioni",
+    "scroll_bottom": "vai in fondo",
+    "scroll_unread_messages": "vai ai messaggi non letti",
+    "select_group": "seleziona un gruppo",
+    "visit_q_mintership": "visita Q-Mintership"
   },
   "advanced_options": "opzioni avanzate",
   "approval_threshold": "soglia di approvazione del gruppo (numero / percentuale di amministratori che devono approvare una transazione)",
@@ -28,14 +36,21 @@
     "maximum": "ritardo massimo dei blocchi per le approvazioni delle transazioni di gruppo"
   },
   "group": {
+    "avatar": "avatar del gruppo",
     "closed": "chiuso (privato) – gli utenti hanno bisogno del permesso per entrare",
     "description": "descrizione del gruppo",
     "id": "ID gruppo",
     "invites": "inviti del gruppo",
+    "group": "gruppo",
+    "group_other": "gruppi",
     "management": "gestione del gruppo",
     "member_number": "numero di membri",
+    "messaging": "messaggi",
     "name": "nome del gruppo",
     "open": "aperto (pubblico)",
+    "private": "gruppo privato",
+    "promotions": "promozione gruppi",
+    "public": "gruppo pubblico",
     "type": "tipo di gruppo"
   },
   "invitation_expiry": "tempo di scadenza dell'invito",
@@ -46,16 +61,40 @@
   "latest_mails": "ultimi Q-Mails",
   "message": {
     "generic": {
+      "avatar_publish_fee": "publishing an Avatar requires {{ fee }}",
+      "avatar_registered_name": "a registered name is required to set an avatar",
+      "admin_only": "only groups where you are an admin will be shown",
       "already_in_group": "sei già in questo gruppo!",
       "closed_group": "questo è un gruppo chiuso/privato, devi aspettare che un admin accetti la tua richiesta",
       "descrypt_wallet": "decrittazione portafoglio in corso...",
       "encryption_key": "la prima chiave di cifratura comune del gruppo è in fase di creazione. Attendere qualche minuto affinché venga recuperata dalla rete. Controllo ogni 2 minuti...",
+      "group_announcement": "group Announcements",
       "group_invited_you": "{{group}} ti ha invitato",
+      "group_key_created": "first group key created.",
+      "group_member_list_changed": "the group member list has changed. Please re-encrypt the secret key.",
+      "group_no_secret_key": "there is no group secret key. Be the first admin to publish one!",
+      "group_secret_key_no_owner": "the latest group secret key was published by a non-owner. As the owner of the group please re-encrypt the key as a safeguard.",
+      "invalid_content": "invalid content, sender, or timestamp in reaction data",
+      "invalid_data": "error loading content: Invalid Data",
+      "latest_promotion": "only the latest promotion from the week will be shown for your group.",
       "loading_members": "caricamento elenco membri con nomi... attendere.",
+      "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_announcement": "no announcements",
       "no_display": "niente da mostrare",
       "no_selection": "nessun gruppo selezionato",
       "not_part_group": "non fai parte del gruppo cifrato. Attendi che un amministratore re-critti le chiavi.",
       "only_encrypted": "verranno mostrati solo i messaggi non cifrati.",
+      "only_private_groups": "only private groups will be shown",
       "private_key_copied": "chiave privata copiata",
       "provide_message": "inserisci un primo messaggio per la discussione",
       "secure_place": "conserva la tua chiave privata in un luogo sicuro. Non condividerla!",
@@ -66,10 +105,15 @@
       "descrypt_wallet": "errore nella decrittazione del portafoglio {{ :errorMessage }}",
       "description_required": "inserisci una descrizione",
       "group_info": "impossibile accedere alle informazioni del gruppo",
+      "group_promotion": "error publishing the promotion. Please try again",
       "group_secret_key": "impossibile ottenere la chiave segreta del gruppo",
       "name_required": "inserisci un nome",
       "notify_admins": "prova a contattare un amministratore dalla lista qui sotto:",
-      "thread_id": "impossibile trovare l'ID della discussione"
+      "qortals_required": "you need at least {{ quantity }} QORT to send a message",
+      "timeout_reward": "timeout waiting for reward share confirmation",
+      "thread_id": "impossibile trovare l'ID della discussione",
+      "unable_determine_group_private": "unable to determine if group is private",
+      "unable_minting": "unable to start minting"
     },
     "success": {
       "group_ban": "membro bannato con successo dal gruppo. Potrebbero volerci alcuni minuti affinché le modifiche si propaghino",
@@ -87,19 +131,27 @@
       "group_leave_name": "uscito dal gruppo {{group_name}}: in attesa di conferma",
       "group_leave_label": "uscito dal gruppo {{name}}: successo!",
       "group_member_admin": "membro nominato amministratore con successo. Potrebbero volerci alcuni minuti affinché le modifiche si propaghino",
+      "group_promotion": "successfully published promotion. It may take a couple of minutes for the promotion to appear",
       "group_remove_member": "amministratore rimosso con successo. Potrebbero volerci alcuni minuti affinché le modifiche si propaghino",
       "invitation_cancellation": "invito annullato con successo. Potrebbero volerci alcuni minuti affinché le modifiche si propaghino",
       "invitation_request": "richiesta di adesione accettata: in attesa di conferma",
       "loading_threads": "caricamento discussioni... attendere.",
       "post_creation": "post creato con successo. Potrebbe volerci un po' per la pubblicazione",
+      "published_secret_key": "published secret key for group {{ group_id }}: awaiting confirmation",
+      "published_secret_key_label": "published secret key for group {{ group_id }}: success!",
+      "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": "discussione creata con successo. Potrebbe volerci un po' per la pubblicazione",
       "unbanned_user": "utente sbannato con successo. Potrebbero volerci alcuni minuti affinché le modifiche si propaghino",
       "user_joined": "utente entrato con successo!"
     }
   },
-  "question": {
-    "perform_transaction": "vuoi eseguire una transazione di tipo {{action}}?",
-    "provide_thread": "inserisci un titolo per la discussione"
-  },
   "thread_posts": "nuovi messaggi nella discussione"
 }
diff --git a/src/i18n/locales/ru/auth.json b/src/i18n/locales/ru/auth.json
index 797220b..9d5d6be 100644
--- a/src/i18n/locales/ru/auth.json
+++ b/src/i18n/locales/ru/auth.json
@@ -1,10 +1,28 @@
 {
   "account": {
-    "your": "Ваш аккаунт",
+    "your": "ваш аккаунт",
     "account_many": "аккаунты",
-    "account_one": "аккаунт"
+    "account_one": "аккаунт",
+    "selected": "выбранный аккаунт"
   },
-  "advanced_users": "для продвинутых пользователей",
+  "action": {
+    "add": {
+      "account": "добавить аккаунт",
+      "seed_phrase": "добавить seed-фразу"
+    },
+    "authenticate": "аутентификация",
+    "create_account": "создать аккаунт",
+    "create_qortal_account": "создайте свой аккаунт Qortal, нажав <next>ДАЛЕЕ</next> ниже.",
+    "choose_password": "выберите новый пароль",
+    "download_account": "скачать аккаунт",
+    "export_seedphrase": "экспортировать seed-фразу",
+    "publish_admin_secret_key": "опубликовать секретный ключ администратора",
+    "publish_group_secret_key": "опубликовать секретный ключ группы",
+    "reencrypt_key": "перешифровать ключ",
+    "return_to_list": "вернуться к списку",
+    "setup_qortal_account": "настройте ваш аккаунт Qortal"
+  },
+  "advanced_users": "для опытных пользователей",
   "apikey": {
     "alternative": "альтернатива: выбрать файл",
     "change": "изменить API-ключ",
@@ -13,11 +31,33 @@
     "key": "API-ключ",
     "select_valid": "выберите действительный API-ключ"
   },
-  "authenticate": "аутентификация",
   "build_version": "версия сборки",
-  "create_account": "создать аккаунт",
-  "download_account": "скачать аккаунт",
-  "keep_secure": "Храните файл аккаунта в безопасности",
+  "message": {
+    "error": {
+      "account_creation": "не удалось создать аккаунт.",
+      "field_not_found_json": "{{ field }} не найден в JSON",
+      "incorrect_password": "неверный пароль",
+      "invalid_secret_key": "некорректный секретный ключ",
+      "unable_reencrypt_secret_key": "не удалось перешифровать секретный ключ"
+    },
+    "generic": {
+      "congrats_setup": "поздравляем, всё готово!",
+      "no_account": "аккаунты не сохранены",
+      "no_minimum_length": "требование к минимальной длине отсутствует",
+      "no_secret_key_published": "секретный ключ еще не опубликован",
+      "fetching_admin_secret_key": "получение секретного ключа администратора",
+      "fetching_group_secret_key": "публикация секретного ключа группы",
+      "last_encryption_date": "дата последнего шифрования: {{ date }}, автор: {{ name }}",
+      "keep_secure": "храните файл аккаунта в безопасности",
+      "publishing_key": "напоминание: после публикации ключа может пройти несколько минут до его появления. Пожалуйста, подождите.",
+      "seedphrase_notice": "в фоновом режиме была случайным образом сгенерирована <seed>SEED-ФРАЗА</seed>.",
+      "type_seed": "введите или вставьте свою seed-фразу",
+      "your_accounts": "ваши сохранённые аккаунты"
+    },
+    "success": {
+      "reencrypted_secret_key": "секретный ключ успешно перешифрован. Обновления могут занять несколько минут. Обновите группу через 5 минут."
+    }
+  },
   "node": {
     "choose": "выбрать пользовательский узел",
     "custom_many": "пользовательские узлы",
@@ -26,17 +66,31 @@
     "using": "используется узел",
     "using_public": "используется публичный узел"
   },
+  "note": "заметка",
   "password": "пароль",
   "password_confirmation": "подтвердите пароль",
-  "return_to_list": "вернуться к списку",
+  "seed": "seed-фраза",
+  "seed_your": "ваша seed-фраза",
+  "tips": {
+    "additional_wallet": "используйте эту опцию, чтобы подключить дополнительные кошельки Qortal, которые вы уже создали. Вам понадобится файл резервной копии JSON.",
+    "digital_id": "ваш кошелёк — это ваш цифровой идентификатор в Qortal. Через него вы входите в интерфейс пользователя Qortal. Он содержит ваш публичный адрес и выбранное вами имя Qortal. Все ваши транзакции связаны с этим ID. Здесь вы управляете QORT и другими криптовалютами в Qortal.",
+    "existing_account": "уже есть аккаунт Qortal? Введите здесь вашу секретную фразу восстановления для доступа. Это один из способов восстановить аккаунт.",
+    "key_encrypt_admin": "этот ключ используется для шифрования контента, связанного с АДМИНИСТРАТОРОМ. Только администраторы смогут его видеть.",
+    "key_encrypt_group": "этот ключ используется для шифрования контента ГРУППЫ. В данный момент он единственный, используемый в этом интерфейсе. Все участники группы смогут видеть зашифрованный контент.",
+    "new_account": "создание аккаунта создаёт новый кошелёк и цифровой ID для начала работы с Qortal. После этого вы сможете получать QORT, покупать имя и аватар, публиковать видео и блоги и многое другое.",
+    "new_users": "новые пользователи — начните отсюда!",
+    "safe_place": "сохраните свой аккаунт в надёжном месте, которое вы не забудете!",
+    "view_seedphrase": "если вы хотите ПОСМОТРЕТЬ SEED-ФРАЗУ, нажмите на слово 'SEED-ФРАЗА' в этом тексте. Seed-фразы используются для генерации приватного ключа аккаунта. В целях безопасности по умолчанию они НЕ отображаются.",
+    "wallet_secure": "держите файл кошелька в безопасности."
+  },
   "wallet": {
     "password_confirmation": "подтвердите пароль кошелька",
     "password": "пароль кошелька",
-    "keep_password": "сохранить текущий пароль",
+    "keep_password": "оставить текущий пароль",
     "new_password": "новый пароль",
     "error": {
-      "missing_new_password": "пожалуйста, введите новый пароль",
-      "missing_password": "пожалуйста, введите ваш пароль"
+      "missing_new_password": "введите новый пароль",
+      "missing_password": "введите пароль"
     }
   },
   "welcome": "добро пожаловать в"
diff --git a/src/qdn/encryption/group-encryption.ts b/src/qdn/encryption/group-encryption.ts
index 82734ee..e883db5 100644
--- a/src/qdn/encryption/group-encryption.ts
+++ b/src/qdn/encryption/group-encryption.ts
@@ -1,509 +1,634 @@
 // @ts-nocheck
 
-import Base58 from "../../deps/Base58"
-import ed2curve from "../../deps/ed2curve"
-import nacl from "../../deps/nacl-fast"
-
+import Base58 from '../../deps/Base58';
+import ed2curve from '../../deps/ed2curve';
+import nacl from '../../deps/nacl-fast';
 
 export function base64ToUint8Array(base64: string) {
-	const binaryString = atob(base64)
-	const len = binaryString.length
-	const bytes = new Uint8Array(len)
-	for (let i = 0; i < len; i++) {
-		bytes[i] = binaryString.charCodeAt(i)
-	}
-	return bytes
+  const binaryString = atob(base64);
+  const len = binaryString.length;
+  const bytes = new Uint8Array(len);
+  for (let i = 0; i < len; i++) {
+    bytes[i] = binaryString.charCodeAt(i);
+  }
+  return bytes;
 }
 
 export function uint8ArrayToBase64(uint8Array: any) {
-	const length = uint8Array.length
-	let binaryString = ''
-	const chunkSize = 1024 * 1024; // Process 1MB at a time
-	for (let i = 0; i < length; i += chunkSize) {
-		const chunkEnd = Math.min(i + chunkSize, length)
-		const chunk = uint8Array.subarray(i, chunkEnd)
-		binaryString += Array.from(chunk, byte => String.fromCharCode(byte)).join('')
-	}
-	return btoa(binaryString)
+  const length = uint8Array.length;
+  let binaryString = '';
+  const chunkSize = 1024 * 1024; // Process 1MB at a time
+  for (let i = 0; i < length; i += chunkSize) {
+    const chunkEnd = Math.min(i + chunkSize, length);
+    const chunk = uint8Array.subarray(i, chunkEnd);
+    binaryString += Array.from(chunk, (byte) => String.fromCharCode(byte)).join(
+      ''
+    );
+  }
+  return btoa(binaryString);
 }
 
 export function objectToBase64(obj: Object) {
-	// Step 1: Convert the object to a JSON string
-	const jsonString = JSON.stringify(obj)
-	// Step 2: Create a Blob from the JSON string
-	const blob = new Blob([jsonString], { type: 'application/json' })
-	// Step 3: Create a FileReader to read the Blob as a base64-encoded string
-	return new Promise((resolve, reject) => {
-		const reader = new FileReader()
-		reader.onloadend = () => {
-			if (typeof reader.result === 'string') {
-				// Remove 'data:application/json;base64,' prefix
-				const base64 = reader.result.replace(
-					'data:application/json;base64,',
-					''
-				)
-				resolve(base64)
-			} else {
-				reject(new Error('Failed to read the Blob as a base64-encoded string'))
-			}
-		}
-		reader.onerror = () => {
-			reject(reader.error)
-		}
-		reader.readAsDataURL(blob)
-	})
+  // Step 1: Convert the object to a JSON string
+  const jsonString = JSON.stringify(obj);
+  // Step 2: Create a Blob from the JSON string
+  const blob = new Blob([jsonString], { type: 'application/json' });
+  // Step 3: Create a FileReader to read the Blob as a base64-encoded string
+  return new Promise((resolve, reject) => {
+    const reader = new FileReader();
+    reader.onloadend = () => {
+      if (typeof reader.result === 'string') {
+        // Remove 'data:application/json;base64,' prefix
+        const base64 = reader.result.replace(
+          'data:application/json;base64,',
+          ''
+        );
+        resolve(base64);
+      } else {
+        reject(new Error('Failed to read the Blob as a base64-encoded string'));
+      }
+    };
+    reader.onerror = () => {
+      reject(reader.error);
+    };
+    reader.readAsDataURL(blob);
+  });
 }
 
 // Function to create a symmetric key and nonce
 export const createSymmetricKeyAndNonce = () => {
-    const messageKey = new Uint8Array(32); // 32 bytes for the symmetric key
-    crypto.getRandomValues(messageKey);
+  const messageKey = new Uint8Array(32); // 32 bytes for the symmetric key
+  crypto.getRandomValues(messageKey);
 
- 
-
-    return { messageKey: uint8ArrayToBase64(messageKey)};
+  return { messageKey: uint8ArrayToBase64(messageKey) };
 };
 
+export const encryptDataGroup = ({
+  data64,
+  publicKeys,
+  privateKey,
+  userPublicKey,
+  customSymmetricKey,
+}: any) => {
+  let combinedPublicKeys = [...publicKeys, userPublicKey];
+  const decodedPrivateKey = Base58.decode(privateKey);
+  const publicKeysDuplicateFree = [...new Set(combinedPublicKeys)];
 
-export const encryptDataGroup = ({ data64, publicKeys, privateKey, userPublicKey, customSymmetricKey }: any) => {
+  const Uint8ArrayData = base64ToUint8Array(data64);
+  if (!(Uint8ArrayData instanceof Uint8Array)) {
+    throw new Error("The Uint8ArrayData you've submitted is invalid");
+  }
+  try {
+    // Generate a random symmetric key for the message.
 
-	let combinedPublicKeys = [...publicKeys, userPublicKey]
-	const decodedPrivateKey = Base58.decode(privateKey)
-	const publicKeysDuplicateFree = [...new Set(combinedPublicKeys)]
+    let messageKey;
+    if (customSymmetricKey) {
+      messageKey = base64ToUint8Array(customSymmetricKey);
+    } else {
+      messageKey = new Uint8Array(32);
+      crypto.getRandomValues(messageKey);
+    }
 
-	const Uint8ArrayData = base64ToUint8Array(data64)
-	if (!(Uint8ArrayData instanceof Uint8Array)) {
-		throw new Error("The Uint8ArrayData you've submitted is invalid")
-	}
-	try {
-		// Generate a random symmetric key for the message.
-		
-		let messageKey
-		if(customSymmetricKey){
-			messageKey = base64ToUint8Array(customSymmetricKey)
-		} else {
-		 messageKey = new Uint8Array(32)
-		crypto.getRandomValues(messageKey)
-		}
+    if (!messageKey) throw new Error('Cannot create symmetric key');
+    const nonce = new Uint8Array(24);
+    crypto.getRandomValues(nonce);
+    // Encrypt the data with the symmetric key.
+    const encryptedData = nacl.secretbox(Uint8ArrayData, nonce, messageKey);
+    // Generate a keyNonce outside of the loop.
+    const keyNonce = new Uint8Array(24);
+    crypto.getRandomValues(keyNonce);
+    // Encrypt the symmetric key for each recipient.
+    let encryptedKeys = [];
+    publicKeysDuplicateFree.forEach((recipientPublicKey) => {
+      const publicKeyUnit8Array = Base58.decode(recipientPublicKey);
+      const convertedPrivateKey = ed2curve.convertSecretKey(decodedPrivateKey);
+      const convertedPublicKey = ed2curve.convertPublicKey(publicKeyUnit8Array);
+      const sharedSecret = new Uint8Array(32);
 
-		if(!messageKey) throw new Error('Cannot create symmetric key')
-		const nonce = new Uint8Array(24)
-		crypto.getRandomValues(nonce)
-		// Encrypt the data with the symmetric key.
-		const encryptedData = nacl.secretbox(Uint8ArrayData, nonce, messageKey)
-		// Generate a keyNonce outside of the loop.
-		const keyNonce = new Uint8Array(24)
-		crypto.getRandomValues(keyNonce)
-		// Encrypt the symmetric key for each recipient.
-		let encryptedKeys = []
-		publicKeysDuplicateFree.forEach((recipientPublicKey) => {
-			const publicKeyUnit8Array = Base58.decode(recipientPublicKey)
-			const convertedPrivateKey = ed2curve.convertSecretKey(decodedPrivateKey)
-			const convertedPublicKey = ed2curve.convertPublicKey(publicKeyUnit8Array)
-			const sharedSecret = new Uint8Array(32)
+      // the length of the sharedSecret will be 32 + 16
+      // When you're encrypting data using nacl.secretbox, it's adding an authentication tag to the result, which is 16 bytes long. This tag is used for verifying the integrity and authenticity of the data when it is decrypted
+      nacl.lowlevel.crypto_scalarmult(
+        sharedSecret,
+        convertedPrivateKey,
+        convertedPublicKey
+      );
 
-			// the length of the sharedSecret will be 32 + 16
-			// When you're encrypting data using nacl.secretbox, it's adding an authentication tag to the result, which is 16 bytes long. This tag is used for verifying the integrity and authenticity of the data when it is decrypted
-			nacl.lowlevel.crypto_scalarmult(sharedSecret, convertedPrivateKey, convertedPublicKey)
+      // Encrypt the symmetric key with the shared secret.
+      const encryptedKey = nacl.secretbox(messageKey, keyNonce, sharedSecret);
 
-			// Encrypt the symmetric key with the shared secret.
-			const encryptedKey = nacl.secretbox(messageKey, keyNonce, sharedSecret)
+      encryptedKeys.push(encryptedKey);
+    });
+    const str = 'qortalGroupEncryptedData';
+    const strEncoder = new TextEncoder();
+    const strUint8Array = strEncoder.encode(str);
+    // Convert sender's public key to Uint8Array and add to the message
+    const senderPublicKeyUint8Array = Base58.decode(userPublicKey);
+    // Combine all data into a single Uint8Array.
+    // Calculate size of combinedData
+    let combinedDataSize =
+      strUint8Array.length +
+      nonce.length +
+      keyNonce.length +
+      senderPublicKeyUint8Array.length +
+      encryptedData.length +
+      4;
+    let encryptedKeysSize = 0;
+    encryptedKeys.forEach((key) => {
+      encryptedKeysSize += key.length;
+    });
+    combinedDataSize += encryptedKeysSize;
+    let combinedData = new Uint8Array(combinedDataSize);
+    combinedData.set(strUint8Array);
+    combinedData.set(nonce, strUint8Array.length);
+    combinedData.set(keyNonce, strUint8Array.length + nonce.length);
+    combinedData.set(
+      senderPublicKeyUint8Array,
+      strUint8Array.length + nonce.length + keyNonce.length
+    );
+    combinedData.set(
+      encryptedData,
+      strUint8Array.length +
+        nonce.length +
+        keyNonce.length +
+        senderPublicKeyUint8Array.length
+    );
+    // Initialize offset for encryptedKeys
+    let encryptedKeysOffset =
+      strUint8Array.length +
+      nonce.length +
+      keyNonce.length +
+      senderPublicKeyUint8Array.length +
+      encryptedData.length;
+    encryptedKeys.forEach((key) => {
+      combinedData.set(key, encryptedKeysOffset);
+      encryptedKeysOffset += key.length;
+    });
+    const countArray = new Uint8Array(
+      new Uint32Array([publicKeysDuplicateFree.length]).buffer
+    );
+    combinedData.set(countArray, combinedData.length - 4);
+    return uint8ArrayToBase64(combinedData);
+  } catch (error) {
+    console.log('error', error);
+    throw new Error('Error in encrypting data');
+  }
+};
 
-			encryptedKeys.push(encryptedKey)
-		})
-		const str = "qortalGroupEncryptedData"
-		const strEncoder = new TextEncoder()
-		const strUint8Array = strEncoder.encode(str)
-		// Convert sender's public key to Uint8Array and add to the message
-		const senderPublicKeyUint8Array = Base58.decode(userPublicKey)
-		// Combine all data into a single Uint8Array.
-		// Calculate size of combinedData
-		let combinedDataSize = strUint8Array.length + nonce.length + keyNonce.length + senderPublicKeyUint8Array.length + encryptedData.length + 4
-		let encryptedKeysSize = 0
-		encryptedKeys.forEach((key) => {
-			encryptedKeysSize += key.length
-		})
-		combinedDataSize += encryptedKeysSize
-		let combinedData = new Uint8Array(combinedDataSize)
-		combinedData.set(strUint8Array)
-		combinedData.set(nonce, strUint8Array.length)
-		combinedData.set(keyNonce, strUint8Array.length + nonce.length)
-		combinedData.set(senderPublicKeyUint8Array, strUint8Array.length + nonce.length + keyNonce.length)
-		combinedData.set(encryptedData, strUint8Array.length + nonce.length + keyNonce.length + senderPublicKeyUint8Array.length)
-		// Initialize offset for encryptedKeys
-		let encryptedKeysOffset = strUint8Array.length + nonce.length + keyNonce.length + senderPublicKeyUint8Array.length + encryptedData.length
-		encryptedKeys.forEach((key) => {
-			combinedData.set(key, encryptedKeysOffset)
-			encryptedKeysOffset += key.length
-		})
-		const countArray = new Uint8Array(new Uint32Array([publicKeysDuplicateFree.length]).buffer)
-		combinedData.set(countArray, combinedData.length - 4)
-		return uint8ArrayToBase64(combinedData)
-	} catch (error) {
-		console.log('error', error)
-		throw new Error("Error in encrypting data")
-	}
+export const encryptSingle = async ({
+  data64,
+  secretKeyObject,
+  typeNumber = 2,
+}: any) => {
+  // Find the highest key in the secretKeyObject
+  const highestKey = Math.max(
+    ...Object.keys(secretKeyObject)
+      .filter((item) => !isNaN(+item))
+      .map(Number)
+  );
+  const highestKeyObject = secretKeyObject[highestKey];
+
+  // Convert data and keys from base64
+  const Uint8ArrayData = base64ToUint8Array(data64);
+  const messageKey = base64ToUint8Array(highestKeyObject.messageKey);
+
+  if (!(Uint8ArrayData instanceof Uint8Array)) {
+    throw new Error("The Uint8ArrayData you've submitted is invalid");
+  }
+
+  let nonce, encryptedData, encryptedDataBase64, finalEncryptedData;
+
+  // Convert type number to a fixed length of 3 digits
+  const typeNumberStr = typeNumber.toString().padStart(3, '0');
+
+  if (highestKeyObject.nonce) {
+    // Old format: Use the nonce from secretKeyObject
+    nonce = base64ToUint8Array(highestKeyObject.nonce);
+
+    // Encrypt the data with the existing nonce and message key
+    encryptedData = nacl.secretbox(Uint8ArrayData, nonce, messageKey);
+    encryptedDataBase64 = uint8ArrayToBase64(encryptedData);
+
+    // Concatenate the highest key, type number, and encrypted data (old format)
+    const highestKeyStr = highestKey.toString().padStart(10, '0'); // Fixed length of 10 digits
+    finalEncryptedData = btoa(highestKeyStr + encryptedDataBase64);
+  } else {
+    // New format: Generate a random nonce and embed it in the message
+    nonce = new Uint8Array(24); // 24 bytes for the nonce
+    crypto.getRandomValues(nonce);
+
+    // Encrypt the data with the new nonce and message key
+    encryptedData = nacl.secretbox(Uint8ArrayData, nonce, messageKey);
+    encryptedDataBase64 = uint8ArrayToBase64(encryptedData);
+
+    // Convert the nonce to base64
+    const nonceBase64 = uint8ArrayToBase64(nonce);
+
+    // Concatenate the highest key, type number, nonce, and encrypted data (new format)
+    const highestKeyStr = highestKey.toString().padStart(10, '0'); // Fixed length of 10 digits
+
+    const highestKeyBytes = new TextEncoder().encode(
+      highestKeyStr.padStart(10, '0')
+    );
+    const typeNumberBytes = new TextEncoder().encode(
+      typeNumberStr.padStart(3, '0')
+    );
+
+    // Step 3: Concatenate all binary
+    const combinedBinary = new Uint8Array(
+      highestKeyBytes.length +
+        typeNumberBytes.length +
+        nonce.length +
+        encryptedData.length
+    );
+    //   finalEncryptedData = btoa(highestKeyStr) + btoa(typeNumberStr) + nonceBase64 + encryptedDataBase64;
+    combinedBinary.set(highestKeyBytes, 0);
+    combinedBinary.set(typeNumberBytes, highestKeyBytes.length);
+    combinedBinary.set(nonce, highestKeyBytes.length + typeNumberBytes.length);
+    combinedBinary.set(
+      encryptedData,
+      highestKeyBytes.length + typeNumberBytes.length + nonce.length
+    );
+
+    // Step 4: Base64 encode once
+    finalEncryptedData = uint8ArrayToBase64(combinedBinary);
+  }
+
+  return finalEncryptedData;
+};
+
+export const decodeBase64ForUIChatMessages = (messages) => {
+  let msgs = [];
+  for (const msg of messages) {
+    try {
+      const decoded = atob(msg?.data);
+      const parseDecoded = JSON.parse(decodeURIComponent(escape(decoded)));
+
+      msgs.push({
+        ...msg,
+        ...parseDecoded,
+      });
+    } catch (error) {}
+  }
+  return msgs;
+};
+
+export const decryptSingle = async ({
+  data64,
+  secretKeyObject,
+  skipDecodeBase64,
+}: any) => {
+  // First, decode the base64-encoded input (if skipDecodeBase64 is not set)
+  const decodedData = skipDecodeBase64 ? data64 : atob(data64);
+
+  // Then, decode it again for the specific format (if double encoding is used)
+  const decodeForNumber = atob(decodedData);
+
+  // Extract the key (assuming it's always the first 10 characters)
+  const keyStr = decodeForNumber.slice(0, 10);
+
+  // Convert the key string back to a number
+  const highestKey = parseInt(keyStr, 10);
+
+  // Check if we have a valid secret key for the extracted highestKey
+  if (!secretKeyObject[highestKey]) {
+    throw new Error('Cannot find correct secretKey');
+  }
+
+  const secretKeyEntry = secretKeyObject[highestKey];
+
+  let typeNumberStr, nonceBase64, encryptedDataBase64;
+
+  // Determine if typeNumber exists by checking if the next 3 characters after keyStr are digits
+  const possibleTypeNumberStr = decodeForNumber.slice(10, 13);
+  const hasTypeNumber = /^\d{3}$/.test(possibleTypeNumberStr); // Check if next 3 characters are digits
+
+  if (secretKeyEntry.nonce) {
+    // Old format: nonce is present in the secretKeyObject, so no type number exists
+    nonceBase64 = secretKeyEntry.nonce;
+    encryptedDataBase64 = decodeForNumber.slice(10); // The remaining part is the encrypted data
+  } else {
+    if (hasTypeNumber) {
+      // const typeNumberStr = new TextDecoder().decode(typeNumberBytes);
+      if (decodeForNumber.slice(10, 13) !== '001') {
+        const decodedBinary = base64ToUint8Array(decodedData);
+        const highestKeyBytes = decodedBinary.slice(0, 10); // if ASCII digits only
+        const highestKeyStr = new TextDecoder().decode(highestKeyBytes);
+
+        const nonce = decodedBinary.slice(13, 13 + 24);
+        const encryptedData = decodedBinary.slice(13 + 24);
+        const highestKey = parseInt(highestKeyStr, 10);
+
+        const messageKey = base64ToUint8Array(
+          secretKeyObject[+highestKey].messageKey
+        );
+        const decryptedBytes = nacl.secretbox.open(
+          encryptedData,
+          nonce,
+          messageKey
+        );
+
+        // Check if decryption was successful
+        if (!decryptedBytes) {
+          throw new Error('Decryption failed');
+        }
+
+        // Convert the decrypted Uint8Array back to a Base64 string
+        return uint8ArrayToBase64(decryptedBytes);
+      }
+      // New format: Extract type number and nonce
+      typeNumberStr = possibleTypeNumberStr; // Extract type number
+      nonceBase64 = decodeForNumber.slice(13, 45); // Extract nonce (next 32 characters after type number)
+      encryptedDataBase64 = decodeForNumber.slice(45); // The remaining part is the encrypted data
+    } else {
+      // Old format without type number (nonce is embedded in the message, first 32 characters after keyStr)
+      nonceBase64 = decodeForNumber.slice(10, 42); // First 32 characters for the nonce
+      encryptedDataBase64 = decodeForNumber.slice(42); // The remaining part is the encrypted data
+    }
+  }
+
+  // Convert Base64 strings to Uint8Array
+  const Uint8ArrayData = base64ToUint8Array(encryptedDataBase64);
+  const nonce = base64ToUint8Array(nonceBase64);
+  const messageKey = base64ToUint8Array(secretKeyEntry.messageKey);
+
+  if (!(Uint8ArrayData instanceof Uint8Array)) {
+    throw new Error("The Uint8ArrayData you've submitted is invalid");
+  }
+
+  // Decrypt the data using the nonce and messageKey
+  const decryptedData = nacl.secretbox.open(Uint8ArrayData, nonce, messageKey);
+
+  // Check if decryption was successful
+  if (!decryptedData) {
+    throw new Error('Decryption failed');
+  }
+
+  // Convert the decrypted Uint8Array back to a Base64 string
+  return uint8ArrayToBase64(decryptedData);
+};
+
+export const decryptGroupEncryptionWithSharingKey = async ({
+  data64EncryptedData,
+  key,
+}: any) => {
+  const allCombined = base64ToUint8Array(data64EncryptedData);
+  const str = 'qortalGroupEncryptedData';
+  const strEncoder = new TextEncoder();
+  const strUint8Array = strEncoder.encode(str);
+  // Extract the nonce
+  const nonceStartPosition = strUint8Array.length;
+  const nonceEndPosition = nonceStartPosition + 24; // Nonce is 24 bytes
+  const nonce = allCombined.slice(nonceStartPosition, nonceEndPosition);
+  // Extract the shared keyNonce
+  const keyNonceStartPosition = nonceEndPosition;
+  const keyNonceEndPosition = keyNonceStartPosition + 24; // Nonce is 24 bytes
+  const keyNonce = allCombined.slice(
+    keyNonceStartPosition,
+    keyNonceEndPosition
+  );
+  // Extract the sender's public key
+  const senderPublicKeyStartPosition = keyNonceEndPosition;
+  const senderPublicKeyEndPosition = senderPublicKeyStartPosition + 32; // Public keys are 32 bytes
+
+  // Calculate count first
+  const countStartPosition = allCombined.length - 4; // 4 bytes before the end, since count is stored in Uint32 (4 bytes)
+  const countArray = allCombined.slice(
+    countStartPosition,
+    countStartPosition + 4
+  );
+  const count = new Uint32Array(countArray.buffer)[0];
+  // Then use count to calculate encryptedData
+  const encryptedDataStartPosition = senderPublicKeyEndPosition; // start position of encryptedData
+  const encryptedDataEndPosition = allCombined.length - (count * (32 + 16) + 4);
+  const encryptedData = allCombined.slice(
+    encryptedDataStartPosition,
+    encryptedDataEndPosition
+  );
+  const symmetricKey = base64ToUint8Array(key);
+
+  // Decrypt the data using the nonce and messageKey
+  const decryptedData = nacl.secretbox.open(encryptedData, nonce, symmetricKey);
+
+  // Check if decryption was successful
+  if (!decryptedData) {
+    throw new Error('Decryption failed');
+  }
+  // Convert the decrypted Uint8Array back to a Base64 string
+  return uint8ArrayToBase64(decryptedData);
+};
+
+export function decryptGroupDataQortalRequest(data64EncryptedData, privateKey) {
+  const allCombined = base64ToUint8Array(data64EncryptedData);
+  const str = 'qortalGroupEncryptedData';
+  const strEncoder = new TextEncoder();
+  const strUint8Array = strEncoder.encode(str);
+  // Extract the nonce
+  const nonceStartPosition = strUint8Array.length;
+  const nonceEndPosition = nonceStartPosition + 24; // Nonce is 24 bytes
+  const nonce = allCombined.slice(nonceStartPosition, nonceEndPosition);
+  // Extract the shared keyNonce
+  const keyNonceStartPosition = nonceEndPosition;
+  const keyNonceEndPosition = keyNonceStartPosition + 24; // Nonce is 24 bytes
+  const keyNonce = allCombined.slice(
+    keyNonceStartPosition,
+    keyNonceEndPosition
+  );
+  // Extract the sender's public key
+  const senderPublicKeyStartPosition = keyNonceEndPosition;
+  const senderPublicKeyEndPosition = senderPublicKeyStartPosition + 32; // Public keys are 32 bytes
+  const senderPublicKey = allCombined.slice(
+    senderPublicKeyStartPosition,
+    senderPublicKeyEndPosition
+  );
+  // Calculate count first
+  const countStartPosition = allCombined.length - 4; // 4 bytes before the end, since count is stored in Uint32 (4 bytes)
+  const countArray = allCombined.slice(
+    countStartPosition,
+    countStartPosition + 4
+  );
+  const count = new Uint32Array(countArray.buffer)[0];
+  // Then use count to calculate encryptedData
+  const encryptedDataStartPosition = senderPublicKeyEndPosition; // start position of encryptedData
+  const encryptedDataEndPosition = allCombined.length - (count * (32 + 16) + 4);
+  const encryptedData = allCombined.slice(
+    encryptedDataStartPosition,
+    encryptedDataEndPosition
+  );
+  // Extract the encrypted keys
+  // 32+16 = 48
+  const combinedKeys = allCombined.slice(
+    encryptedDataEndPosition,
+    encryptedDataEndPosition + count * 48
+  );
+  if (!privateKey) {
+    throw new Error('Unable to retrieve keys');
+  }
+  const decodedPrivateKey = Base58.decode(privateKey);
+  const convertedPrivateKey = ed2curve.convertSecretKey(decodedPrivateKey);
+  const convertedSenderPublicKey = ed2curve.convertPublicKey(senderPublicKey);
+  const sharedSecret = new Uint8Array(32);
+  nacl.lowlevel.crypto_scalarmult(
+    sharedSecret,
+    convertedPrivateKey,
+    convertedSenderPublicKey
+  );
+  for (let i = 0; i < count; i++) {
+    const encryptedKey = combinedKeys.slice(i * 48, (i + 1) * 48);
+    // Decrypt the symmetric key.
+    const decryptedKey = nacl.secretbox.open(
+      encryptedKey,
+      keyNonce,
+      sharedSecret
+    );
+    // If decryption was successful, decryptedKey will not be null.
+    if (decryptedKey) {
+      // Decrypt the data using the symmetric key.
+      const decryptedData = nacl.secretbox.open(
+        encryptedData,
+        nonce,
+        decryptedKey
+      );
+      // If decryption was successful, decryptedData will not be null.
+      if (decryptedData) {
+        return decryptedData;
+      }
+    }
+  }
+  throw new Error('Unable to decrypt data');
 }
 
-export const encryptSingle = async ({ data64, secretKeyObject, typeNumber = 2 }: any) => {
-	// Find the highest key in the secretKeyObject
-	const highestKey = Math.max(...Object.keys(secretKeyObject).filter(item => !isNaN(+item)).map(Number));
-	const highestKeyObject = secretKeyObject[highestKey];
-  
-	// Convert data and keys from base64
-	const Uint8ArrayData = base64ToUint8Array(data64);
-	const messageKey = base64ToUint8Array(highestKeyObject.messageKey);
-  
-	if (!(Uint8ArrayData instanceof Uint8Array)) {
-	  throw new Error("The Uint8ArrayData you've submitted is invalid");
-	}
-  
-	let nonce, encryptedData, encryptedDataBase64, finalEncryptedData;
-  
-	// Convert type number to a fixed length of 3 digits
-	const typeNumberStr = typeNumber.toString().padStart(3, '0');
-  
-	if (highestKeyObject.nonce) {
-	  // Old format: Use the nonce from secretKeyObject
-	  nonce = base64ToUint8Array(highestKeyObject.nonce);
-  
-	  // Encrypt the data with the existing nonce and message key
-	  encryptedData = nacl.secretbox(Uint8ArrayData, nonce, messageKey);
-	  encryptedDataBase64 = uint8ArrayToBase64(encryptedData);
-  
-	  // Concatenate the highest key, type number, and encrypted data (old format)
-	  const highestKeyStr = highestKey.toString().padStart(10, '0');  // Fixed length of 10 digits
-	  finalEncryptedData = btoa(highestKeyStr + encryptedDataBase64);
-	} else {
-	  // New format: Generate a random nonce and embed it in the message
-	  nonce = new Uint8Array(24); // 24 bytes for the nonce
-	  crypto.getRandomValues(nonce);
-  
-	  // Encrypt the data with the new nonce and message key
-	  encryptedData = nacl.secretbox(Uint8ArrayData, nonce, messageKey);
-	  encryptedDataBase64 = uint8ArrayToBase64(encryptedData);
-  
-	  // Convert the nonce to base64
-	  const nonceBase64 = uint8ArrayToBase64(nonce);
-  
-	  // Concatenate the highest key, type number, nonce, and encrypted data (new format)
-	  const highestKeyStr = highestKey.toString().padStart(10, '0');  // Fixed length of 10 digits
+export function decryptGroupData(
+  data64EncryptedData: string,
+  privateKey: string
+) {
+  const allCombined = base64ToUint8Array(data64EncryptedData);
+  const str = 'qortalGroupEncryptedData';
+  const strEncoder = new TextEncoder();
+  const strUint8Array = strEncoder.encode(str);
+  // Extract the nonce
+  const nonceStartPosition = strUint8Array.length;
+  const nonceEndPosition = nonceStartPosition + 24; // Nonce is 24 bytes
+  const nonce = allCombined.slice(nonceStartPosition, nonceEndPosition);
+  // Extract the shared keyNonce
+  const keyNonceStartPosition = nonceEndPosition;
+  const keyNonceEndPosition = keyNonceStartPosition + 24; // Nonce is 24 bytes
+  const keyNonce = allCombined.slice(
+    keyNonceStartPosition,
+    keyNonceEndPosition
+  );
+  // Extract the sender's public key
+  const senderPublicKeyStartPosition = keyNonceEndPosition;
+  const senderPublicKeyEndPosition = senderPublicKeyStartPosition + 32; // Public keys are 32 bytes
+  const senderPublicKey = allCombined.slice(
+    senderPublicKeyStartPosition,
+    senderPublicKeyEndPosition
+  );
+  // Calculate count first
+  const countStartPosition = allCombined.length - 4; // 4 bytes before the end, since count is stored in Uint32 (4 bytes)
+  const countArray = allCombined.slice(
+    countStartPosition,
+    countStartPosition + 4
+  );
+  const count = new Uint32Array(countArray.buffer)[0];
+  // Then use count to calculate encryptedData
+  const encryptedDataStartPosition = senderPublicKeyEndPosition; // start position of encryptedData
+  const encryptedDataEndPosition = allCombined.length - (count * (32 + 16) + 4);
+  const encryptedData = allCombined.slice(
+    encryptedDataStartPosition,
+    encryptedDataEndPosition
+  );
+  // Extract the encrypted keys
+  // 32+16 = 48
+  const combinedKeys = allCombined.slice(
+    encryptedDataEndPosition,
+    encryptedDataEndPosition + count * 48
+  );
+  if (!privateKey) {
+    throw new Error('Unable to retrieve keys');
+  }
+  const decodedPrivateKey = Base58.decode(privateKey);
+  const convertedPrivateKey = ed2curve.convertSecretKey(decodedPrivateKey);
+  const convertedSenderPublicKey = ed2curve.convertPublicKey(senderPublicKey);
+  const sharedSecret = new Uint8Array(32);
+  nacl.lowlevel.crypto_scalarmult(
+    sharedSecret,
+    convertedPrivateKey,
+    convertedSenderPublicKey
+  );
+  for (let i = 0; i < count; i++) {
+    const encryptedKey = combinedKeys.slice(i * 48, (i + 1) * 48);
+    // Decrypt the symmetric key.
+    const decryptedKey = nacl.secretbox.open(
+      encryptedKey,
+      keyNonce,
+      sharedSecret
+    );
 
-	  const highestKeyBytes = new TextEncoder().encode(highestKeyStr.padStart(10, '0'));
-const typeNumberBytes = new TextEncoder().encode(typeNumberStr.padStart(3, '0'));
-
-// Step 3: Concatenate all binary
-const combinedBinary = new Uint8Array(
-  highestKeyBytes.length + typeNumberBytes.length + nonce.length + encryptedData.length
-);
-	//   finalEncryptedData = btoa(highestKeyStr) + btoa(typeNumberStr) + nonceBase64 + encryptedDataBase64;
-	  combinedBinary.set(highestKeyBytes, 0);
-combinedBinary.set(typeNumberBytes, highestKeyBytes.length);
-combinedBinary.set(nonce, highestKeyBytes.length + typeNumberBytes.length);
-combinedBinary.set(encryptedData, highestKeyBytes.length + typeNumberBytes.length + nonce.length);
-
-// Step 4: Base64 encode once
- finalEncryptedData = uint8ArrayToBase64(combinedBinary);
-	}
-  
-	return finalEncryptedData;
-  };
-
-
-export const decodeBase64ForUIChatMessages = (messages)=> {
-	
-	let msgs = []
-	for(const msg of messages){
-		try {
-			const decoded = atob(msg?.data);
-			const parseDecoded =JSON.parse(decodeURIComponent(escape(decoded)))
-		
-				msgs.push({
-					...msg,
-					...parseDecoded
-				})
-		
-		} catch (error) {
-			
-		}
-	}
-	return msgs
-}
-
-export const decryptSingle = async ({ data64, secretKeyObject, skipDecodeBase64 }: any) => {
-	// First, decode the base64-encoded input (if skipDecodeBase64 is not set)
-	const decodedData = skipDecodeBase64 ? data64 : atob(data64);
-	
-	// Then, decode it again for the specific format (if double encoding is used)
-	const decodeForNumber = atob(decodedData);
-  
-	// Extract the key (assuming it's always the first 10 characters)
-	const keyStr = decodeForNumber.slice(0, 10);
-  
-	// Convert the key string back to a number
-	const highestKey = parseInt(keyStr, 10);
-  
-	// Check if we have a valid secret key for the extracted highestKey
-	if (!secretKeyObject[highestKey]) {
-	  throw new Error('Cannot find correct secretKey');
-	}
-  
-	const secretKeyEntry = secretKeyObject[highestKey];
-  
-	let typeNumberStr, nonceBase64, encryptedDataBase64;
-  
-	// Determine if typeNumber exists by checking if the next 3 characters after keyStr are digits
-	const possibleTypeNumberStr = decodeForNumber.slice(10, 13);
-	const hasTypeNumber = /^\d{3}$/.test(possibleTypeNumberStr); // Check if next 3 characters are digits
-	
-	if (secretKeyEntry.nonce) {
-	  // Old format: nonce is present in the secretKeyObject, so no type number exists
-	  nonceBase64 = secretKeyEntry.nonce;
-	  encryptedDataBase64 = decodeForNumber.slice(10); // The remaining part is the encrypted data
-	} else {
-	  if (hasTypeNumber) {
-		// const typeNumberStr = new TextDecoder().decode(typeNumberBytes);
-		if(decodeForNumber.slice(10, 13) !== '001'){
-			const decodedBinary = base64ToUint8Array(decodedData);
-			const highestKeyBytes = decodedBinary.slice(0, 10); // if ASCII digits only
-			const highestKeyStr = new TextDecoder().decode(highestKeyBytes);
-
-const nonce = decodedBinary.slice(13, 13 + 24);
-const encryptedData = decodedBinary.slice(13 + 24);
-const highestKey = parseInt(highestKeyStr, 10);
-
-const messageKey = base64ToUint8Array(secretKeyObject[+highestKey].messageKey);
-const decryptedBytes = nacl.secretbox.open(encryptedData, nonce, messageKey);
-  
-	// Check if decryption was successful
-	if (!decryptedBytes) {
-	  throw new Error("Decryption failed");
-	}
-  
-	// Convert the decrypted Uint8Array back to a Base64 string
-	return uint8ArrayToBase64(decryptedBytes);
-		
-		}
-		// New format: Extract type number and nonce
-		typeNumberStr = possibleTypeNumberStr;  // Extract type number
-		nonceBase64 = decodeForNumber.slice(13, 45);   // Extract nonce (next 32 characters after type number)
-		encryptedDataBase64 = decodeForNumber.slice(45); // The remaining part is the encrypted data
-	  } else {
-		// Old format without type number (nonce is embedded in the message, first 32 characters after keyStr)
-		nonceBase64 = decodeForNumber.slice(10, 42);  // First 32 characters for the nonce
-		encryptedDataBase64 = decodeForNumber.slice(42); // The remaining part is the encrypted data
-	  }
-	}
-  
-	// Convert Base64 strings to Uint8Array
-	const Uint8ArrayData = base64ToUint8Array(encryptedDataBase64);
-	const nonce = base64ToUint8Array(nonceBase64);
-	const messageKey = base64ToUint8Array(secretKeyEntry.messageKey);
-  
-	if (!(Uint8ArrayData instanceof Uint8Array)) {
-	  throw new Error("The Uint8ArrayData you've submitted is invalid");
-	}
-  
-	// Decrypt the data using the nonce and messageKey
-	const decryptedData = nacl.secretbox.open(Uint8ArrayData, nonce, messageKey);
-  
-	// Check if decryption was successful
-	if (!decryptedData) {
-	  throw new Error("Decryption failed");
-	}
-  
-	// Convert the decrypted Uint8Array back to a Base64 string
-	return uint8ArrayToBase64(decryptedData);
-  };
-  
-
-
-
-  export const decryptGroupEncryptionWithSharingKey = async ({ data64EncryptedData, key }: any) => {
-
-	const allCombined = base64ToUint8Array(data64EncryptedData)
-	const str = "qortalGroupEncryptedData"
-	const strEncoder = new TextEncoder()
-	const strUint8Array = strEncoder.encode(str)
-	// Extract the nonce
-	const nonceStartPosition = strUint8Array.length
-	const nonceEndPosition = nonceStartPosition + 24 // Nonce is 24 bytes
-	const nonce = allCombined.slice(nonceStartPosition, nonceEndPosition)
-	// Extract the shared keyNonce
-	const keyNonceStartPosition = nonceEndPosition
-	const keyNonceEndPosition = keyNonceStartPosition + 24 // Nonce is 24 bytes
-	const keyNonce = allCombined.slice(keyNonceStartPosition, keyNonceEndPosition)
-	// Extract the sender's public key
-	const senderPublicKeyStartPosition = keyNonceEndPosition
-	const senderPublicKeyEndPosition = senderPublicKeyStartPosition + 32 // Public keys are 32 bytes
-
-	// Calculate count first
-	const countStartPosition = allCombined.length - 4 // 4 bytes before the end, since count is stored in Uint32 (4 bytes)
-	const countArray = allCombined.slice(countStartPosition, countStartPosition + 4)
-	const count = new Uint32Array(countArray.buffer)[0]
-	// Then use count to calculate encryptedData
-	const encryptedDataStartPosition = senderPublicKeyEndPosition // start position of encryptedData
-	const encryptedDataEndPosition = allCombined.length - ((count * (32 + 16)) + 4)
-	const encryptedData = allCombined.slice(encryptedDataStartPosition, encryptedDataEndPosition)
-	const symmetricKey = base64ToUint8Array(key);
-	
-	// Decrypt the data using the nonce and messageKey
-	const decryptedData = nacl.secretbox.open(encryptedData, nonce, symmetricKey)
-
-  
-	// Check if decryption was successful
-	if (!decryptedData) {
-	  throw new Error("Decryption failed");
-	}
-	// Convert the decrypted Uint8Array back to a Base64 string
-	return uint8ArrayToBase64(decryptedData);
-  };
-  
-  
-  
-  export function decryptGroupDataQortalRequest(data64EncryptedData, privateKey) {
-	const allCombined = base64ToUint8Array(data64EncryptedData)
-	const str = "qortalGroupEncryptedData"
-	const strEncoder = new TextEncoder()
-	const strUint8Array = strEncoder.encode(str)
-	// Extract the nonce
-	const nonceStartPosition = strUint8Array.length
-	const nonceEndPosition = nonceStartPosition + 24 // Nonce is 24 bytes
-	const nonce = allCombined.slice(nonceStartPosition, nonceEndPosition)
-	// Extract the shared keyNonce
-	const keyNonceStartPosition = nonceEndPosition
-	const keyNonceEndPosition = keyNonceStartPosition + 24 // Nonce is 24 bytes
-	const keyNonce = allCombined.slice(keyNonceStartPosition, keyNonceEndPosition)
-	// Extract the sender's public key
-	const senderPublicKeyStartPosition = keyNonceEndPosition
-	const senderPublicKeyEndPosition = senderPublicKeyStartPosition + 32 // Public keys are 32 bytes
-	const senderPublicKey = allCombined.slice(senderPublicKeyStartPosition, senderPublicKeyEndPosition)
-	// Calculate count first
-	const countStartPosition = allCombined.length - 4 // 4 bytes before the end, since count is stored in Uint32 (4 bytes)
-	const countArray = allCombined.slice(countStartPosition, countStartPosition + 4)
-	const count = new Uint32Array(countArray.buffer)[0]
-	// Then use count to calculate encryptedData
-	const encryptedDataStartPosition = senderPublicKeyEndPosition // start position of encryptedData
-	const encryptedDataEndPosition = allCombined.length - ((count * (32 + 16)) + 4)
-	const encryptedData = allCombined.slice(encryptedDataStartPosition, encryptedDataEndPosition)
-	// Extract the encrypted keys
-	// 32+16 = 48
-	const combinedKeys = allCombined.slice(encryptedDataEndPosition, encryptedDataEndPosition + (count * 48))
-	if (!privateKey) {
-		throw new Error("Unable to retrieve keys")
-	}
-	const decodedPrivateKey = Base58.decode(privateKey)
-	const convertedPrivateKey = ed2curve.convertSecretKey(decodedPrivateKey)
-	const convertedSenderPublicKey = ed2curve.convertPublicKey(senderPublicKey)
-	const sharedSecret = new Uint8Array(32)
-	nacl.lowlevel.crypto_scalarmult(sharedSecret, convertedPrivateKey, convertedSenderPublicKey)
-	for (let i = 0; i < count; i++) {
-		const encryptedKey = combinedKeys.slice(i * 48, (i + 1) * 48)
-		// Decrypt the symmetric key.
-		const decryptedKey = nacl.secretbox.open(encryptedKey, keyNonce, sharedSecret)
-		// If decryption was successful, decryptedKey will not be null.
-		if (decryptedKey) {
-			// Decrypt the data using the symmetric key.
-			const decryptedData = nacl.secretbox.open(encryptedData, nonce, decryptedKey)
-			// If decryption was successful, decryptedData will not be null.
-			if (decryptedData) {
-				return decryptedData
-			}
-		}
-	}
-	throw new Error("Unable to decrypt data")
-}
-
-
-export function decryptGroupData(data64EncryptedData: string, privateKey: string) {
-	const allCombined = base64ToUint8Array(data64EncryptedData)
-	const str = "qortalGroupEncryptedData"
-	const strEncoder = new TextEncoder()
-	const strUint8Array = strEncoder.encode(str)
-	// Extract the nonce
-	const nonceStartPosition = strUint8Array.length
-	const nonceEndPosition = nonceStartPosition + 24 // Nonce is 24 bytes
-	const nonce = allCombined.slice(nonceStartPosition, nonceEndPosition)
-	// Extract the shared keyNonce
-	const keyNonceStartPosition = nonceEndPosition
-	const keyNonceEndPosition = keyNonceStartPosition + 24 // Nonce is 24 bytes
-	const keyNonce = allCombined.slice(keyNonceStartPosition, keyNonceEndPosition)
-	// Extract the sender's public key
-	const senderPublicKeyStartPosition = keyNonceEndPosition
-	const senderPublicKeyEndPosition = senderPublicKeyStartPosition + 32 // Public keys are 32 bytes
-	const senderPublicKey = allCombined.slice(senderPublicKeyStartPosition, senderPublicKeyEndPosition)
-	// Calculate count first
-	const countStartPosition = allCombined.length - 4 // 4 bytes before the end, since count is stored in Uint32 (4 bytes)
-	const countArray = allCombined.slice(countStartPosition, countStartPosition + 4)
-	const count = new Uint32Array(countArray.buffer)[0]
-	// Then use count to calculate encryptedData
-	const encryptedDataStartPosition = senderPublicKeyEndPosition // start position of encryptedData
-	const encryptedDataEndPosition = allCombined.length - ((count * (32 + 16)) + 4)
-	const encryptedData = allCombined.slice(encryptedDataStartPosition, encryptedDataEndPosition)
-	// Extract the encrypted keys
-	// 32+16 = 48
-	const combinedKeys = allCombined.slice(encryptedDataEndPosition, encryptedDataEndPosition + (count * 48))
-	if (!privateKey) {
-		throw new Error("Unable to retrieve keys")
-	}
-	const decodedPrivateKey = Base58.decode(privateKey)
-	const convertedPrivateKey = ed2curve.convertSecretKey(decodedPrivateKey)
-	const convertedSenderPublicKey = ed2curve.convertPublicKey(senderPublicKey)
-	const sharedSecret = new Uint8Array(32)
-	nacl.lowlevel.crypto_scalarmult(sharedSecret, convertedPrivateKey, convertedSenderPublicKey)
-	for (let i = 0; i < count; i++) {
-		const encryptedKey = combinedKeys.slice(i * 48, (i + 1) * 48)
-		// Decrypt the symmetric key.
-		const decryptedKey = nacl.secretbox.open(encryptedKey, keyNonce, sharedSecret)
-	
-		// If decryption was successful, decryptedKey will not be null.
-		if (decryptedKey) {
-			// Decrypt the data using the symmetric key.
-			const decryptedData = nacl.secretbox.open(encryptedData, nonce, decryptedKey)
-			// If decryption was successful, decryptedData will not be null.
-			if (decryptedData) {
-				return {decryptedData, count}
-			}
-		}
-	}
-	throw new Error("Unable to decrypt data")
+    // If decryption was successful, decryptedKey will not be null.
+    if (decryptedKey) {
+      // Decrypt the data using the symmetric key.
+      const decryptedData = nacl.secretbox.open(
+        encryptedData,
+        nonce,
+        decryptedKey
+      );
+      // If decryption was successful, decryptedData will not be null.
+      if (decryptedData) {
+        return { decryptedData, count };
+      }
+    }
+  }
+  throw new Error('Unable to decrypt data');
 }
 
 export function uint8ArrayStartsWith(uint8Array, string) {
-	const stringEncoder = new TextEncoder()
-	const stringUint8Array = stringEncoder.encode(string)
-	if (uint8Array.length < stringUint8Array.length) {
-		return false
-	}
-	for (let i = 0; i < stringUint8Array.length; i++) {
-		if (uint8Array[i] !== stringUint8Array[i]) {
-			return false
-		}
-	}
-	return true
+  const stringEncoder = new TextEncoder();
+  const stringUint8Array = stringEncoder.encode(string);
+  if (uint8Array.length < stringUint8Array.length) {
+    return false;
+  }
+  for (let i = 0; i < stringUint8Array.length; i++) {
+    if (uint8Array[i] !== stringUint8Array[i]) {
+      return false;
+    }
+  }
+  return true;
 }
 
 export function decryptDeprecatedSingle(uint8Array, publicKey, privateKey) {
-	const combinedData = uint8Array
-	const str = "qortalEncryptedData"
-	const strEncoder = new TextEncoder()
-	const strUint8Array = strEncoder.encode(str)
-	const strData = combinedData.slice(0, strUint8Array.length)
-	const nonce = combinedData.slice(strUint8Array.length, strUint8Array.length + 24)
-	const _encryptedData = combinedData.slice(strUint8Array.length + 24)
-	
-	const _publicKey = window.parent.Base58.decode(publicKey)
-	if (!privateKey || !_publicKey) {
-		throw new Error("Unable to retrieve keys")
-	}
-	const convertedPrivateKey = ed2curve.convertSecretKey(privateKey)
-	const convertedPublicKey = ed2curve.convertPublicKey(_publicKey)
-	const sharedSecret = new Uint8Array(32)
-	nacl.lowlevel.crypto_scalarmult(sharedSecret, convertedPrivateKey, convertedPublicKey)
-	const _chatEncryptionSeed = new window.parent.Sha256().process(sharedSecret).finish().result
-	const _decryptedData = nacl.secretbox.open(_encryptedData, nonce, _chatEncryptionSeed)
-	if (!_decryptedData) {
-		throw new Error("Unable to decrypt")
-	}
-	return uint8ArrayToBase64(_decryptedData)
-}
\ No newline at end of file
+  const combinedData = uint8Array;
+  const str = 'qortalEncryptedData';
+  const strEncoder = new TextEncoder();
+  const strUint8Array = strEncoder.encode(str);
+  const strData = combinedData.slice(0, strUint8Array.length);
+  const nonce = combinedData.slice(
+    strUint8Array.length,
+    strUint8Array.length + 24
+  );
+  const _encryptedData = combinedData.slice(strUint8Array.length + 24);
+
+  const _publicKey = window.parent.Base58.decode(publicKey);
+  if (!privateKey || !_publicKey) {
+    throw new Error('Unable to retrieve keys');
+  }
+  const convertedPrivateKey = ed2curve.convertSecretKey(privateKey);
+  const convertedPublicKey = ed2curve.convertPublicKey(_publicKey);
+  const sharedSecret = new Uint8Array(32);
+  nacl.lowlevel.crypto_scalarmult(
+    sharedSecret,
+    convertedPrivateKey,
+    convertedPublicKey
+  );
+  const _chatEncryptionSeed = new window.parent.Sha256()
+    .process(sharedSecret)
+    .finish().result;
+  const _decryptedData = nacl.secretbox.open(
+    _encryptedData,
+    nonce,
+    _chatEncryptionSeed
+  );
+  if (!_decryptedData) {
+    throw new Error('Unable to decrypt');
+  }
+  return uint8ArrayToBase64(_decryptedData);
+}
diff --git a/src/qortalRequests/get.ts b/src/qortalRequests/get.ts
index a14676a..3f71405 100644
--- a/src/qortalRequests/get.ts
+++ b/src/qortalRequests/get.ts
@@ -55,7 +55,6 @@ import { QORT_DECIMALS } from '../constants/constants';
 import Base58 from '../deps/Base58';
 import ed2curve from '../deps/ed2curve';
 import nacl from '../deps/nacl-fast';
-
 import {
   base64ToUint8Array,
   createSymmetricKeyAndNonce,
@@ -86,7 +85,7 @@ import { RequestQueueWithPromise } from '../utils/queue/queue';
 import utils from '../utils/utils';
 import ShortUniqueId from 'short-unique-id';
 import { isValidBase64WithDecode } from '../utils/decode';
-
+//TODO translate
 const uid = new ShortUniqueId({ length: 6 });
 
 export const requestQueueGetAtAddresses = new RequestQueueWithPromise(10);
@@ -132,6 +131,7 @@ export async function retryTransaction(
   throwError,
   retries = MAX_RETRIES
 ) {
+  // TODO transalte
   let attempt = 0;
   while (attempt < retries) {
     try {
diff --git a/src/styles/App-styles.ts b/src/styles/App-styles.ts
index af273e5..3cbcdb5 100644
--- a/src/styles/App-styles.ts
+++ b/src/styles/App-styles.ts
@@ -228,5 +228,5 @@ export const CustomLabel = styled(InputLabel)(({ theme }) => ({
   fontFamily: 'Inter',
   fontSize: '15px',
   fontWeight: 400,
-  lineHeight: '12px',
+  lineHeight: '24px',
 }));
diff --git a/src/transactions/AddGroupAdminTransaction.ts b/src/transactions/AddGroupAdminTransaction.ts
index f66f730..dd65ec4 100644
--- a/src/transactions/AddGroupAdminTransaction.ts
+++ b/src/transactions/AddGroupAdminTransaction.ts
@@ -1,37 +1,35 @@
 // @ts-nocheck
 
-import { QORT_DECIMALS } from "../constants/constants"
-import TransactionBase from "./TransactionBase"
-
+import { QORT_DECIMALS } from '../constants/constants';
+import TransactionBase from './TransactionBase';
 
 export default class AddGroupAdminTransaction extends TransactionBase {
-	constructor() {
-		super()
-		this.type = 24
-	}
+  constructor() {
+    super();
+    this.type = 24;
+  }
 
-	set rGroupId(rGroupId) {
-		this._rGroupId = rGroupId
-		this._rGroupIdBytes = this.constructor.utils.int32ToBytes(this._rGroupId)
-	}
+  set rGroupId(rGroupId) {
+    this._rGroupId = rGroupId;
+    this._rGroupIdBytes = this.constructor.utils.int32ToBytes(this._rGroupId);
+  }
 
-	set recipient(recipient) {
-		this._recipient = recipient instanceof Uint8Array ? recipient : this.constructor.Base58.decode(recipient)
-		this.theRecipient = recipient
-	}
+  set recipient(recipient) {
+    this._recipient =
+      recipient instanceof Uint8Array
+        ? recipient
+        : this.constructor.Base58.decode(recipient);
+    this.theRecipient = recipient;
+  }
 
-	set fee(fee) {
-		this._fee = fee * QORT_DECIMALS
-		this._feeBytes = this.constructor.utils.int64ToBytes(this._fee)
-	}
+  set fee(fee) {
+    this._fee = fee * QORT_DECIMALS;
+    this._feeBytes = this.constructor.utils.int64ToBytes(this._fee);
+  }
 
-	get params() {
-		const params = super.params
-		params.push(
-			this._rGroupIdBytes,
-			this._recipient,
-			this._feeBytes
-		)
-		return params
-	}
+  get params() {
+    const params = super.params;
+    params.push(this._rGroupIdBytes, this._recipient, this._feeBytes);
+    return params;
+  }
 }
diff --git a/src/transactions/BuyNameTransacion.ts b/src/transactions/BuyNameTransacion.ts
index 8c321d3..0664b1c 100644
--- a/src/transactions/BuyNameTransacion.ts
+++ b/src/transactions/BuyNameTransacion.ts
@@ -1,45 +1,48 @@
 // @ts-nocheck
 
-import { QORT_DECIMALS } from "../constants/constants"
-import TransactionBase from "./TransactionBase"
-
-
+import { QORT_DECIMALS } from '../constants/constants';
+import TransactionBase from './TransactionBase';
 export default class BuyNameTransacion extends TransactionBase {
-	constructor() {
-		super()
-		this.type = 7
-	}
+  constructor() {
+    super();
+    this.type = 7;
+  }
 
-	set fee(fee) {
-		this._fee = fee * QORT_DECIMALS
-		this._feeBytes = this.constructor.utils.int64ToBytes(this._fee)
-	}
+  set fee(fee) {
+    this._fee = fee * QORT_DECIMALS;
+    this._feeBytes = this.constructor.utils.int64ToBytes(this._fee);
+  }
 
-	set name(name) {
-		this.nameText = name
-		this._nameBytes = this.constructor.utils.stringtoUTF8Array(name)
-		this._nameLength = this.constructor.utils.int32ToBytes(this._nameBytes.length)
-	}
+  set name(name) {
+    this.nameText = name;
+    this._nameBytes = this.constructor.utils.stringtoUTF8Array(name);
+    this._nameLength = this.constructor.utils.int32ToBytes(
+      this._nameBytes.length
+    );
+  }
 
-	set sellPrice(sellPrice) {
-		this._sellPrice = sellPrice * QORT_DECIMALS
-		this._sellPriceBytes = this.constructor.utils.int64ToBytes(this._sellPrice)
-	}
+  set sellPrice(sellPrice) {
+    this._sellPrice = sellPrice * QORT_DECIMALS;
+    this._sellPriceBytes = this.constructor.utils.int64ToBytes(this._sellPrice);
+  }
 
-	set recipient(recipient) {
-		this._recipient = recipient instanceof Uint8Array ? recipient : this.constructor.Base58.decode(recipient)
-		this.theRecipient = recipient
-	}
+  set recipient(recipient) {
+    this._recipient =
+      recipient instanceof Uint8Array
+        ? recipient
+        : this.constructor.Base58.decode(recipient);
+    this.theRecipient = recipient;
+  }
 
-	get params() {
-		const params = super.params
-		params.push(
-			this._nameLength,
-			this._nameBytes,
-			this._sellPriceBytes,
-			this._recipient,
-			this._feeBytes
-		)
-		return params
-	}
+  get params() {
+    const params = super.params;
+    params.push(
+      this._nameLength,
+      this._nameBytes,
+      this._sellPriceBytes,
+      this._recipient,
+      this._feeBytes
+    );
+    return params;
+  }
 }
diff --git a/src/transactions/CancelGroupBanTransaction.ts b/src/transactions/CancelGroupBanTransaction.ts
index d1bbef7..fc3ca73 100644
--- a/src/transactions/CancelGroupBanTransaction.ts
+++ b/src/transactions/CancelGroupBanTransaction.ts
@@ -1,37 +1,35 @@
 // @ts-nocheck
 
-import { QORT_DECIMALS } from "../constants/constants"
-import TransactionBase from "./TransactionBase"
-
+import { QORT_DECIMALS } from '../constants/constants';
+import TransactionBase from './TransactionBase';
 
 export default class CancelGroupBanTransaction extends TransactionBase {
-	constructor() {
-		super()
-		this.type = 27
-	}
+  constructor() {
+    super();
+    this.type = 27;
+  }
 
-	set rGroupId(rGroupId) {
-		this._rGroupId = rGroupId
-		this._rGroupIdBytes = this.constructor.utils.int32ToBytes(this._rGroupId)
-	}
+  set rGroupId(rGroupId) {
+    this._rGroupId = rGroupId;
+    this._rGroupIdBytes = this.constructor.utils.int32ToBytes(this._rGroupId);
+  }
 
-	set recipient(recipient) {
-		this._recipient = recipient instanceof Uint8Array ? recipient : this.constructor.Base58.decode(recipient)
-		this.theRecipient = recipient
-	}
+  set recipient(recipient) {
+    this._recipient =
+      recipient instanceof Uint8Array
+        ? recipient
+        : this.constructor.Base58.decode(recipient);
+    this.theRecipient = recipient;
+  }
 
-	set fee(fee) {
-		this._fee = fee * QORT_DECIMALS
-		this._feeBytes = this.constructor.utils.int64ToBytes(this._fee)
-	}
+  set fee(fee) {
+    this._fee = fee * QORT_DECIMALS;
+    this._feeBytes = this.constructor.utils.int64ToBytes(this._fee);
+  }
 
-	get params() {
-		const params = super.params
-		params.push(
-			this._rGroupIdBytes,
-			this._recipient,
-			this._feeBytes
-		)
-		return params
-	}
+  get params() {
+    const params = super.params;
+    params.push(this._rGroupIdBytes, this._recipient, this._feeBytes);
+    return params;
+  }
 }
diff --git a/src/transactions/CancelGroupInviteTransaction.ts b/src/transactions/CancelGroupInviteTransaction.ts
index b575f3e..6ece4fd 100644
--- a/src/transactions/CancelGroupInviteTransaction.ts
+++ b/src/transactions/CancelGroupInviteTransaction.ts
@@ -1,36 +1,33 @@
 // @ts-nocheck
-import { QORT_DECIMALS } from "../constants/constants"
-import TransactionBase from "./TransactionBase"
-
-
+import { QORT_DECIMALS } from '../constants/constants';
+import TransactionBase from './TransactionBase';
 export default class CancelGroupInviteTransaction extends TransactionBase {
-	constructor() {
-		super()
-		this.type = 30
-	}
+  constructor() {
+    super();
+    this.type = 30;
+  }
 
-	set rGroupId(rGroupId) {
-		this._rGroupId = rGroupId
-		this._rGroupIdBytes = this.constructor.utils.int32ToBytes(this._rGroupId)
-	}
+  set rGroupId(rGroupId) {
+    this._rGroupId = rGroupId;
+    this._rGroupIdBytes = this.constructor.utils.int32ToBytes(this._rGroupId);
+  }
 
-	set recipient(recipient) {
-		this._recipient = recipient instanceof Uint8Array ? recipient : this.constructor.Base58.decode(recipient)
-		this.theRecipient = recipient
-	}
+  set recipient(recipient) {
+    this._recipient =
+      recipient instanceof Uint8Array
+        ? recipient
+        : this.constructor.Base58.decode(recipient);
+    this.theRecipient = recipient;
+  }
 
-	set fee(fee) {
-		this._fee = fee * QORT_DECIMALS
-		this._feeBytes = this.constructor.utils.int64ToBytes(this._fee)
-	}
+  set fee(fee) {
+    this._fee = fee * QORT_DECIMALS;
+    this._feeBytes = this.constructor.utils.int64ToBytes(this._fee);
+  }
 
-	get params() {
-		const params = super.params
-		params.push(
-			this._rGroupIdBytes,
-			this._recipient,
-			this._feeBytes
-		)
-		return params
-	}
+  get params() {
+    const params = super.params;
+    params.push(this._rGroupIdBytes, this._recipient, this._feeBytes);
+    return params;
+  }
 }
diff --git a/src/transactions/CancelSellNameTransacion.ts b/src/transactions/CancelSellNameTransacion.ts
index 04296c8..28420f7 100644
--- a/src/transactions/CancelSellNameTransacion.ts
+++ b/src/transactions/CancelSellNameTransacion.ts
@@ -1,33 +1,29 @@
 // @ts-nocheck
 
-import { QORT_DECIMALS } from "../constants/constants"
-import TransactionBase from "./TransactionBase"
-
-
+import { QORT_DECIMALS } from '../constants/constants';
+import TransactionBase from './TransactionBase';
 export default class CancelSellNameTransacion extends TransactionBase {
-	constructor() {
-		super()
-		this.type = 6
-	}
+  constructor() {
+    super();
+    this.type = 6;
+  }
 
-	set fee(fee) {
-		this._fee = fee * QORT_DECIMALS
-		this._feeBytes = this.constructor.utils.int64ToBytes(this._fee)
-	}
+  set fee(fee) {
+    this._fee = fee * QORT_DECIMALS;
+    this._feeBytes = this.constructor.utils.int64ToBytes(this._fee);
+  }
 
-	set name(name) {
-		this.nameText = name
-		this._nameBytes = this.constructor.utils.stringtoUTF8Array(name)
-		this._nameLength = this.constructor.utils.int32ToBytes(this._nameBytes.length)
-	}
+  set name(name) {
+    this.nameText = name;
+    this._nameBytes = this.constructor.utils.stringtoUTF8Array(name);
+    this._nameLength = this.constructor.utils.int32ToBytes(
+      this._nameBytes.length
+    );
+  }
 
-	get params() {
-		const params = super.params
-		params.push(
-			this._nameLength,
-			this._nameBytes,
-			this._feeBytes
-		)
-		return params
-	}
+  get params() {
+    const params = super.params;
+    params.push(this._nameLength, this._nameBytes, this._feeBytes);
+    return params;
+  }
 }
diff --git a/src/transactions/ChatBase.ts b/src/transactions/ChatBase.ts
index cdfacaf..c88d634 100644
--- a/src/transactions/ChatBase.ts
+++ b/src/transactions/ChatBase.ts
@@ -1,148 +1,161 @@
 // @ts-nocheck
 
-import { QORT_DECIMALS, TX_TYPES } from '../constants/constants'
-import nacl from '../deps/nacl-fast'
-import Base58 from '../deps/Base58'
-import utils from '../utils/utils'
-
+import { QORT_DECIMALS, TX_TYPES } from '../constants/constants';
+import nacl from '../deps/nacl-fast';
+import Base58 from '../deps/Base58';
+import utils from '../utils/utils';
 export default class ChatBase {
-	static get utils() {
-		return utils
-	}
+  static get utils() {
+    return utils;
+  }
 
-	static get nacl() {
-		return nacl
-	}
+  static get nacl() {
+    return nacl;
+  }
 
-	static get Base58() {
-		return Base58
-	}
+  static get Base58() {
+    return Base58;
+  }
 
-	constructor() {
-	
-		this.fee = 0
-		this.groupID = 0
-		this.tests = [
-			() => {
-				if (!(this._type >= 1 && this._type in TX_TYPES)) {
-					return 'Invalid type: ' + this.type
-				}
-				return true
-			},
-			() => {
-				if (this._fee < 0) {
-					return 'Invalid fee: ' + this._fee / QORT_DECIMALS
-				}
-				return true
-			},
-			() => {
-				if (this._groupID < 0 || !Number.isInteger(this._groupID)) {
-					return 'Invalid groupID: ' + this._groupID
-				}
-				return true
-			},
-			() => {
-				if (!(new Date(this._timestamp)).getTime() > 0) {
-					return 'Invalid timestamp: ' + this._timestamp
-				}
-				return true
-			},
-			() => {
-			
-				if (!(this._lastReference instanceof Uint8Array && this._lastReference.byteLength == 64)) {
-					return 'Invalid last reference: ' + this._lastReference
-				}
-				return true
-			},
-			() => {
-				if (!(this._keyPair)) {
-					return 'keyPair must be specified'
-				}
-				if (!(this._keyPair.publicKey instanceof Uint8Array && this._keyPair.publicKey.byteLength === 32)) {
-					return 'Invalid publicKey'
-				}
-				if (!(this._keyPair.privateKey instanceof Uint8Array && this._keyPair.privateKey.byteLength === 64)) {
-					return 'Invalid privateKey'
-				}
-				return true
-			}
-		]
-	}
+  constructor() {
+    this.fee = 0;
+    this.groupID = 0;
+    this.tests = [
+      () => {
+        if (!(this._type >= 1 && this._type in TX_TYPES)) {
+          return 'Invalid type: ' + this.type;
+        }
+        return true;
+      },
+      () => {
+        if (this._fee < 0) {
+          return 'Invalid fee: ' + this._fee / QORT_DECIMALS;
+        }
+        return true;
+      },
+      () => {
+        if (this._groupID < 0 || !Number.isInteger(this._groupID)) {
+          return 'Invalid groupID: ' + this._groupID;
+        }
+        return true;
+      },
+      () => {
+        if (!new Date(this._timestamp).getTime() > 0) {
+          return 'Invalid timestamp: ' + this._timestamp;
+        }
+        return true;
+      },
+      () => {
+        if (
+          !(
+            this._lastReference instanceof Uint8Array &&
+            this._lastReference.byteLength == 64
+          )
+        ) {
+          return 'Invalid last reference: ' + this._lastReference;
+        }
+        return true;
+      },
+      () => {
+        if (!this._keyPair) {
+          return 'keyPair must be specified';
+        }
+        if (
+          !(
+            this._keyPair.publicKey instanceof Uint8Array &&
+            this._keyPair.publicKey.byteLength === 32
+          )
+        ) {
+          return 'Invalid publicKey';
+        }
+        if (
+          !(
+            this._keyPair.privateKey instanceof Uint8Array &&
+            this._keyPair.privateKey.byteLength === 64
+          )
+        ) {
+          return 'Invalid privateKey';
+        }
+        return true;
+      },
+    ];
+  }
 
-	set keyPair(keyPair) {
-		this._keyPair = keyPair
-	}
+  set keyPair(keyPair) {
+    this._keyPair = keyPair;
+  }
 
-	set type(type) {
-		this.typeText = TX_TYPES[type]
-		this._type = type
-		this._typeBytes = this.constructor.utils.int32ToBytes(this._type)
-	}
+  set type(type) {
+    this.typeText = TX_TYPES[type];
+    this._type = type;
+    this._typeBytes = this.constructor.utils.int32ToBytes(this._type);
+  }
 
-	set groupID(groupID) {
-		this._groupID = groupID
-		this._groupIDBytes = this.constructor.utils.int32ToBytes(this._groupID)
-	}
+  set groupID(groupID) {
+    this._groupID = groupID;
+    this._groupIDBytes = this.constructor.utils.int32ToBytes(this._groupID);
+  }
 
-	set timestamp(timestamp) {
-		this._timestamp = timestamp
-		this._timestampBytes = this.constructor.utils.int64ToBytes(this._timestamp)
-	}
+  set timestamp(timestamp) {
+    this._timestamp = timestamp;
+    this._timestampBytes = this.constructor.utils.int64ToBytes(this._timestamp);
+  }
 
-	set fee(fee) {
-		this._fee = fee * QORT_DECIMALS
-		this._feeBytes = this.constructor.utils.int64ToBytes(this._fee)
-	}
+  set fee(fee) {
+    this._fee = fee * QORT_DECIMALS;
+    this._feeBytes = this.constructor.utils.int64ToBytes(this._fee);
+  }
 
-	set lastReference(lastReference) {
+  set lastReference(lastReference) {
+    this._lastReference =
+      lastReference instanceof Uint8Array
+        ? lastReference
+        : this.constructor.Base58.decode(lastReference);
+  }
 
-		this._lastReference = lastReference instanceof Uint8Array ? lastReference : this.constructor.Base58.decode(lastReference)
-	}
+  get params() {
+    return [
+      this._typeBytes,
+      this._timestampBytes,
+      this._groupIDBytes,
+      this._lastReference,
+      this._keyPair.publicKey,
+    ];
+  }
 
-	get params() {
-		return [
-			this._typeBytes,
-			this._timestampBytes,
-			this._groupIDBytes,
-			this._lastReference,
-			this._keyPair.publicKey
-		]
-	}
+  get chatBytes() {
+    const isValid = this.validParams();
+    if (!isValid.valid) {
+      throw new Error(isValid.message);
+    }
 
-	get chatBytes() {
-		const isValid = this.validParams()
-		if (!isValid.valid) {
-			throw new Error(isValid.message)
-		}
+    let result = new Uint8Array();
 
-		let result = new Uint8Array()
+    this.params.forEach((item) => {
+      result = this.constructor.utils.appendBuffer(result, item);
+    });
 
-		this.params.forEach(item => {
-			result = this.constructor.utils.appendBuffer(result, item)
-		})
+    this._chatBytes = result;
 
-		this._chatBytes = result
+    return this._chatBytes;
+  }
 
-		return this._chatBytes
-	}
+  validParams() {
+    let finalResult = {
+      valid: true,
+    };
 
-	validParams() {
-		let finalResult = {
-			valid: true
-		}
-
-		this.tests.some(test => {
-			const result = test()
-			if (result !== true) {
-				finalResult = {
-					valid: false,
-					message: result
-				}
-				return true
-			}
-		})
-
-		return finalResult
-	}
+    this.tests.some((test) => {
+      const result = test();
+      if (result !== true) {
+        finalResult = {
+          valid: false,
+          message: result,
+        };
+        return true;
+      }
+    });
 
+    return finalResult;
+  }
 }
diff --git a/src/transactions/ChatTransaction.ts b/src/transactions/ChatTransaction.ts
index ec30c8c..fc67531 100644
--- a/src/transactions/ChatTransaction.ts
+++ b/src/transactions/ChatTransaction.ts
@@ -1,92 +1,126 @@
 // @ts-nocheck
 
-import ChatBase from './ChatBase'
-import nacl from '../deps/nacl-fast'
-import ed2curve from '../deps/ed2curve'
-import { Sha256 } from 'asmcrypto.js'
-import { CHAT_REFERENCE_FEATURE_TRIGGER_TIMESTAMP } from '../constants/constants'
-
+import ChatBase from './ChatBase';
+import nacl from '../deps/nacl-fast';
+import ed2curve from '../deps/ed2curve';
+import { Sha256 } from 'asmcrypto.js';
+import { CHAT_REFERENCE_FEATURE_TRIGGER_TIMESTAMP } from '../constants/constants';
 export default class ChatTransaction extends ChatBase {
-	constructor() {
-		super()
-		this.type = 18
-		this.fee = 0
-	}
+  constructor() {
+    super();
+    this.type = 18;
+    this.fee = 0;
+  }
 
-	set recipientPublicKey(recipientPublicKey) {
-		this._base58RecipientPublicKey = recipientPublicKey instanceof Uint8Array ? this.constructor.Base58.encode(recipientPublicKey) : recipientPublicKey
-		this._recipientPublicKey = this.constructor.Base58.decode(this._base58RecipientPublicKey)
-	}
+  set recipientPublicKey(recipientPublicKey) {
+    this._base58RecipientPublicKey =
+      recipientPublicKey instanceof Uint8Array
+        ? this.constructor.Base58.encode(recipientPublicKey)
+        : recipientPublicKey;
+    this._recipientPublicKey = this.constructor.Base58.decode(
+      this._base58RecipientPublicKey
+    );
+  }
 
-	set proofOfWorkNonce(proofOfWorkNonce) {
-		this._proofOfWorkNonce = this.constructor.utils.int32ToBytes(proofOfWorkNonce)
-	}
+  set proofOfWorkNonce(proofOfWorkNonce) {
+    this._proofOfWorkNonce =
+      this.constructor.utils.int32ToBytes(proofOfWorkNonce);
+  }
 
-	set recipient(recipient) {
-		this._recipient = recipient instanceof Uint8Array ? recipient : this.constructor.Base58.decode(recipient)
-		this._hasReceipient = new Uint8Array(1)
-		this._hasReceipient[0] = 1
-	}
+  set recipient(recipient) {
+    this._recipient =
+      recipient instanceof Uint8Array
+        ? recipient
+        : this.constructor.Base58.decode(recipient);
+    this._hasReceipient = new Uint8Array(1);
+    this._hasReceipient[0] = 1;
+  }
 
-	set hasChatReference(hasChatReference) {
-		this._hasChatReference = new Uint8Array(1)
-		this._hasChatReference[0] = hasChatReference
-	}
+  set hasChatReference(hasChatReference) {
+    this._hasChatReference = new Uint8Array(1);
+    this._hasChatReference[0] = hasChatReference;
+  }
 
-	set chatReference(chatReference) {
-		this._chatReference = chatReference instanceof Uint8Array ? chatReference : this.constructor.Base58.decode(chatReference)
-	}
+  set chatReference(chatReference) {
+    this._chatReference =
+      chatReference instanceof Uint8Array
+        ? chatReference
+        : this.constructor.Base58.decode(chatReference);
+  }
 
-	set message(message) {
-		this.messageText = message;
-		this._message = this.constructor.utils.stringtoUTF8Array(message)
-		this._messageLength = this.constructor.utils.int32ToBytes(this._message.length)
-	}
+  set message(message) {
+    this.messageText = message;
+    this._message = this.constructor.utils.stringtoUTF8Array(message);
+    this._messageLength = this.constructor.utils.int32ToBytes(
+      this._message.length
+    );
+  }
 
-	set isEncrypted(isEncrypted) {
-		this._isEncrypted = new Uint8Array(1)
-		this._isEncrypted[0] = isEncrypted
+  set isEncrypted(isEncrypted) {
+    this._isEncrypted = new Uint8Array(1);
+    this._isEncrypted[0] = isEncrypted;
 
-		if (isEncrypted === 1) {
-			const convertedPrivateKey = ed2curve.convertSecretKey(this._keyPair.privateKey)
-			const convertedPublicKey = ed2curve.convertPublicKey(this._recipientPublicKey)
-			const sharedSecret = new Uint8Array(32)
-			nacl.lowlevel.crypto_scalarmult(sharedSecret, convertedPrivateKey, convertedPublicKey)
+    if (isEncrypted === 1) {
+      const convertedPrivateKey = ed2curve.convertSecretKey(
+        this._keyPair.privateKey
+      );
+      const convertedPublicKey = ed2curve.convertPublicKey(
+        this._recipientPublicKey
+      );
+      const sharedSecret = new Uint8Array(32);
+      nacl.lowlevel.crypto_scalarmult(
+        sharedSecret,
+        convertedPrivateKey,
+        convertedPublicKey
+      );
 
-			this._chatEncryptionSeed = new Sha256().process(sharedSecret).finish().result
-			this._encryptedMessage = nacl.secretbox(this._message, this._lastReference.slice(0, 24), this._chatEncryptionSeed)
-		}
+      this._chatEncryptionSeed = new Sha256()
+        .process(sharedSecret)
+        .finish().result;
+      this._encryptedMessage = nacl.secretbox(
+        this._message,
+        this._lastReference.slice(0, 24),
+        this._chatEncryptionSeed
+      );
+    }
 
-		this._myMessage = isEncrypted === 1 ? this._encryptedMessage : this._message
-		this._myMessageLenth = isEncrypted === 1 ? this.constructor.utils.int32ToBytes(this._myMessage.length) : this._messageLength
-	}
+    this._myMessage =
+      isEncrypted === 1 ? this._encryptedMessage : this._message;
+    this._myMessageLenth =
+      isEncrypted === 1
+        ? this.constructor.utils.int32ToBytes(this._myMessage.length)
+        : this._messageLength;
+  }
 
-	set isText(isText) {
-		this._isText = new Uint8Array(1)
-		this._isText[0] = isText
-	}
+  set isText(isText) {
+    this._isText = new Uint8Array(1);
+    this._isText[0] = isText;
+  }
 
-	get params() {
-		const params = super.params
-		params.push(
-			this._proofOfWorkNonce,
-			this._hasReceipient,
-			this._recipient,
-			this._myMessageLenth,
-			this._myMessage,
-			this._isEncrypted,
-			this._isText,
-			this._feeBytes
-		)
+  get params() {
+    const params = super.params;
+    params.push(
+      this._proofOfWorkNonce,
+      this._hasReceipient,
+      this._recipient,
+      this._myMessageLenth,
+      this._myMessage,
+      this._isEncrypted,
+      this._isText,
+      this._feeBytes
+    );
 
-		// After the feature trigger timestamp we need to include chat reference
-		if (new Date(this._timestamp).getTime() >= CHAT_REFERENCE_FEATURE_TRIGGER_TIMESTAMP) {
-			params.push(this._hasChatReference)
+    // After the feature trigger timestamp we need to include chat reference
+    if (
+      new Date(this._timestamp).getTime() >=
+      CHAT_REFERENCE_FEATURE_TRIGGER_TIMESTAMP
+    ) {
+      params.push(this._hasChatReference);
 
-			if (this._hasChatReference[0] == 1) {
-				params.push(this._chatReference)
-			}
-		}
-		return params
-	}
+      if (this._hasChatReference[0] == 1) {
+        params.push(this._chatReference);
+      }
+    }
+    return params;
+  }
 }
diff --git a/src/transactions/CreateGroupTransaction.ts b/src/transactions/CreateGroupTransaction.ts
index a2eb7ea..24aff1e 100644
--- a/src/transactions/CreateGroupTransaction.ts
+++ b/src/transactions/CreateGroupTransaction.ts
@@ -1,64 +1,73 @@
 // @ts-nocheck
 
-import { QORT_DECIMALS } from "../constants/constants"
-import TransactionBase from "./TransactionBase"
-
-
+import { QORT_DECIMALS } from '../constants/constants';
+import TransactionBase from './TransactionBase';
 export default class CreateGroupTransaction extends TransactionBase {
-	constructor() {
-		super()
-		this.type = 22
-	}
+  constructor() {
+    super();
+    this.type = 22;
+  }
 
+  set fee(fee) {
+    this._fee = fee * QORT_DECIMALS;
+    this._feeBytes = this.constructor.utils.int64ToBytes(this._fee);
+  }
 
-	set fee(fee) {
-		this._fee = fee * QORT_DECIMALS
-		this._feeBytes = this.constructor.utils.int64ToBytes(this._fee)
-	}
+  set rGroupName(rGroupName) {
+    this._rGroupName = rGroupName;
+    this._rGroupNameBytes = this.constructor.utils.stringtoUTF8Array(
+      this._rGroupName
+    );
+    this._rGroupNameLength = this.constructor.utils.int32ToBytes(
+      this._rGroupNameBytes.length
+    );
+  }
 
-	set rGroupName(rGroupName) {
-		this._rGroupName = rGroupName
-		this._rGroupNameBytes = this.constructor.utils.stringtoUTF8Array(this._rGroupName)
-		this._rGroupNameLength = this.constructor.utils.int32ToBytes(this._rGroupNameBytes.length)
-	}
+  set rGroupDesc(rGroupDesc) {
+    this._rGroupDesc = rGroupDesc;
+    this._rGroupDescBytes = this.constructor.utils.stringtoUTF8Array(
+      this._rGroupDesc
+    );
+    this._rGroupDescLength = this.constructor.utils.int32ToBytes(
+      this._rGroupDescBytes.length
+    );
+  }
 
-	set rGroupDesc(rGroupDesc) {
-		this._rGroupDesc = rGroupDesc
-		this._rGroupDescBytes = this.constructor.utils.stringtoUTF8Array(this._rGroupDesc)
-		this._rGroupDescLength = this.constructor.utils.int32ToBytes(this._rGroupDescBytes.length)
-	}
+  set rGroupType(rGroupType) {
+    this._rGroupType = new Uint8Array(1);
+    this._rGroupType[0] = rGroupType;
+  }
 
-	set rGroupType(rGroupType) {
-		this._rGroupType = new Uint8Array(1)
-		this._rGroupType[0] = rGroupType
-	}
+  set rGroupApprovalThreshold(rGroupApprovalThreshold) {
+    this._rGroupApprovalThreshold = new Uint8Array(1);
+    this._rGroupApprovalThreshold[0] = rGroupApprovalThreshold;
+  }
 
-	set rGroupApprovalThreshold(rGroupApprovalThreshold) {
-		this._rGroupApprovalThreshold = new Uint8Array(1)
-		this._rGroupApprovalThreshold[0] = rGroupApprovalThreshold
-	}
+  set rGroupMinimumBlockDelay(rGroupMinimumBlockDelay) {
+    this._rGroupMinimumBlockDelayBytes = this.constructor.utils.int32ToBytes(
+      rGroupMinimumBlockDelay
+    );
+  }
 
-	set rGroupMinimumBlockDelay(rGroupMinimumBlockDelay) {
-		this._rGroupMinimumBlockDelayBytes = this.constructor.utils.int32ToBytes(rGroupMinimumBlockDelay)
-	}
+  set rGroupMaximumBlockDelay(rGroupMaximumBlockDelay) {
+    this._rGroupMaximumBlockDelayBytes = this.constructor.utils.int32ToBytes(
+      rGroupMaximumBlockDelay
+    );
+  }
 
-	set rGroupMaximumBlockDelay(rGroupMaximumBlockDelay) {
-		this._rGroupMaximumBlockDelayBytes = this.constructor.utils.int32ToBytes(rGroupMaximumBlockDelay)
-	}
-
-	get params() {
-		const params = super.params
-		params.push(
-			this._rGroupNameLength,
-			this._rGroupNameBytes,
-			this._rGroupDescLength,
-			this._rGroupDescBytes,
-			this._rGroupType,
-			this._rGroupApprovalThreshold,
-			this._rGroupMinimumBlockDelayBytes,
-			this._rGroupMaximumBlockDelayBytes,
-			this._feeBytes
-		)
-		return params
-	}
+  get params() {
+    const params = super.params;
+    params.push(
+      this._rGroupNameLength,
+      this._rGroupNameBytes,
+      this._rGroupDescLength,
+      this._rGroupDescBytes,
+      this._rGroupType,
+      this._rGroupApprovalThreshold,
+      this._rGroupMinimumBlockDelayBytes,
+      this._rGroupMaximumBlockDelayBytes,
+      this._feeBytes
+    );
+    return params;
+  }
 }
diff --git a/src/transactions/CreatePollTransaction.ts b/src/transactions/CreatePollTransaction.ts
index a2a9cc0..3717ba9 100644
--- a/src/transactions/CreatePollTransaction.ts
+++ b/src/transactions/CreatePollTransaction.ts
@@ -1,73 +1,84 @@
 // @ts-nocheck
-import { QORT_DECIMALS } from '../constants/constants'
-import TransactionBase from './TransactionBase'
-
+import { QORT_DECIMALS } from '../constants/constants';
+import TransactionBase from './TransactionBase';
 export default class CreatePollTransaction extends TransactionBase {
-	constructor() {
-		super()
-		this.type = 8
-		this._options = []
-	}
+  constructor() {
+    super();
+    this.type = 8;
+    this._options = [];
+  }
 
-	addOption(option) {
-		const optionBytes = this.constructor.utils.stringtoUTF8Array(option)
-		const optionLength = this.constructor.utils.int32ToBytes(optionBytes.length)
-		this._options.push({ length: optionLength, bytes: optionBytes })
-	}
+  addOption(option) {
+    const optionBytes = this.constructor.utils.stringtoUTF8Array(option);
+    const optionLength = this.constructor.utils.int32ToBytes(
+      optionBytes.length
+    );
+    this._options.push({ length: optionLength, bytes: optionBytes });
+  }
 
+  set fee(fee) {
+    this._fee = fee * QORT_DECIMALS;
+    this._feeBytes = this.constructor.utils.int64ToBytes(this._fee);
+  }
 
-	set fee(fee) {
-		this._fee = fee * QORT_DECIMALS
-		this._feeBytes = this.constructor.utils.int64ToBytes(this._fee)
-	}
+  set ownerAddress(ownerAddress) {
+    this._ownerAddress =
+      ownerAddress instanceof Uint8Array
+        ? ownerAddress
+        : this.constructor.Base58.decode(ownerAddress);
+  }
 
-	set ownerAddress(ownerAddress) {
-		this._ownerAddress = ownerAddress instanceof Uint8Array ? ownerAddress : this.constructor.Base58.decode(ownerAddress)
-	}
+  set rPollName(rPollName) {
+    this._rPollName = rPollName;
+    this._rPollNameBytes = this.constructor.utils.stringtoUTF8Array(
+      this._rPollName
+    );
+    this._rPollNameLength = this.constructor.utils.int32ToBytes(
+      this._rPollNameBytes.length
+    );
+  }
 
-	set rPollName(rPollName) {
-		this._rPollName = rPollName
-		this._rPollNameBytes = this.constructor.utils.stringtoUTF8Array(this._rPollName)
-		this._rPollNameLength = this.constructor.utils.int32ToBytes(this._rPollNameBytes.length)
+  set rPollDesc(rPollDesc) {
+    this._rPollDesc = rPollDesc;
+    this._rPollDescBytes = this.constructor.utils.stringtoUTF8Array(
+      this._rPollDesc
+    );
+    this._rPollDescLength = this.constructor.utils.int32ToBytes(
+      this._rPollDescBytes.length
+    );
+  }
 
-	}
+  set rOptions(rOptions) {
+    const optionsArray = rOptions[0].split(', ').map((opt) => opt.trim());
+    this._pollOptions = optionsArray;
 
-	set rPollDesc(rPollDesc) {
-		this._rPollDesc = rPollDesc
-		this._rPollDescBytes = this.constructor.utils.stringtoUTF8Array(this._rPollDesc)
-		this._rPollDescLength = this.constructor.utils.int32ToBytes(this._rPollDescBytes.length)
-	}
+    for (let i = 0; i < optionsArray.length; i++) {
+      this.addOption(optionsArray[i]);
+    }
 
-	set rOptions(rOptions) {
-		const optionsArray = rOptions[0].split(', ').map(opt => opt.trim())
-		this._pollOptions = optionsArray
+    this._rNumberOfOptionsBytes = this.constructor.utils.int32ToBytes(
+      optionsArray.length
+    );
+  }
 
-		for (let i = 0; i < optionsArray.length; i++) {
-			this.addOption(optionsArray[i])
-		}
+  get params() {
+    const params = super.params;
+    params.push(
+      this._ownerAddress,
+      this._rPollNameLength,
+      this._rPollNameBytes,
+      this._rPollDescLength,
+      this._rPollDescBytes,
+      this._rNumberOfOptionsBytes
+    );
 
-		this._rNumberOfOptionsBytes = this.constructor.utils.int32ToBytes(optionsArray.length)
-	}
+    // Push the dynamic options
+    for (let i = 0; i < this._options.length; i++) {
+      params.push(this._options[i].length, this._options[i].bytes);
+    }
 
+    params.push(this._feeBytes);
 
-	get params() {
-		const params = super.params
-		params.push(
-			this._ownerAddress,
-			this._rPollNameLength,
-			this._rPollNameBytes,
-			this._rPollDescLength,
-			this._rPollDescBytes,
-			this._rNumberOfOptionsBytes
-		)
-
-		// Push the dynamic options
-		for (let i = 0; i < this._options.length; i++) {
-			params.push(this._options[i].length, this._options[i].bytes)
-		}
-
-		params.push(this._feeBytes)
-
-		return params
-	}
+    return params;
+  }
 }
diff --git a/src/transactions/DeployAtTransaction.ts b/src/transactions/DeployAtTransaction.ts
index 8a20553..698ef5a 100644
--- a/src/transactions/DeployAtTransaction.ts
+++ b/src/transactions/DeployAtTransaction.ts
@@ -1,78 +1,90 @@
 // @ts-nocheck
 
-
-import TransactionBase from './TransactionBase'
-import { QORT_DECIMALS } from '../constants/constants'
-
+import TransactionBase from './TransactionBase';
+import { QORT_DECIMALS } from '../constants/constants';
 export default class DeployAtTransaction extends TransactionBase {
-	constructor() {
-		super()
-		this.type = 16
-	}
+  constructor() {
+    super();
+    this.type = 16;
+  }
 
+  set fee(fee) {
+    this._fee = fee * QORT_DECIMALS;
+    this._feeBytes = this.constructor.utils.int64ToBytes(this._fee);
+  }
 
+  set rAmount(rAmount) {
+    this._rAmount = Math.round(rAmount * QORT_DECIMALS);
+    this._rAmountBytes = this.constructor.utils.int64ToBytes(this._rAmount);
+  }
 
-	set fee(fee) {
-		this._fee = fee * QORT_DECIMALS
-		this._feeBytes = this.constructor.utils.int64ToBytes(this._fee)
-	}
+  set rName(rName) {
+    this._rName = rName;
+    this._rNameBytes = this.constructor.utils.stringtoUTF8Array(
+      this._rName.toLocaleLowerCase()
+    );
+    this._rNameLength = this.constructor.utils.int32ToBytes(
+      this._rNameBytes.length
+    );
+  }
 
-	set rAmount(rAmount) {
-		this._rAmount = Math.round(rAmount * QORT_DECIMALS)
-		this._rAmountBytes = this.constructor.utils.int64ToBytes(this._rAmount)
-	}
+  set rDescription(rDescription) {
+    this._rDescription = rDescription;
+    this._rDescriptionBytes = this.constructor.utils.stringtoUTF8Array(
+      this._rDescription.toLocaleLowerCase()
+    );
+    this._rDescriptionLength = this.constructor.utils.int32ToBytes(
+      this._rDescriptionBytes.length
+    );
+  }
 
-	set rName(rName) {
-		this._rName = rName
-		this._rNameBytes = this.constructor.utils.stringtoUTF8Array(this._rName.toLocaleLowerCase())
-		this._rNameLength = this.constructor.utils.int32ToBytes(this._rNameBytes.length)
-	}
+  set atType(atType) {
+    this._atType = atType;
+    this._atTypeBytes = this.constructor.utils.stringtoUTF8Array(this._atType);
+    this._atTypeLength = this.constructor.utils.int32ToBytes(
+      this._atTypeBytes.length
+    );
+  }
 
-	set rDescription(rDescription) {
-		this._rDescription = rDescription
-		this._rDescriptionBytes = this.constructor.utils.stringtoUTF8Array(this._rDescription.toLocaleLowerCase())
-		this._rDescriptionLength = this.constructor.utils.int32ToBytes(this._rDescriptionBytes.length)
-	}
+  set rTags(rTags) {
+    this._rTags = rTags;
+    this._rTagsBytes = this.constructor.utils.stringtoUTF8Array(
+      this._rTags.toLocaleLowerCase()
+    );
+    this._rTagsLength = this.constructor.utils.int32ToBytes(
+      this._rTagsBytes.length
+    );
+  }
 
-	set atType(atType) {
-		this._atType = atType
-		this._atTypeBytes = this.constructor.utils.stringtoUTF8Array(this._atType)
-		this._atTypeLength = this.constructor.utils.int32ToBytes(this._atTypeBytes.length)
-	}
+  set rCreationBytes(rCreationBytes) {
+    const decode = this.constructor.Base58.decode(rCreationBytes);
+    this._rCreationBytes = this.constructor.utils.stringtoUTF8Array(decode);
+    this._rCreationBytesLength = this.constructor.utils.int32ToBytes(
+      this._rCreationBytes.length
+    );
+  }
 
-	set rTags(rTags) {
-		this._rTags = rTags
-		this._rTagsBytes = this.constructor.utils.stringtoUTF8Array(this._rTags.toLocaleLowerCase())
-		this._rTagsLength = this.constructor.utils.int32ToBytes(this._rTagsBytes.length)
-	}
+  set rAssetId(rAssetId) {
+    this._rAssetId = this.constructor.utils.int64ToBytes(rAssetId);
+  }
 
-	set rCreationBytes(rCreationBytes) {
-		const decode = this.constructor.Base58.decode(rCreationBytes)
-		this._rCreationBytes = this.constructor.utils.stringtoUTF8Array(decode)
-		this._rCreationBytesLength = this.constructor.utils.int32ToBytes(this._rCreationBytes.length)
-	}
-
-	set rAssetId(rAssetId) {
-		this._rAssetId = this.constructor.utils.int64ToBytes(rAssetId)
-	}
-
-	get params() {
-		const params = super.params
-		params.push(
-			this._rNameLength,
-			this._rNameBytes,
-			this._rDescriptionLength,
-			this._rDescriptionBytes,
-			this._atTypeLength,
-			this._atTypeBytes,
-			this._rTagsLength,
-			this._rTagsBytes,
-			this._rCreationBytesLength,
-			this._rCreationBytes,
-			this._rAmountBytes,
-			this._rAssetId,
-			this._feeBytes
-		)
-		return params
-	}
+  get params() {
+    const params = super.params;
+    params.push(
+      this._rNameLength,
+      this._rNameBytes,
+      this._rDescriptionLength,
+      this._rDescriptionBytes,
+      this._atTypeLength,
+      this._atTypeBytes,
+      this._rTagsLength,
+      this._rTagsBytes,
+      this._rCreationBytesLength,
+      this._rCreationBytes,
+      this._rAmountBytes,
+      this._rAssetId,
+      this._feeBytes
+    );
+    return params;
+  }
 }
diff --git a/src/transactions/GroupBanTransaction.ts b/src/transactions/GroupBanTransaction.ts
index 3eb3210..de59e74 100644
--- a/src/transactions/GroupBanTransaction.ts
+++ b/src/transactions/GroupBanTransaction.ts
@@ -1,50 +1,56 @@
 // @ts-nocheck
 
-import { QORT_DECIMALS } from "../constants/constants"
-import TransactionBase from "./TransactionBase"
-
+import { QORT_DECIMALS } from '../constants/constants';
+import TransactionBase from './TransactionBase';
 export default class GroupBanTransaction extends TransactionBase {
-	constructor() {
-		super()
-		this.type = 26
-	}
+  constructor() {
+    super();
+    this.type = 26;
+  }
 
-	set rGroupId(rGroupId) {
-		this._rGroupId = rGroupId
-		this._rGroupIdBytes = this.constructor.utils.int32ToBytes(this._rGroupId)
-	}
+  set rGroupId(rGroupId) {
+    this._rGroupId = rGroupId;
+    this._rGroupIdBytes = this.constructor.utils.int32ToBytes(this._rGroupId);
+  }
 
-	set rBanReason(rBanReason) {
-		this._rBanReason = rBanReason
-		this._rBanReasonBytes = this.constructor.utils.stringtoUTF8Array(this._rBanReason)
-		this._rBanReasonLength = this.constructor.utils.int32ToBytes(this._rBanReasonBytes.length)
-	}
+  set rBanReason(rBanReason) {
+    this._rBanReason = rBanReason;
+    this._rBanReasonBytes = this.constructor.utils.stringtoUTF8Array(
+      this._rBanReason
+    );
+    this._rBanReasonLength = this.constructor.utils.int32ToBytes(
+      this._rBanReasonBytes.length
+    );
+  }
 
-	set rBanTime(rBanTime) {
-		this._rBanTime = rBanTime
-		this._rBanTimeBytes = this.constructor.utils.int32ToBytes(this._rBanTime)
-	}
+  set rBanTime(rBanTime) {
+    this._rBanTime = rBanTime;
+    this._rBanTimeBytes = this.constructor.utils.int32ToBytes(this._rBanTime);
+  }
 
-	set recipient(recipient) {
-		this._recipient = recipient instanceof Uint8Array ? recipient : this.constructor.Base58.decode(recipient)
-		this.theRecipient = recipient
-	}
+  set recipient(recipient) {
+    this._recipient =
+      recipient instanceof Uint8Array
+        ? recipient
+        : this.constructor.Base58.decode(recipient);
+    this.theRecipient = recipient;
+  }
 
-	set fee(fee) {
-		this._fee = fee * QORT_DECIMALS
-		this._feeBytes = this.constructor.utils.int64ToBytes(this._fee)
-	}
+  set fee(fee) {
+    this._fee = fee * QORT_DECIMALS;
+    this._feeBytes = this.constructor.utils.int64ToBytes(this._fee);
+  }
 
-	get params() {
-		const params = super.params
-		params.push(
-			this._rGroupIdBytes,
-			this._recipient,
-			this._rBanReasonLength,
-			this._rBanReasonBytes,
-			this._rBanTimeBytes,
-			this._feeBytes
-		)
-		return params
-	}
+  get params() {
+    const params = super.params;
+    params.push(
+      this._rGroupIdBytes,
+      this._recipient,
+      this._rBanReasonLength,
+      this._rBanReasonBytes,
+      this._rBanTimeBytes,
+      this._feeBytes
+    );
+    return params;
+  }
 }
diff --git a/src/transactions/GroupChatTransaction.ts b/src/transactions/GroupChatTransaction.ts
index 1cd9d9b..1df7a4f 100644
--- a/src/transactions/GroupChatTransaction.ts
+++ b/src/transactions/GroupChatTransaction.ts
@@ -1,72 +1,79 @@
 // @ts-nocheck
 
-
-import ChatBase from './ChatBase'
-import { CHAT_REFERENCE_FEATURE_TRIGGER_TIMESTAMP } from '../constants/constants'
-
+import ChatBase from './ChatBase';
+import { CHAT_REFERENCE_FEATURE_TRIGGER_TIMESTAMP } from '../constants/constants';
 export default class GroupChatTransaction extends ChatBase {
-	constructor() {
-		super();
-		this.type = 18
-		this.fee = 0
-	}
+  constructor() {
+    super();
+    this.type = 18;
+    this.fee = 0;
+  }
 
-	set proofOfWorkNonce(proofOfWorkNonce) {
-		this._proofOfWorkNonce = this.constructor.utils.int32ToBytes(proofOfWorkNonce)
-	}
+  set proofOfWorkNonce(proofOfWorkNonce) {
+    this._proofOfWorkNonce =
+      this.constructor.utils.int32ToBytes(proofOfWorkNonce);
+  }
 
-	set hasReceipient(hasReceipient) {
-		this._hasReceipient = new Uint8Array(1)
-		this._hasReceipient[0] = hasReceipient
-	}
+  set hasReceipient(hasReceipient) {
+    this._hasReceipient = new Uint8Array(1);
+    this._hasReceipient[0] = hasReceipient;
+  }
 
-	set message(message) {
-		this.messageText = message
-		
-		this._message = this.constructor.utils.stringtoUTF8Array(message)
-		this._messageLength = this.constructor.utils.int32ToBytes(this._message.length)
-	}
+  set message(message) {
+    this.messageText = message;
 
-	set hasChatReference(hasChatReference) {
-		this._hasChatReference = new Uint8Array(1)
-		this._hasChatReference[0] = hasChatReference
-	}
+    this._message = this.constructor.utils.stringtoUTF8Array(message);
+    this._messageLength = this.constructor.utils.int32ToBytes(
+      this._message.length
+    );
+  }
 
-	set chatReference(chatReference) {
-		this._chatReference = chatReference instanceof Uint8Array ? chatReference : this.constructor.Base58.decode(chatReference)
-	}
+  set hasChatReference(hasChatReference) {
+    this._hasChatReference = new Uint8Array(1);
+    this._hasChatReference[0] = hasChatReference;
+  }
 
-	set isEncrypted(isEncrypted) {
-		this._isEncrypted = new Uint8Array(1)
-		this._isEncrypted[0] = isEncrypted
-	}
+  set chatReference(chatReference) {
+    this._chatReference =
+      chatReference instanceof Uint8Array
+        ? chatReference
+        : this.constructor.Base58.decode(chatReference);
+  }
 
-	set isText(isText) {
-		this._isText = new Uint8Array(1)
-		this._isText[0] = isText
-	}
+  set isEncrypted(isEncrypted) {
+    this._isEncrypted = new Uint8Array(1);
+    this._isEncrypted[0] = isEncrypted;
+  }
 
-	get params() {
-		const params = super.params
-		params.push(
-			this._proofOfWorkNonce,
-			this._hasReceipient,
-			this._messageLength,
-			this._message,
-			this._isEncrypted,
-			this._isText,
-			this._feeBytes
-		)
+  set isText(isText) {
+    this._isText = new Uint8Array(1);
+    this._isText[0] = isText;
+  }
 
-		// After the feature trigger timestamp we need to include chat reference
-		if (new Date(this._timestamp).getTime() >= CHAT_REFERENCE_FEATURE_TRIGGER_TIMESTAMP) {
-			params.push(this._hasChatReference)
+  get params() {
+    const params = super.params;
+    params.push(
+      this._proofOfWorkNonce,
+      this._hasReceipient,
+      this._messageLength,
+      this._message,
+      this._isEncrypted,
+      this._isText,
+      this._feeBytes
+    );
 
-			if (this._hasChatReference[0] == 1) {
-				params.push(this._chatReference)
-			}
-		}
+    // After the feature trigger timestamp we need to include chat reference
+    if (
+      new Date(this._timestamp).getTime() >=
+      CHAT_REFERENCE_FEATURE_TRIGGER_TIMESTAMP
+    ) {
+      params.push(this._hasChatReference);
 
-		return params
-	}
+      if (this._hasChatReference[0] == 1) {
+        params.push(this._chatReference);
+      }
+    }
+
+    return params;
+  }
 }
diff --git a/src/transactions/GroupInviteTransaction.ts b/src/transactions/GroupInviteTransaction.ts
index 3cbf978..448534b 100644
--- a/src/transactions/GroupInviteTransaction.ts
+++ b/src/transactions/GroupInviteTransaction.ts
@@ -1,42 +1,46 @@
 // @ts-nocheck
 
-import { QORT_DECIMALS } from "../constants/constants"
-import TransactionBase from "./TransactionBase"
-
+import { QORT_DECIMALS } from '../constants/constants';
+import TransactionBase from './TransactionBase';
 export default class GroupInviteTransaction extends TransactionBase {
-	constructor() {
-		super()
-		this.type = 29
-	}
+  constructor() {
+    super();
+    this.type = 29;
+  }
 
-	set rGroupId(rGroupId) {
-		this._rGroupId = rGroupId
-		this._rGroupIdBytes = this.constructor.utils.int32ToBytes(this._rGroupId)
-	}
+  set rGroupId(rGroupId) {
+    this._rGroupId = rGroupId;
+    this._rGroupIdBytes = this.constructor.utils.int32ToBytes(this._rGroupId);
+  }
 
-	set rInviteTime(rInviteTime) {
-		this._rInviteTime = rInviteTime
-		this._rInviteTimeBytes = this.constructor.utils.int32ToBytes(this._rInviteTime)
-	}
+  set rInviteTime(rInviteTime) {
+    this._rInviteTime = rInviteTime;
+    this._rInviteTimeBytes = this.constructor.utils.int32ToBytes(
+      this._rInviteTime
+    );
+  }
 
-	set recipient(recipient) {
-		this._recipient = recipient instanceof Uint8Array ? recipient : this.constructor.Base58.decode(recipient)
-		this.theRecipient = recipient
-	}
+  set recipient(recipient) {
+    this._recipient =
+      recipient instanceof Uint8Array
+        ? recipient
+        : this.constructor.Base58.decode(recipient);
+    this.theRecipient = recipient;
+  }
 
-	set fee(fee) {
-		this._fee = fee * QORT_DECIMALS
-		this._feeBytes = this.constructor.utils.int64ToBytes(this._fee)
-	}
+  set fee(fee) {
+    this._fee = fee * QORT_DECIMALS;
+    this._feeBytes = this.constructor.utils.int64ToBytes(this._fee);
+  }
 
-	get params() {
-		const params = super.params
-		params.push(
-			this._rGroupIdBytes,
-			this._recipient,
-			this._rInviteTimeBytes,
-			this._feeBytes
-		)
-		return params
-	}
+  get params() {
+    const params = super.params;
+    params.push(
+      this._rGroupIdBytes,
+      this._recipient,
+      this._rInviteTimeBytes,
+      this._feeBytes
+    );
+    return params;
+  }
 }
diff --git a/src/transactions/GroupKickTransaction.ts b/src/transactions/GroupKickTransaction.ts
index 969380f..298ebc9 100644
--- a/src/transactions/GroupKickTransaction.ts
+++ b/src/transactions/GroupKickTransaction.ts
@@ -1,46 +1,50 @@
 // @ts-nocheck
 
-
-import { QORT_DECIMALS } from "../constants/constants"
-import TransactionBase from "./TransactionBase"
-
-
+import { QORT_DECIMALS } from '../constants/constants';
+import TransactionBase from './TransactionBase';
 export default class GroupKickTransaction extends TransactionBase {
-	constructor() {
-		super()
-		this.type = 28
-	}
+  constructor() {
+    super();
+    this.type = 28;
+  }
 
-	set rGroupId(rGroupId) {
-		this._rGroupId = rGroupId
-		this._rGroupIdBytes = this.constructor.utils.int32ToBytes(this._rGroupId)
-	}
+  set rGroupId(rGroupId) {
+    this._rGroupId = rGroupId;
+    this._rGroupIdBytes = this.constructor.utils.int32ToBytes(this._rGroupId);
+  }
 
-	set rBanReason(rBanReason) {
-		this._rBanReason = rBanReason
-		this._rBanReasonBytes = this.constructor.utils.stringtoUTF8Array(this._rBanReason)
-		this._rBanReasonLength = this.constructor.utils.int32ToBytes(this._rBanReasonBytes.length)
-	}
+  set rBanReason(rBanReason) {
+    this._rBanReason = rBanReason;
+    this._rBanReasonBytes = this.constructor.utils.stringtoUTF8Array(
+      this._rBanReason
+    );
+    this._rBanReasonLength = this.constructor.utils.int32ToBytes(
+      this._rBanReasonBytes.length
+    );
+  }
 
-	set recipient(recipient) {
-		this._recipient = recipient instanceof Uint8Array ? recipient : this.constructor.Base58.decode(recipient)
-		this.theRecipient = recipient
-	}
+  set recipient(recipient) {
+    this._recipient =
+      recipient instanceof Uint8Array
+        ? recipient
+        : this.constructor.Base58.decode(recipient);
+    this.theRecipient = recipient;
+  }
 
-	set fee(fee) {
-		this._fee = fee * QORT_DECIMALS
-		this._feeBytes = this.constructor.utils.int64ToBytes(this._fee)
-	}
+  set fee(fee) {
+    this._fee = fee * QORT_DECIMALS;
+    this._feeBytes = this.constructor.utils.int64ToBytes(this._fee);
+  }
 
-	get params() {
-		const params = super.params
-		params.push(
-			this._rGroupIdBytes,
-			this._recipient,
-			this._rBanReasonLength,
-			this._rBanReasonBytes,
-			this._feeBytes
-		)
-		return params
-	}
+  get params() {
+    const params = super.params;
+    params.push(
+      this._rGroupIdBytes,
+      this._recipient,
+      this._rBanReasonLength,
+      this._rBanReasonBytes,
+      this._feeBytes
+    );
+    return params;
+  }
 }
diff --git a/src/transactions/JoinGroupTransaction.ts b/src/transactions/JoinGroupTransaction.ts
index 0aae8f7..dc51048 100644
--- a/src/transactions/JoinGroupTransaction.ts
+++ b/src/transactions/JoinGroupTransaction.ts
@@ -1,38 +1,33 @@
 // @ts-nocheck
 
-import { QORT_DECIMALS } from "../constants/constants"
-import TransactionBase from "./TransactionBase"
-
-
+import { QORT_DECIMALS } from '../constants/constants';
+import TransactionBase from './TransactionBase';
 export default class JoinGroupTransaction extends TransactionBase {
-	constructor() {
-		super()
-		this.type = 31
-	}
+  constructor() {
+    super();
+    this.type = 31;
+  }
 
+  set fee(fee) {
+    this._fee = fee * QORT_DECIMALS;
+    this._feeBytes = this.constructor.utils.int64ToBytes(this._fee);
+  }
 
+  set registrantAddress(registrantAddress) {
+    this._registrantAddress =
+      registrantAddress instanceof Uint8Array
+        ? registrantAddress
+        : this.constructor.Base58.decode(registrantAddress);
+  }
 
-	set fee(fee) {
-		this._fee = fee * QORT_DECIMALS
-		this._feeBytes = this.constructor.utils.int64ToBytes(this._fee)
-	}
+  set rGroupId(rGroupId) {
+    this._rGroupId = rGroupId;
+    this._rGroupIdBytes = this.constructor.utils.int32ToBytes(this._rGroupId);
+  }
 
-	set registrantAddress(registrantAddress) {
-		this._registrantAddress = registrantAddress instanceof Uint8Array ? registrantAddress : this.constructor.Base58.decode(registrantAddress)
-	}
-
-	set rGroupId(rGroupId) {
-		this._rGroupId = rGroupId
-		this._rGroupIdBytes = this.constructor.utils.int32ToBytes(this._rGroupId)
-	}
-
-
-	get params() {
-		const params = super.params
-		params.push(
-			this._rGroupIdBytes,
-			this._feeBytes
-		)
-		return params
-	}
+  get params() {
+    const params = super.params;
+    params.push(this._rGroupIdBytes, this._feeBytes);
+    return params;
+  }
 }
diff --git a/src/transactions/LeaveGroupTransaction.ts b/src/transactions/LeaveGroupTransaction.ts
index 222f250..85eeeec 100644
--- a/src/transactions/LeaveGroupTransaction.ts
+++ b/src/transactions/LeaveGroupTransaction.ts
@@ -1,35 +1,34 @@
 // @ts-nocheck
 
-import { QORT_DECIMALS } from "../constants/constants"
-import TransactionBase from "./TransactionBase"
-
+import { QORT_DECIMALS } from '../constants/constants';
+import TransactionBase from './TransactionBase';
 
 export default class LeaveGroupTransaction extends TransactionBase {
-	constructor() {
-		super()
-		this.type = 32
-	}
-	
-	set fee(fee) {
-		this._fee = fee * QORT_DECIMALS
-		this._feeBytes = this.constructor.utils.int64ToBytes(this._fee)
-	}
+  constructor() {
+    super();
+    this.type = 32;
+  }
 
-	set registrantAddress(registrantAddress) {
-		this._registrantAddress = registrantAddress instanceof Uint8Array ? registrantAddress : this.constructor.Base58.decode(registrantAddress)
-	}
+  set fee(fee) {
+    this._fee = fee * QORT_DECIMALS;
+    this._feeBytes = this.constructor.utils.int64ToBytes(this._fee);
+  }
 
-	set rGroupId(rGroupId) {
-		this._rGroupId = rGroupId
-		this._rGroupIdBytes = this.constructor.utils.int32ToBytes(this._rGroupId)
-	}
+  set registrantAddress(registrantAddress) {
+    this._registrantAddress =
+      registrantAddress instanceof Uint8Array
+        ? registrantAddress
+        : this.constructor.Base58.decode(registrantAddress);
+  }
 
-	get params() {
-		const params = super.params
-		params.push(
-			this._rGroupIdBytes,
-			this._feeBytes
-		)
-		return params
-	}
+  set rGroupId(rGroupId) {
+    this._rGroupId = rGroupId;
+    this._rGroupIdBytes = this.constructor.utils.int32ToBytes(this._rGroupId);
+  }
+
+  get params() {
+    const params = super.params;
+    params.push(this._rGroupIdBytes, this._feeBytes);
+    return params;
+  }
 }
diff --git a/src/transactions/PaymentTransaction.ts b/src/transactions/PaymentTransaction.ts
index 120bbe9..af770f8 100644
--- a/src/transactions/PaymentTransaction.ts
+++ b/src/transactions/PaymentTransaction.ts
@@ -1,38 +1,36 @@
 // @ts-nocheck
 
-import { QORT_DECIMALS } from '../constants/constants'
-import TransactionBase from './TransactionBase'
-
+import { QORT_DECIMALS } from '../constants/constants';
+import TransactionBase from './TransactionBase';
 export default class PaymentTransaction extends TransactionBase {
-	constructor() {
-		super()
-		this.type = 2
-	}
+  constructor() {
+    super();
+    this.type = 2;
+  }
 
-	set recipient(recipient) {
-		this._recipient = recipient instanceof Uint8Array ? recipient : this.constructor.Base58.decode(recipient)
-	}
+  set recipient(recipient) {
+    this._recipient =
+      recipient instanceof Uint8Array
+        ? recipient
+        : this.constructor.Base58.decode(recipient);
+  }
 
-	set dialogto(dialogto) {
-		this._dialogto = dialogto
-	}
+  set dialogto(dialogto) {
+    this._dialogto = dialogto;
+  }
 
-	set dialogamount(dialogamount) {
-		this._dialogamount = dialogamount
-	}
+  set dialogamount(dialogamount) {
+    this._dialogamount = dialogamount;
+  }
 
-	set amount(amount) {
-		this._amount = Math.round(amount * QORT_DECIMALS)
-		this._amountBytes = this.constructor.utils.int64ToBytes(this._amount)
-	}
+  set amount(amount) {
+    this._amount = Math.round(amount * QORT_DECIMALS);
+    this._amountBytes = this.constructor.utils.int64ToBytes(this._amount);
+  }
 
-	get params() {
-		const params = super.params
-		params.push(
-			this._recipient,
-			this._amountBytes,
-			this._feeBytes
-		)
-		return params
-	}
+  get params() {
+    const params = super.params;
+    params.push(this._recipient, this._amountBytes, this._feeBytes);
+    return params;
+  }
 }
diff --git a/src/transactions/RegisterNameTransaction.ts b/src/transactions/RegisterNameTransaction.ts
index 53046ee..e523f28 100644
--- a/src/transactions/RegisterNameTransaction.ts
+++ b/src/transactions/RegisterNameTransaction.ts
@@ -1,42 +1,44 @@
 // @ts-nocheck
 
-import { QORT_DECIMALS } from "../constants/constants"
-import TransactionBase from "./TransactionBase"
-
-
+import { QORT_DECIMALS } from '../constants/constants';
+import TransactionBase from './TransactionBase';
 export default class RegisterNameTransaction extends TransactionBase {
-	constructor() {
-		super()
-		this.type = 3
-	}
+  constructor() {
+    super();
+    this.type = 3;
+  }
 
+  set fee(fee) {
+    this._fee = fee * QORT_DECIMALS;
+    this._feeBytes = this.constructor.utils.int64ToBytes(this._fee);
+  }
 
-	set fee(fee) {
-		this._fee = fee * QORT_DECIMALS
-		this._feeBytes = this.constructor.utils.int64ToBytes(this._fee)
-	}
+  set name(name) {
+    this.nameText = name;
+    this._nameBytes = this.constructor.utils.stringtoUTF8Array(name);
+    this._nameLength = this.constructor.utils.int32ToBytes(
+      this._nameBytes.length
+    );
+  }
 
-	set name(name) {
-		this.nameText = name
-		this._nameBytes = this.constructor.utils.stringtoUTF8Array(name)
-		this._nameLength = this.constructor.utils.int32ToBytes(this._nameBytes.length)
-	}
+  set value(value) {
+    this.valueText =
+      value.length === 0 ? 'Registered Name on the Qortal Chain' : value;
+    this._valueBytes = this.constructor.utils.stringtoUTF8Array(this.valueText);
+    this._valueLength = this.constructor.utils.int32ToBytes(
+      this._valueBytes.length
+    );
+  }
 
-	set value(value) {
-		this.valueText = value.length === 0 ? "Registered Name on the Qortal Chain" : value
-		this._valueBytes = this.constructor.utils.stringtoUTF8Array(this.valueText)
-		this._valueLength = this.constructor.utils.int32ToBytes(this._valueBytes.length)
-	}
-
-	get params() {
-		const params = super.params
-		params.push(
-			this._nameLength,
-			this._nameBytes,
-			this._valueLength,
-			this._valueBytes,
-			this._feeBytes
-		)
-		return params
-	}
+  get params() {
+    const params = super.params;
+    params.push(
+      this._nameLength,
+      this._nameBytes,
+      this._valueLength,
+      this._valueBytes,
+      this._feeBytes
+    );
+    return params;
+  }
 }
diff --git a/src/transactions/RemoveGroupAdminTransaction.ts b/src/transactions/RemoveGroupAdminTransaction.ts
index 3392f79..11896be 100644
--- a/src/transactions/RemoveGroupAdminTransaction.ts
+++ b/src/transactions/RemoveGroupAdminTransaction.ts
@@ -1,38 +1,34 @@
 // @ts-nocheck
 
-import { QORT_DECIMALS } from "../constants/constants"
-import TransactionBase from "./TransactionBase"
-
+import { QORT_DECIMALS } from '../constants/constants';
+import TransactionBase from './TransactionBase';
 export default class RemoveGroupAdminTransaction extends TransactionBase {
-	constructor() {
-		super()
-		this.type = 25
-	}
+  constructor() {
+    super();
+    this.type = 25;
+  }
 
+  set rGroupId(rGroupId) {
+    this._rGroupId = rGroupId;
+    this._rGroupIdBytes = this.constructor.utils.int32ToBytes(this._rGroupId);
+  }
 
+  set recipient(recipient) {
+    this._recipient =
+      recipient instanceof Uint8Array
+        ? recipient
+        : this.constructor.Base58.decode(recipient);
+    this.theRecipient = recipient;
+  }
 
-	set rGroupId(rGroupId) {
-		this._rGroupId = rGroupId
-		this._rGroupIdBytes = this.constructor.utils.int32ToBytes(this._rGroupId)
-	}
+  set fee(fee) {
+    this._fee = fee * QORT_DECIMALS;
+    this._feeBytes = this.constructor.utils.int64ToBytes(this._fee);
+  }
 
-	set recipient(recipient) {
-		this._recipient = recipient instanceof Uint8Array ? recipient : this.constructor.Base58.decode(recipient)
-		this.theRecipient = recipient
-	}
-
-	set fee(fee) {
-		this._fee = fee * QORT_DECIMALS
-		this._feeBytes = this.constructor.utils.int64ToBytes(this._fee)
-	}
-
-	get params() {
-		const params = super.params
-		params.push(
-			this._rGroupIdBytes,
-			this._recipient,
-			this._feeBytes
-		)
-		return params
-	}
+  get params() {
+    const params = super.params;
+    params.push(this._rGroupIdBytes, this._recipient, this._feeBytes);
+    return params;
+  }
 }
diff --git a/src/transactions/RemoveRewardShareTransaction.ts b/src/transactions/RemoveRewardShareTransaction.ts
index 375711a..c91d389 100644
--- a/src/transactions/RemoveRewardShareTransaction.ts
+++ b/src/transactions/RemoveRewardShareTransaction.ts
@@ -1,46 +1,50 @@
 // @ts-nocheck
 
-import { DYNAMIC_FEE_TIMESTAMP } from "../constants/constants"
-import Base58 from "../deps/Base58"
-import publicKeyToAddress from "../utils/generateWallet/publicKeyToAddress"
-import TransactionBase from "./TransactionBase"
-
-
+import { DYNAMIC_FEE_TIMESTAMP } from '../constants/constants';
+import Base58 from '../deps/Base58';
+import publicKeyToAddress from '../utils/generateWallet/publicKeyToAddress';
+import TransactionBase from './TransactionBase';
 export default class RemoveRewardShareTransaction extends TransactionBase {
-	constructor() {
-		super()
-		this.type = 38
-	}
+  constructor() {
+    super();
+    this.type = 38;
+  }
 
+  set rewardShareKeyPairPublicKey(rewardShareKeyPairPublicKey) {
+    this._rewardShareKeyPairPublicKey = Base58.decode(
+      rewardShareKeyPairPublicKey
+    );
+  }
 
-	set rewardShareKeyPairPublicKey(rewardShareKeyPairPublicKey) {
-		this._rewardShareKeyPairPublicKey = Base58.decode(rewardShareKeyPairPublicKey)
-	}
+  set recipient(recipient) {
+    const _address = publicKeyToAddress(this._keyPair.publicKey);
+    this._recipient =
+      recipient instanceof Uint8Array
+        ? recipient
+        : this.constructor.Base58.decode(recipient);
 
-	set recipient(recipient) {
-		const _address = publicKeyToAddress(this._keyPair.publicKey)
-		this._recipient = recipient instanceof Uint8Array ? recipient : this.constructor.Base58.decode(recipient)
+    if (new Date(this._timestamp).getTime() >= DYNAMIC_FEE_TIMESTAMP) {
+      this.fee = _address === recipient ? 0 : 0.01;
+    } else {
+      this.fee = _address === recipient ? 0 : 0.001;
+    }
+  }
 
-		if (new Date(this._timestamp).getTime() >= DYNAMIC_FEE_TIMESTAMP) {
-			this.fee = _address === recipient ? 0 : 0.01
-		} else {
-			this.fee = _address === recipient ? 0 : 0.001
-		}
-	}
+  set percentageShare(share) {
+    this._percentageShare = share * 100;
+    this._percentageShareBytes = this.constructor.utils.int64ToBytes(
+      this._percentageShare
+    );
+  }
 
-	set percentageShare(share) {
-		this._percentageShare = share * 100
-		this._percentageShareBytes = this.constructor.utils.int64ToBytes(this._percentageShare)
-	}
-
-	get params() {
-		const params = super.params
-		params.push(
-			this._recipient,
-			this._rewardShareKeyPairPublicKey,
-			this._percentageShareBytes,
-			this._feeBytes
-		)
-		return params
-	}
+  get params() {
+    const params = super.params;
+    params.push(
+      this._recipient,
+      this._rewardShareKeyPairPublicKey,
+      this._percentageShareBytes,
+      this._feeBytes
+    );
+    return params;
+  }
 }
diff --git a/src/transactions/RewardShareTransaction.ts b/src/transactions/RewardShareTransaction.ts
index 8419432..67131b3 100644
--- a/src/transactions/RewardShareTransaction.ts
+++ b/src/transactions/RewardShareTransaction.ts
@@ -1,60 +1,86 @@
 // @ts-nocheck
 
-import TransactionBase from './TransactionBase'
-
-import { Sha256 } from 'asmcrypto.js'
-import nacl from '../deps/nacl-fast'
-import ed2curve from '../deps/ed2curve'
-import { DYNAMIC_FEE_TIMESTAMP } from '../constants/constants'
-import publicKeyToAddress from '../utils/generateWallet/publicKeyToAddress'
-
+import TransactionBase from './TransactionBase';
+import { Sha256 } from 'asmcrypto.js';
+import nacl from '../deps/nacl-fast';
+import ed2curve from '../deps/ed2curve';
+import { DYNAMIC_FEE_TIMESTAMP } from '../constants/constants';
+import publicKeyToAddress from '../utils/generateWallet/publicKeyToAddress';
 export default class RewardShareTransaction extends TransactionBase {
-	constructor() {
-		super()
-		this.type = 38
-	}
+  constructor() {
+    super();
+    this.type = 38;
+  }
 
+  set recipientPublicKey(recipientPublicKey) {
+    this._base58RecipientPublicKey =
+      recipientPublicKey instanceof Uint8Array
+        ? this.constructor.Base58.encode(recipientPublicKey)
+        : recipientPublicKey;
+    this._recipientPublicKey = this.constructor.Base58.decode(
+      this._base58RecipientPublicKey
+    );
+    this.recipient = publicKeyToAddress(this._recipientPublicKey);
 
+    const convertedPrivateKey = ed2curve.convertSecretKey(
+      this._keyPair.privateKey
+    );
+    const convertedPublicKey = ed2curve.convertPublicKey(
+      this._recipientPublicKey
+    );
+    const sharedSecret = new Uint8Array(32);
 
-	set recipientPublicKey(recipientPublicKey) {
-		this._base58RecipientPublicKey = recipientPublicKey instanceof Uint8Array ? this.constructor.Base58.encode(recipientPublicKey) : recipientPublicKey
-		this._recipientPublicKey = this.constructor.Base58.decode(this._base58RecipientPublicKey)
-		this.recipient = publicKeyToAddress(this._recipientPublicKey)
+    nacl.lowlevel.crypto_scalarmult(
+      sharedSecret,
+      convertedPrivateKey,
+      convertedPublicKey
+    );
 
-		const convertedPrivateKey = ed2curve.convertSecretKey(this._keyPair.privateKey)
-		const convertedPublicKey = ed2curve.convertPublicKey(this._recipientPublicKey)
-		const sharedSecret = new Uint8Array(32)
+    this._rewardShareSeed = new Sha256().process(sharedSecret).finish().result;
+    this._base58RewardShareSeed = this.constructor.Base58.encode(
+      this._rewardShareSeed
+    );
+    this._rewardShareKeyPair = nacl.sign.keyPair.fromSeed(
+      this._rewardShareSeed
+    );
 
-		nacl.lowlevel.crypto_scalarmult(sharedSecret, convertedPrivateKey, convertedPublicKey)
+    if (new Date(this._timestamp).getTime() >= DYNAMIC_FEE_TIMESTAMP) {
+      this.fee =
+        recipientPublicKey ===
+        this.constructor.Base58.encode(this._keyPair.publicKey)
+          ? 0
+          : 0.01;
+    } else {
+      this.fee =
+        recipientPublicKey ===
+        this.constructor.Base58.encode(this._keyPair.publicKey)
+          ? 0
+          : 0.001;
+    }
+  }
 
-		this._rewardShareSeed = new Sha256().process(sharedSecret).finish().result
-		this._base58RewardShareSeed = this.constructor.Base58.encode(this._rewardShareSeed)
-		this._rewardShareKeyPair = nacl.sign.keyPair.fromSeed(this._rewardShareSeed)
+  set recipient(recipient) {
+    this._recipient =
+      recipient instanceof Uint8Array
+        ? recipient
+        : this.constructor.Base58.decode(recipient);
+  }
 
-		if (new Date(this._timestamp).getTime() >= DYNAMIC_FEE_TIMESTAMP) {
-			this.fee = (recipientPublicKey === this.constructor.Base58.encode(this._keyPair.publicKey) ? 0 : 0.01)
-		} else {
-			this.fee = (recipientPublicKey === this.constructor.Base58.encode(this._keyPair.publicKey) ? 0 : 0.001)
-		}
-	}
+  set percentageShare(share) {
+    this._percentageShare = share * 100;
+    this._percentageShareBytes = this.constructor.utils.int64ToBytes(
+      this._percentageShare
+    );
+  }
 
-	set recipient(recipient) {
-		this._recipient = recipient instanceof Uint8Array ? recipient : this.constructor.Base58.decode(recipient)
-	}
-
-	set percentageShare(share) {
-		this._percentageShare = share * 100
-		this._percentageShareBytes = this.constructor.utils.int64ToBytes(this._percentageShare)
-	}
-
-	get params() {
-		const params = super.params
-		params.push(
-			this._recipient,
-			this._rewardShareKeyPair.publicKey,
-			this._percentageShareBytes,
-			this._feeBytes
-		)
-		return params
-	}
+  get params() {
+    const params = super.params;
+    params.push(
+      this._recipient,
+      this._rewardShareKeyPair.publicKey,
+      this._percentageShareBytes,
+      this._feeBytes
+    );
+    return params;
+  }
 }
diff --git a/src/transactions/SellNameTransacion.ts b/src/transactions/SellNameTransacion.ts
index 3926568..2e5f15e 100644
--- a/src/transactions/SellNameTransacion.ts
+++ b/src/transactions/SellNameTransacion.ts
@@ -1,40 +1,40 @@
 // @ts-nocheck
 
-import { QORT_DECIMALS } from "../constants/constants"
-import TransactionBase from "./TransactionBase"
-
-
+import { QORT_DECIMALS } from '../constants/constants';
+import TransactionBase from './TransactionBase';
 export default class SellNameTransacion extends TransactionBase {
-	constructor() {
-		super()
-		this.type = 5
-	}
+  constructor() {
+    super();
+    this.type = 5;
+  }
 
-	set fee(fee) {
-		this._fee = fee * QORT_DECIMALS
-		this._feeBytes = this.constructor.utils.int64ToBytes(this._fee)
-	}
+  set fee(fee) {
+    this._fee = fee * QORT_DECIMALS;
+    this._feeBytes = this.constructor.utils.int64ToBytes(this._fee);
+  }
 
-	set name(name) {
-		this.nameText = name
-		this._nameBytes = this.constructor.utils.stringtoUTF8Array(name)
-		this._nameLength = this.constructor.utils.int32ToBytes(this._nameBytes.length)
-	}
+  set name(name) {
+    this.nameText = name;
+    this._nameBytes = this.constructor.utils.stringtoUTF8Array(name);
+    this._nameLength = this.constructor.utils.int32ToBytes(
+      this._nameBytes.length
+    );
+  }
 
-	set sellPrice(sellPrice) {
-		this.showSellPrice = sellPrice
-		this._sellPrice = sellPrice * QORT_DECIMALS
-		this._sellPriceBytes = this.constructor.utils.int64ToBytes(this._sellPrice)
-	}
+  set sellPrice(sellPrice) {
+    this.showSellPrice = sellPrice;
+    this._sellPrice = sellPrice * QORT_DECIMALS;
+    this._sellPriceBytes = this.constructor.utils.int64ToBytes(this._sellPrice);
+  }
 
-	get params() {
-		const params = super.params
-		params.push(
-			this._nameLength,
-			this._nameBytes,
-			this._sellPriceBytes,
-			this._feeBytes
-		)
-		return params
-	}
+  get params() {
+    const params = super.params;
+    params.push(
+      this._nameLength,
+      this._nameBytes,
+      this._sellPriceBytes,
+      this._feeBytes
+    );
+    return params;
+  }
 }
diff --git a/src/transactions/TradeBotCreateRequest.ts b/src/transactions/TradeBotCreateRequest.ts
index 800ddec..fbdcdb5 100644
--- a/src/transactions/TradeBotCreateRequest.ts
+++ b/src/transactions/TradeBotCreateRequest.ts
@@ -2,64 +2,64 @@
 
 /**
  * CrossChain - TradeBot Create Request (Sell Action)
- * 
+ *
  * These are special types of transactions (JSON ENCODED)
  */
 
 export default class TradeBotCreateRequest {
-	constructor() {
-		// ...
-	}
+  constructor() {
+    // ...
+  }
 
-	createTransaction(txnReq) {
-		this.creatorPublicKey(txnReq.creatorPublicKey)
-		this.qortAmount(txnReq.qortAmount)
-		this.fundingQortAmount(txnReq.fundingQortAmount)
-		this.foreignBlockchain(txnReq.foreignBlockchain)
-		this.foreignAmount(txnReq.foreignAmount)
-		this.tradeTimeout(txnReq.tradeTimeout)
-		this.receivingAddress(txnReq.receivingAddress)
+  createTransaction(txnReq) {
+    this.creatorPublicKey(txnReq.creatorPublicKey);
+    this.qortAmount(txnReq.qortAmount);
+    this.fundingQortAmount(txnReq.fundingQortAmount);
+    this.foreignBlockchain(txnReq.foreignBlockchain);
+    this.foreignAmount(txnReq.foreignAmount);
+    this.tradeTimeout(txnReq.tradeTimeout);
+    this.receivingAddress(txnReq.receivingAddress);
 
-		return this.txnRequest()
-	}
+    return this.txnRequest();
+  }
 
-	creatorPublicKey(creatorPublicKey) {
-		this._creatorPublicKey = creatorPublicKey
-	}
+  creatorPublicKey(creatorPublicKey) {
+    this._creatorPublicKey = creatorPublicKey;
+  }
 
-	qortAmount(qortAmount) {
-		this._qortAmount = qortAmount
-	}
+  qortAmount(qortAmount) {
+    this._qortAmount = qortAmount;
+  }
 
-	fundingQortAmount(fundingQortAmount) {
-		this._fundingQortAmount = fundingQortAmount
-	}
+  fundingQortAmount(fundingQortAmount) {
+    this._fundingQortAmount = fundingQortAmount;
+  }
 
-	foreignBlockchain(foreignBlockchain) {
-		this._foreignBlockchain = foreignBlockchain
-	}
+  foreignBlockchain(foreignBlockchain) {
+    this._foreignBlockchain = foreignBlockchain;
+  }
 
-	foreignAmount(foreignAmount) {
-		this._foreignAmount = foreignAmount
-	}
+  foreignAmount(foreignAmount) {
+    this._foreignAmount = foreignAmount;
+  }
 
-	tradeTimeout(tradeTimeout) {
-		this._tradeTimeout = tradeTimeout
-	}
+  tradeTimeout(tradeTimeout) {
+    this._tradeTimeout = tradeTimeout;
+  }
 
-	receivingAddress(receivingAddress) {
-		this._receivingAddress = receivingAddress
-	}
+  receivingAddress(receivingAddress) {
+    this._receivingAddress = receivingAddress;
+  }
 
-	txnRequest() {
-		return {
-			creatorPublicKey: this._creatorPublicKey,
-			qortAmount: this._qortAmount,
-			fundingQortAmount: this._fundingQortAmount,
-			foreignBlockchain: this._foreignBlockchain,
-			foreignAmount: this._foreignAmount,
-			tradeTimeout: this._tradeTimeout,
-			receivingAddress: this._receivingAddress
-		}
-	}
+  txnRequest() {
+    return {
+      creatorPublicKey: this._creatorPublicKey,
+      qortAmount: this._qortAmount,
+      fundingQortAmount: this._fundingQortAmount,
+      foreignBlockchain: this._foreignBlockchain,
+      foreignAmount: this._foreignAmount,
+      tradeTimeout: this._tradeTimeout,
+      receivingAddress: this._receivingAddress,
+    };
+  }
 }
diff --git a/src/transactions/TradeBotDeleteRequest.ts b/src/transactions/TradeBotDeleteRequest.ts
index cd3c1b4..1e4a69d 100644
--- a/src/transactions/TradeBotDeleteRequest.ts
+++ b/src/transactions/TradeBotDeleteRequest.ts
@@ -1,35 +1,35 @@
 // @ts-nocheck
 
 /**
- * CrossChain - DELETE TradeOffer 
- * 
+ * CrossChain - DELETE TradeOffer
+ *
  * These are special types of transactions (JSON ENCODED)
  */
 
 export default class DeleteTradeOffer {
-	constructor() {
-		// ...
-	}
+  constructor() {
+    // ...
+  }
 
-	createTransaction(txnReq) {
-		this.creatorPublicKey(txnReq.creatorPublicKey)
-		this.atAddress(txnReq.atAddress)
+  createTransaction(txnReq) {
+    this.creatorPublicKey(txnReq.creatorPublicKey);
+    this.atAddress(txnReq.atAddress);
 
-		return this.txnRequest()
-	}
+    return this.txnRequest();
+  }
 
-	creatorPublicKey(creatorPublicKey) {
-		this._creatorPublicKey = creatorPublicKey
-	}
+  creatorPublicKey(creatorPublicKey) {
+    this._creatorPublicKey = creatorPublicKey;
+  }
 
-	atAddress(atAddress) {
-		this._atAddress = atAddress
-	}
+  atAddress(atAddress) {
+    this._atAddress = atAddress;
+  }
 
-	txnRequest() {
-		return {
-			creatorPublicKey: this._creatorPublicKey,
-			atAddress: this._atAddress
-		}
-	}
+  txnRequest() {
+    return {
+      creatorPublicKey: this._creatorPublicKey,
+      atAddress: this._atAddress,
+    };
+  }
 }
diff --git a/src/transactions/TradeBotRespondMultipleRequest.ts b/src/transactions/TradeBotRespondMultipleRequest.ts
index a7eb4d8..da3b93e 100644
--- a/src/transactions/TradeBotRespondMultipleRequest.ts
+++ b/src/transactions/TradeBotRespondMultipleRequest.ts
@@ -7,36 +7,35 @@
  */
 
 export class TradeBotRespondMultipleRequest {
-	constructor() {
-		// ...
-	}
+  constructor() {
+    // ...
+  }
 
-	createTransaction(txnReq) {
-		this.addresses(txnReq.addresses)
-		this.foreignKey(txnReq.foreignKey)
-		this.receivingAddress(txnReq.receivingAddress)
+  createTransaction(txnReq) {
+    this.addresses(txnReq.addresses);
+    this.foreignKey(txnReq.foreignKey);
+    this.receivingAddress(txnReq.receivingAddress);
 
-		return this.txnRequest()
-	}
+    return this.txnRequest();
+  }
 
-	addresses(addresses) {
-		this._addresses = addresses
-	}
+  addresses(addresses) {
+    this._addresses = addresses;
+  }
 
-	foreignKey(foreignKey) {
-		this._foreignKey = foreignKey
-	}
+  foreignKey(foreignKey) {
+    this._foreignKey = foreignKey;
+  }
 
-	receivingAddress(receivingAddress) {
-		this._receivingAddress = receivingAddress
-	}
+  receivingAddress(receivingAddress) {
+    this._receivingAddress = receivingAddress;
+  }
 
-	txnRequest() {
-		return {
-			addresses: this._addresses,
-			foreignKey: this._foreignKey,
-			receivingAddress: this._receivingAddress
-		}
-	}
+  txnRequest() {
+    return {
+      addresses: this._addresses,
+      foreignKey: this._foreignKey,
+      receivingAddress: this._receivingAddress,
+    };
+  }
 }
-
diff --git a/src/transactions/TradeBotRespondRequest.ts b/src/transactions/TradeBotRespondRequest.ts
index fcd1af5..76f548a 100644
--- a/src/transactions/TradeBotRespondRequest.ts
+++ b/src/transactions/TradeBotRespondRequest.ts
@@ -2,40 +2,40 @@
 
 /**
  * CrossChain - TradeBot Respond Request (Buy Action)
- * 
+ *
  * These are special types of transactions (JSON ENCODED)
  */
 
 export default class TradeBotRespondRequest {
-	constructor() {
-		// ...
-	}
+  constructor() {
+    // ...
+  }
 
-	createTransaction(txnReq) {
-		this.atAddress(txnReq.atAddress)
-		this.foreignKey(txnReq.foreignKey)
-		this.receivingAddress(txnReq.receivingAddress)
+  createTransaction(txnReq) {
+    this.atAddress(txnReq.atAddress);
+    this.foreignKey(txnReq.foreignKey);
+    this.receivingAddress(txnReq.receivingAddress);
 
-		return this.txnRequest()
-	}
+    return this.txnRequest();
+  }
 
-	atAddress(atAddress) {
-		this._atAddress = atAddress
-	}
+  atAddress(atAddress) {
+    this._atAddress = atAddress;
+  }
 
-	foreignKey(foreignKey) {
-		this._foreignKey = foreignKey
-	}
+  foreignKey(foreignKey) {
+    this._foreignKey = foreignKey;
+  }
 
-	receivingAddress(receivingAddress) {
-		this._receivingAddress = receivingAddress
-	}
+  receivingAddress(receivingAddress) {
+    this._receivingAddress = receivingAddress;
+  }
 
-	txnRequest() {
-		return {
-			atAddress: this._atAddress,
-			foreignKey: this._foreignKey,
-			receivingAddress: this._receivingAddress
-		}
-	}
+  txnRequest() {
+    return {
+      atAddress: this._atAddress,
+      foreignKey: this._foreignKey,
+      receivingAddress: this._receivingAddress,
+    };
+  }
 }
diff --git a/src/transactions/TransactionBase.ts b/src/transactions/TransactionBase.ts
index ca9e7ea..055a08b 100644
--- a/src/transactions/TransactionBase.ts
+++ b/src/transactions/TransactionBase.ts
@@ -1,165 +1,188 @@
 // @ts-nocheck
 
-import nacl from '../deps/nacl-fast'
-import Base58 from '../deps/Base58'
-import utils from '../utils/utils'
-import { QORT_DECIMALS, TX_TYPES } from '../constants/constants.js'
-
+import nacl from '../deps/nacl-fast';
+import Base58 from '../deps/Base58';
+import utils from '../utils/utils';
+import { QORT_DECIMALS, TX_TYPES } from '../constants/constants.js';
 export default class TransactionBase {
-	static get utils() {
-		return utils
-	}
-	static get nacl() {
-		return nacl
-	}
-	static get Base58() {
-		return Base58
-	}
+  static get utils() {
+    return utils;
+  }
+  static get nacl() {
+    return nacl;
+  }
+  static get Base58() {
+    return Base58;
+  }
 
-	constructor() {
-		this.fee = 0
-		this.groupID = 0
-		this.timestamp = Date.now()
-		this.tests = [
-			() => {
-				if (!(this._type >= 1 && this._type in TX_TYPES)) {
-					return 'Invalid type: ' + this.type
-				}
-				return true
-			},
-			() => {
-				if (this._fee < 0) {
-					return 'Invalid fee: ' + this._fee / QORT_DECIMALS
-				}
-				return true
-			},
-			() => {
-				if (this._groupID < 0 || !Number.isInteger(this._groupID)) {
-					return 'Invalid groupID: ' + this._groupID
-				}
-				return true
-			},
-			() => {
-				if (!(new Date(this._timestamp)).getTime() > 0) {
-					return 'Invalid timestamp: ' + this._timestamp
-				}
-				return true
-			},
-			() => {
-				if (!(this._lastReference instanceof Uint8Array && this._lastReference.byteLength == 64)) {
-					if (this._lastReference == 0) {
-						return 'Invalid last reference. Please ensure that you have at least 0.001 QORT for the transaction fee.'
-					}
-					return 'Invalid last reference: ' + this._lastReference
-				}
-				return true
-			},
-			() => {
-				if (!(this._keyPair)) {
-					return 'keyPair must be specified'
-				}
-				if (!(this._keyPair.publicKey instanceof Uint8Array && this._keyPair.publicKey.byteLength === 32)) {
-					return 'Invalid publicKey'
-				}
-				if (!(this._keyPair.privateKey instanceof Uint8Array && this._keyPair.privateKey.byteLength === 64)) {
-					return 'Invalid privateKey'
-				}
-				return true
-			}
-		]
-	}
+  constructor() {
+    this.fee = 0;
+    this.groupID = 0;
+    this.timestamp = Date.now();
+    this.tests = [
+      () => {
+        if (!(this._type >= 1 && this._type in TX_TYPES)) {
+          return 'Invalid type: ' + this.type;
+        }
+        return true;
+      },
+      () => {
+        if (this._fee < 0) {
+          return 'Invalid fee: ' + this._fee / QORT_DECIMALS;
+        }
+        return true;
+      },
+      () => {
+        if (this._groupID < 0 || !Number.isInteger(this._groupID)) {
+          return 'Invalid groupID: ' + this._groupID;
+        }
+        return true;
+      },
+      () => {
+        if (!new Date(this._timestamp).getTime() > 0) {
+          return 'Invalid timestamp: ' + this._timestamp;
+        }
+        return true;
+      },
+      () => {
+        if (
+          !(
+            this._lastReference instanceof Uint8Array &&
+            this._lastReference.byteLength == 64
+          )
+        ) {
+          if (this._lastReference == 0) {
+            return 'Invalid last reference. Please ensure that you have at least 0.001 QORT for the transaction fee.';
+          }
+          return 'Invalid last reference: ' + this._lastReference;
+        }
+        return true;
+      },
+      () => {
+        if (!this._keyPair) {
+          return 'keyPair must be specified';
+        }
+        if (
+          !(
+            this._keyPair.publicKey instanceof Uint8Array &&
+            this._keyPair.publicKey.byteLength === 32
+          )
+        ) {
+          return 'Invalid publicKey';
+        }
+        if (
+          !(
+            this._keyPair.privateKey instanceof Uint8Array &&
+            this._keyPair.privateKey.byteLength === 64
+          )
+        ) {
+          return 'Invalid privateKey';
+        }
+        return true;
+      },
+    ];
+  }
 
-	set keyPair(keyPair) {
-		this._keyPair = keyPair
-	}
+  set keyPair(keyPair) {
+    this._keyPair = keyPair;
+  }
 
-	set type(type) {
-		this.typeText = TX_TYPES[type]
-		this._type = type
-		this._typeBytes = this.constructor.utils.int32ToBytes(this._type)
-	}
+  set type(type) {
+    this.typeText = TX_TYPES[type];
+    this._type = type;
+    this._typeBytes = this.constructor.utils.int32ToBytes(this._type);
+  }
 
-	set groupID(groupID) {
-		this._groupID = groupID
-		this._groupIDBytes = this.constructor.utils.int32ToBytes(this._groupID)
-	}
+  set groupID(groupID) {
+    this._groupID = groupID;
+    this._groupIDBytes = this.constructor.utils.int32ToBytes(this._groupID);
+  }
 
-	set timestamp(timestamp) {
-		this._timestamp = timestamp
-		this._timestampBytes = this.constructor.utils.int64ToBytes(this._timestamp)
-	}
+  set timestamp(timestamp) {
+    this._timestamp = timestamp;
+    this._timestampBytes = this.constructor.utils.int64ToBytes(this._timestamp);
+  }
 
-	set fee(fee) {
-		this._fee = fee * QORT_DECIMALS
-		this._feeBytes = this.constructor.utils.int64ToBytes(this._fee)
-	}
+  set fee(fee) {
+    this._fee = fee * QORT_DECIMALS;
+    this._feeBytes = this.constructor.utils.int64ToBytes(this._fee);
+  }
 
-	set lastReference(lastReference) {
-		this._lastReference = lastReference instanceof Uint8Array ? lastReference : this.constructor.Base58.decode(lastReference)
-	}
+  set lastReference(lastReference) {
+    this._lastReference =
+      lastReference instanceof Uint8Array
+        ? lastReference
+        : this.constructor.Base58.decode(lastReference);
+  }
 
-	get params() {
-		return [
-			this._typeBytes,
-			this._timestampBytes,
-			this._groupIDBytes,
-			this._lastReference,
-			this._keyPair.publicKey
-		]
-	}
+  get params() {
+    return [
+      this._typeBytes,
+      this._timestampBytes,
+      this._groupIDBytes,
+      this._lastReference,
+      this._keyPair.publicKey,
+    ];
+  }
 
-	get signedBytes() {
-		if (!this._signedBytes) {
-			this.sign()
-		}
-		return this._signedBytes
-	}
+  get signedBytes() {
+    if (!this._signedBytes) {
+      this.sign();
+    }
+    return this._signedBytes;
+  }
 
-	validParams() {
-		let finalResult = {
-			valid: true
-		}
-		this.tests.some(test => {
-			const result = test()
-			if (result !== true) {
-				finalResult = {
-					valid: false,
-					message: result
-				}
-				return true // exists the loop
-			}
-		})
-		return finalResult
-	}
+  validParams() {
+    let finalResult = {
+      valid: true,
+    };
+    this.tests.some((test) => {
+      const result = test();
+      if (result !== true) {
+        finalResult = {
+          valid: false,
+          message: result,
+        };
+        return true; // exists the loop
+      }
+    });
+    return finalResult;
+  }
 
-	generateBase() {
-		const isValid = this.validParams()
-		if (!isValid.valid) {
-			throw new Error(isValid.message)
-		}
-		let result = new Uint8Array()
+  generateBase() {
+    const isValid = this.validParams();
+    if (!isValid.valid) {
+      throw new Error(isValid.message);
+    }
+    let result = new Uint8Array();
 
-		this.params.forEach(item => {
-			result = this.constructor.utils.appendBuffer(result, item)
-		})
+    this.params.forEach((item) => {
+      result = this.constructor.utils.appendBuffer(result, item);
+    });
 
-		this._base = result
-		return result
-	}
+    this._base = result;
+    return result;
+  }
 
-	sign() {
-		if (!this._keyPair) {
-			throw new Error('keyPair not defined')
-		}
+  sign() {
+    if (!this._keyPair) {
+      throw new Error('keyPair not defined');
+    }
 
-		if (!this._base) {
-			this.generateBase()
-		}
+    if (!this._base) {
+      this.generateBase();
+    }
 
-		this._signature = this.constructor.nacl.sign.detached(this._base, this._keyPair.privateKey)
+    this._signature = this.constructor.nacl.sign.detached(
+      this._base,
+      this._keyPair.privateKey
+    );
 
-		this._signedBytes = this.constructor.utils.appendBuffer(this._base, this._signature)
+    this._signedBytes = this.constructor.utils.appendBuffer(
+      this._base,
+      this._signature
+    );
 
-		return this._signature
-	}
+    return this._signature;
+  }
 }
diff --git a/src/transactions/TransferAssetTransaction.ts b/src/transactions/TransferAssetTransaction.ts
index 9d0bedb..31bc69a 100644
--- a/src/transactions/TransferAssetTransaction.ts
+++ b/src/transactions/TransferAssetTransaction.ts
@@ -1,35 +1,37 @@
 // @ts-nocheck
 
-import { QORT_DECIMALS } from '../constants/constants'
-import TransactionBase from './TransactionBase'
-
+import { QORT_DECIMALS } from '../constants/constants';
+import TransactionBase from './TransactionBase';
 export default class TransferAssetTransaction extends TransactionBase {
   constructor() {
-    super()
-    this.type = 12 
+    super();
+    this.type = 12;
   }
 
   set recipient(recipient) {
-    this._recipient = recipient instanceof Uint8Array ? recipient : this.constructor.Base58.decode(recipient)
+    this._recipient =
+      recipient instanceof Uint8Array
+        ? recipient
+        : this.constructor.Base58.decode(recipient);
   }
 
   set amount(amount) {
-    this._amount = Math.round(amount * QORT_DECIMALS)
-    this._amountBytes = this.constructor.utils.int64ToBytes(this._amount)
+    this._amount = Math.round(amount * QORT_DECIMALS);
+    this._amountBytes = this.constructor.utils.int64ToBytes(this._amount);
   }
 
   set assetId(assetId) {
-    this._assetId = this.constructor.utils.int64ToBytes(assetId)
+    this._assetId = this.constructor.utils.int64ToBytes(assetId);
   }
 
   get params() {
-    const params = super.params
+    const params = super.params;
     params.push(
       this._recipient,
       this._assetId,
       this._amountBytes,
       this._feeBytes
-    )
-    return params
+    );
+    return params;
   }
 }
diff --git a/src/transactions/UpdateGroupTransaction.ts b/src/transactions/UpdateGroupTransaction.ts
index 9d9856b..cc0ce48 100644
--- a/src/transactions/UpdateGroupTransaction.ts
+++ b/src/transactions/UpdateGroupTransaction.ts
@@ -1,62 +1,64 @@
 // @ts-nocheck
 
-
-import { QORT_DECIMALS } from "../constants/constants";
-import TransactionBase from "./TransactionBase";
-
+import { QORT_DECIMALS } from '../constants/constants';
+import TransactionBase from './TransactionBase';
 export default class UpdateGroupTransaction extends TransactionBase {
-    constructor() {
-        super()
-        this.type = 23
-    }
+  constructor() {
+    super();
+    this.type = 23;
+  }
 
+  set fee(fee) {
+    this._fee = fee * QORT_DECIMALS;
+    this._feeBytes = this.constructor.utils.int64ToBytes(this._fee);
+  }
+  set newOwner(newOwner) {
+    this._newOwner =
+      newOwner instanceof Uint8Array
+        ? newOwner
+        : this.constructor.Base58.decode(newOwner);
+  }
+  set newIsOpen(newIsOpen) {
+    this._rGroupType = new Uint8Array(1);
+    this._rGroupType[0] = newIsOpen;
+  }
+  set newDescription(newDescription) {
+    this._rGroupDescBytes = this.constructor.utils.stringtoUTF8Array(
+      newDescription.toLocaleLowerCase()
+    );
+    this._rGroupDescLength = this.constructor.utils.int32ToBytes(
+      this._rGroupDescBytes.length
+    );
+  }
+  set newApprovalThreshold(newApprovalThreshold) {
+    this._rGroupApprovalThreshold = new Uint8Array(1);
+    this._rGroupApprovalThreshold[0] = newApprovalThreshold;
+  }
+  set newMinimumBlockDelay(newMinimumBlockDelay) {
+    this._rGroupMinimumBlockDelayBytes =
+      this.constructor.utils.int32ToBytes(newMinimumBlockDelay);
+  }
+  set newMaximumBlockDelay(newMaximumBlockDelay) {
+    this._rGroupMaximumBlockDelayBytes =
+      this.constructor.utils.int32ToBytes(newMaximumBlockDelay);
+  }
 
-
-
-    set fee(fee) {
-        this._fee = fee * QORT_DECIMALS
-        this._feeBytes = this.constructor.utils.int64ToBytes(this._fee)
-    }
-    set newOwner(newOwner) {
-        this._newOwner = newOwner instanceof Uint8Array ? newOwner : this.constructor.Base58.decode(newOwner)
-    }
-    set newIsOpen(newIsOpen) {
-
-        this._rGroupType = new Uint8Array(1)
-        this._rGroupType[0] = newIsOpen
-    }
-    set newDescription(newDescription) {
-        this._rGroupDescBytes = this.constructor.utils.stringtoUTF8Array(newDescription.toLocaleLowerCase())
-        this._rGroupDescLength = this.constructor.utils.int32ToBytes(this._rGroupDescBytes.length)
-    }
-    set newApprovalThreshold(newApprovalThreshold) {
-        this._rGroupApprovalThreshold = new Uint8Array(1)
-        this._rGroupApprovalThreshold[0] = newApprovalThreshold;
-    }
-    set newMinimumBlockDelay(newMinimumBlockDelay) {
-        this._rGroupMinimumBlockDelayBytes = this.constructor.utils.int32ToBytes(newMinimumBlockDelay)
-    }
-    set newMaximumBlockDelay(newMaximumBlockDelay) {
-
-        this._rGroupMaximumBlockDelayBytes = this.constructor.utils.int32ToBytes(newMaximumBlockDelay)
-    }
-
-    set _groupId(_groupId){
-        this._groupBytes = this.constructor.utils.int32ToBytes(_groupId)
-    }
-    get params() {
-        const params = super.params
-        params.push(
-            this._groupBytes,
-            this._newOwner,
-            this._rGroupDescLength,
-            this._rGroupDescBytes,
-            this._rGroupType,
-            this._rGroupApprovalThreshold,
-            this._rGroupMinimumBlockDelayBytes,
-            this._rGroupMaximumBlockDelayBytes,
-            this._feeBytes
-        )
-        return params
-    }
-}
\ No newline at end of file
+  set _groupId(_groupId) {
+    this._groupBytes = this.constructor.utils.int32ToBytes(_groupId);
+  }
+  get params() {
+    const params = super.params;
+    params.push(
+      this._groupBytes,
+      this._newOwner,
+      this._rGroupDescLength,
+      this._rGroupDescBytes,
+      this._rGroupType,
+      this._rGroupApprovalThreshold,
+      this._rGroupMinimumBlockDelayBytes,
+      this._rGroupMaximumBlockDelayBytes,
+      this._feeBytes
+    );
+    return params;
+  }
+}
diff --git a/src/transactions/UpdateNameTransaction.ts b/src/transactions/UpdateNameTransaction.ts
index e90b388..1aee16e 100644
--- a/src/transactions/UpdateNameTransaction.ts
+++ b/src/transactions/UpdateNameTransaction.ts
@@ -1,51 +1,56 @@
 // @ts-nocheck
 
-import { QORT_DECIMALS } from "../constants/constants"
-import TransactionBase from "./TransactionBase"
-
-
+import { QORT_DECIMALS } from '../constants/constants';
+import TransactionBase from './TransactionBase';
 export default class UpdateNameTransaction extends TransactionBase {
-	constructor() {
-		super()
-		this.type = 4
-	}
+  constructor() {
+    super();
+    this.type = 4;
+  }
 
+  set fee(fee) {
+    this._fee = fee * QORT_DECIMALS;
+    this._feeBytes = this.constructor.utils.int64ToBytes(this._fee);
+  }
 
+  set name(name) {
+    this.nameText = name;
+    this._nameBytes = this.constructor.utils.stringtoUTF8Array(name);
+    this._nameLength = this.constructor.utils.int32ToBytes(
+      this._nameBytes.length
+    );
+  }
 
-	set fee(fee) {
-		this._fee = fee * QORT_DECIMALS
-		this._feeBytes = this.constructor.utils.int64ToBytes(this._fee)
-	}
+  set newName(newName) {
+    this.newNameText = newName;
+    this._newNameBytes = this.constructor.utils.stringtoUTF8Array(newName);
+    this._newNameLength = this.constructor.utils.int32ToBytes(
+      this._newNameBytes.length
+    );
+  }
 
-	set name(name) {
-		this.nameText = name
-		this._nameBytes = this.constructor.utils.stringtoUTF8Array(name)
-		this._nameLength = this.constructor.utils.int32ToBytes(this._nameBytes.length)
-	}
+  set newData(newData) {
+    this.newDataText =
+      newData.length === 0 ? 'Registered Name on the Qortal Chain' : newData;
+    this._newDataBytes = this.constructor.utils.stringtoUTF8Array(
+      this.newDataText
+    );
+    this._newDataLength = this.constructor.utils.int32ToBytes(
+      this._newDataBytes.length
+    );
+  }
 
-	set newName(newName) {
-		this.newNameText = newName
-		this._newNameBytes = this.constructor.utils.stringtoUTF8Array(newName)
-		this._newNameLength = this.constructor.utils.int32ToBytes(this._newNameBytes.length)
-	}
-
-	set newData(newData) {
-		this.newDataText = newData.length === 0 ? "Registered Name on the Qortal Chain" : newData
-		this._newDataBytes = this.constructor.utils.stringtoUTF8Array(this.newDataText)
-		this._newDataLength = this.constructor.utils.int32ToBytes(this._newDataBytes.length)
-	}
-
-	get params() {
-		const params = super.params
-		params.push(
-			this._nameLength,
-			this._nameBytes,
-			this._newNameLength,
-			this._newNameBytes,
-			this._newDataLength,
-			this._newDataBytes,
-			this._feeBytes
-		)
-		return params
-	}
+  get params() {
+    const params = super.params;
+    params.push(
+      this._nameLength,
+      this._nameBytes,
+      this._newNameLength,
+      this._newNameBytes,
+      this._newDataLength,
+      this._newDataBytes,
+      this._feeBytes
+    );
+    return params;
+  }
 }
diff --git a/src/transactions/VoteOnPollTransaction.ts b/src/transactions/VoteOnPollTransaction.ts
index 327295e..5b37163 100644
--- a/src/transactions/VoteOnPollTransaction.ts
+++ b/src/transactions/VoteOnPollTransaction.ts
@@ -1,38 +1,42 @@
 // @ts-nocheck
-import { QORT_DECIMALS } from '../constants/constants'
-import TransactionBase from './TransactionBase'
-
+import { QORT_DECIMALS } from '../constants/constants';
+import TransactionBase from './TransactionBase';
 export default class VoteOnPollTransaction extends TransactionBase {
-	constructor() {
-		super()
-		this.type = 9
-	}
+  constructor() {
+    super();
+    this.type = 9;
+  }
 
+  set fee(fee) {
+    this._fee = fee * QORT_DECIMALS;
+    this._feeBytes = this.constructor.utils.int64ToBytes(this._fee);
+  }
 
-	set fee(fee) {
-		this._fee = fee * QORT_DECIMALS
-		this._feeBytes = this.constructor.utils.int64ToBytes(this._fee)
-	}
+  set rPollName(rPollName) {
+    this._rPollName = rPollName;
+    this._rPollNameBytes = this.constructor.utils.stringtoUTF8Array(
+      this._rPollName
+    );
+    this._rPollNameLength = this.constructor.utils.int32ToBytes(
+      this._rPollNameBytes.length
+    );
+  }
 
-	set rPollName(rPollName) {
-		this._rPollName = rPollName
-		this._rPollNameBytes = this.constructor.utils.stringtoUTF8Array(this._rPollName)
-		this._rPollNameLength = this.constructor.utils.int32ToBytes(this._rPollNameBytes.length)
-	}
+  set rOptionIndex(rOptionIndex) {
+    this._rOptionIndex = rOptionIndex;
+    this._rOptionIndexBytes = this.constructor.utils.int32ToBytes(
+      this._rOptionIndex
+    );
+  }
 
-	set rOptionIndex(rOptionIndex) {
-		this._rOptionIndex = rOptionIndex
-		this._rOptionIndexBytes = this.constructor.utils.int32ToBytes(this._rOptionIndex)
-	}
-
-	get params() {
-		const params = super.params
-		params.push(
-			this._rPollNameLength,
-			this._rPollNameBytes,
-			this._rOptionIndexBytes,
-			this._feeBytes
-		)
-		return params
-	}
+  get params() {
+    const params = super.params;
+    params.push(
+      this._rPollNameLength,
+      this._rPollNameBytes,
+      this._rOptionIndexBytes,
+      this._feeBytes
+    );
+    return params;
+  }
 }
diff --git a/src/transactions/signChat.ts b/src/transactions/signChat.ts
index 8814c2a..5995128 100644
--- a/src/transactions/signChat.ts
+++ b/src/transactions/signChat.ts
@@ -1,39 +1,40 @@
 // @ts-nocheck
 
-import nacl from '../deps/nacl-fast'
-import utils from '../utils/utils'
+import nacl from '../deps/nacl-fast';
+import utils from '../utils/utils';
 
 export const signChat = (chatBytes, nonce, keyPair) => {
-	if (!chatBytes) {
-		throw new Error('Chat Bytes not defined')
-	}
+  if (!chatBytes) {
+    throw new Error('Chat Bytes not defined');
+  }
 
-	if (!nonce) {
-		throw new Error('Nonce not defined')
-	}
+  if (!nonce) {
+    throw new Error('Nonce not defined');
+  }
 
-	if (!keyPair) {
-		throw new Error('keyPair not defined')
-	}
+  if (!keyPair) {
+    throw new Error('keyPair not defined');
+  }
 
-	const _nonce = utils.int32ToBytes(nonce)
+  const _nonce = utils.int32ToBytes(nonce);
 
-	if (chatBytes.length === undefined) {
-		const _chatBytesBuffer = Object.keys(chatBytes).map(function (key) { return chatBytes[key]; })
+  if (chatBytes.length === undefined) {
+    const _chatBytesBuffer = Object.keys(chatBytes).map(function (key) {
+      return chatBytes[key];
+    });
 
-		const chatBytesBuffer = new Uint8Array(_chatBytesBuffer)
-		chatBytesBuffer.set(_nonce, 112)
+    const chatBytesBuffer = new Uint8Array(_chatBytesBuffer);
+    chatBytesBuffer.set(_nonce, 112);
 
-		const signature = nacl.sign.detached(chatBytesBuffer, keyPair.privateKey)
+    const signature = nacl.sign.detached(chatBytesBuffer, keyPair.privateKey);
 
-		return utils.appendBuffer(chatBytesBuffer, signature)
-	} else {
-		const chatBytesBuffer = new Uint8Array(chatBytes)
-		chatBytesBuffer.set(_nonce, 112)
+    return utils.appendBuffer(chatBytesBuffer, signature);
+  } else {
+    const chatBytesBuffer = new Uint8Array(chatBytes);
+    chatBytesBuffer.set(_nonce, 112);
 
-		const signature = nacl.sign.detached(chatBytesBuffer, keyPair.privateKey)
-
-		return utils.appendBuffer(chatBytesBuffer, signature)
-	}
-}
+    const signature = nacl.sign.detached(chatBytesBuffer, keyPair.privateKey);
 
+    return utils.appendBuffer(chatBytesBuffer, signature);
+  }
+};
diff --git a/src/transactions/signTradeBotTransaction.ts b/src/transactions/signTradeBotTransaction.ts
index 929898f..31b7430 100644
--- a/src/transactions/signTradeBotTransaction.ts
+++ b/src/transactions/signTradeBotTransaction.ts
@@ -1,30 +1,31 @@
 // @ts-nocheck
 
-
-import nacl from '../deps/nacl-fast'
-import Base58 from '../deps/Base58'
-import utils from '../utils/utils'
+import nacl from '../deps/nacl-fast';
+import Base58 from '../deps/Base58';
+import utils from '../utils/utils';
 
 const signTradeBotTransaction = async (unsignedTxn, keyPair) => {
-	if (!unsignedTxn) {
-		throw new Error('Unsigned Transaction Bytes not defined')
-	}
+  if (!unsignedTxn) {
+    throw new Error('Unsigned Transaction Bytes not defined');
+  }
 
-	if (!keyPair) {
-		throw new Error('keyPair not defined')
-	}
+  if (!keyPair) {
+    throw new Error('keyPair not defined');
+  }
 
-	const txnBuffer = Base58.decode(unsignedTxn)
+  const txnBuffer = Base58.decode(unsignedTxn);
 
-	if (keyPair.privateKey.length === undefined) {
-		const _privateKey = Object.keys(keyPair.privateKey).map(function (key) { return keyPair.privateKey[key] })
-		const privateKey = new Uint8Array(_privateKey)
-		const signature = nacl.sign.detached(txnBuffer, privateKey)
-		return utils.appendBuffer(txnBuffer, signature)
-	} else {
-		const signature = nacl.sign.detached(txnBuffer, keyPair.privateKey)
-		return utils.appendBuffer(txnBuffer, signature)
-	}
-}
+  if (keyPair.privateKey.length === undefined) {
+    const _privateKey = Object.keys(keyPair.privateKey).map(function (key) {
+      return keyPair.privateKey[key];
+    });
+    const privateKey = new Uint8Array(_privateKey);
+    const signature = nacl.sign.detached(txnBuffer, privateKey);
+    return utils.appendBuffer(txnBuffer, signature);
+  } else {
+    const signature = nacl.sign.detached(txnBuffer, keyPair.privateKey);
+    return utils.appendBuffer(txnBuffer, signature);
+  }
+};
 
-export default signTradeBotTransaction
+export default signTradeBotTransaction;
diff --git a/src/transactions/transactions.ts b/src/transactions/transactions.ts
index a117560..816e2b6 100644
--- a/src/transactions/transactions.ts
+++ b/src/transactions/transactions.ts
@@ -1,68 +1,65 @@
 // @ts-nocheck
 
-import PaymentTransaction from './PaymentTransaction.js'
-import ChatTransaction from './ChatTransaction.js'
-import GroupChatTransaction from './GroupChatTransaction.js'
-import GroupInviteTransaction from './GroupInviteTransaction.js'
-import CancelGroupInviteTransaction from './CancelGroupInviteTransaction.js'
-import GroupKickTransaction from './GroupKickTransaction.js'
-import GroupBanTransaction from './GroupBanTransaction.js'
-import CancelGroupBanTransaction from './CancelGroupBanTransaction.js'
-import CreateGroupTransaction from './CreateGroupTransaction.js'
-import LeaveGroupTransaction from './LeaveGroupTransaction.js'
-import JoinGroupTransaction from './JoinGroupTransaction.js'
-import AddGroupAdminTransaction from './AddGroupAdminTransaction.js'
-import RemoveGroupAdminTransaction from './RemoveGroupAdminTransaction.js'
-import RegisterNameTransaction from './RegisterNameTransaction.js'
-import VoteOnPollTransaction from './VoteOnPollTransaction.js'
-import CreatePollTransaction from './CreatePollTransaction.js'
-import DeployAtTransaction from './DeployAtTransaction.js'
-import RewardShareTransaction from './RewardShareTransaction.js'
-import RemoveRewardShareTransaction from './RemoveRewardShareTransaction.js'
-import UpdateNameTransaction from './UpdateNameTransaction.js'
-import UpdateGroupTransaction from './UpdateGroupTransaction.js'
-import SellNameTransacion from './SellNameTransacion.js'
-import CancelSellNameTransacion from './CancelSellNameTransacion.js'
-import BuyNameTransacion from './BuyNameTransacion.js'
-import TransferAssetTransaction from './TransferAssetTransaction.js'
-
+import PaymentTransaction from './PaymentTransaction.js';
+import ChatTransaction from './ChatTransaction.js';
+import GroupChatTransaction from './GroupChatTransaction.js';
+import GroupInviteTransaction from './GroupInviteTransaction.js';
+import CancelGroupInviteTransaction from './CancelGroupInviteTransaction.js';
+import GroupKickTransaction from './GroupKickTransaction.js';
+import GroupBanTransaction from './GroupBanTransaction.js';
+import CancelGroupBanTransaction from './CancelGroupBanTransaction.js';
+import CreateGroupTransaction from './CreateGroupTransaction.js';
+import LeaveGroupTransaction from './LeaveGroupTransaction.js';
+import JoinGroupTransaction from './JoinGroupTransaction.js';
+import AddGroupAdminTransaction from './AddGroupAdminTransaction.js';
+import RemoveGroupAdminTransaction from './RemoveGroupAdminTransaction.js';
+import RegisterNameTransaction from './RegisterNameTransaction.js';
+import VoteOnPollTransaction from './VoteOnPollTransaction.js';
+import CreatePollTransaction from './CreatePollTransaction.js';
+import DeployAtTransaction from './DeployAtTransaction.js';
+import RewardShareTransaction from './RewardShareTransaction.js';
+import RemoveRewardShareTransaction from './RemoveRewardShareTransaction.js';
+import UpdateNameTransaction from './UpdateNameTransaction.js';
+import UpdateGroupTransaction from './UpdateGroupTransaction.js';
+import SellNameTransacion from './SellNameTransacion.js';
+import CancelSellNameTransacion from './CancelSellNameTransacion.js';
+import BuyNameTransacion from './BuyNameTransacion.js';
+import TransferAssetTransaction from './TransferAssetTransaction.js';
 
 export const transactionTypes = {
-	2: PaymentTransaction,
-	3: RegisterNameTransaction,
-	4: UpdateNameTransaction,
-	5: SellNameTransacion,
-	6: CancelSellNameTransacion,
-	7: BuyNameTransacion,
-	8: CreatePollTransaction,
-	9: VoteOnPollTransaction,
-	12: TransferAssetTransaction,
-	16: DeployAtTransaction,
-	18: ChatTransaction,
-	181: GroupChatTransaction,
-	22: CreateGroupTransaction,
-	23: UpdateGroupTransaction,
-	24: AddGroupAdminTransaction,
-	25: RemoveGroupAdminTransaction,
-	26: GroupBanTransaction,
-	27: CancelGroupBanTransaction,
-	28: GroupKickTransaction,
-	29: GroupInviteTransaction,
-	30: CancelGroupInviteTransaction,
-	31: JoinGroupTransaction,
-	32: LeaveGroupTransaction,
-	38: RewardShareTransaction,
-	381: RemoveRewardShareTransaction
-}
-
+  2: PaymentTransaction,
+  3: RegisterNameTransaction,
+  4: UpdateNameTransaction,
+  5: SellNameTransacion,
+  6: CancelSellNameTransacion,
+  7: BuyNameTransacion,
+  8: CreatePollTransaction,
+  9: VoteOnPollTransaction,
+  12: TransferAssetTransaction,
+  16: DeployAtTransaction,
+  18: ChatTransaction,
+  181: GroupChatTransaction,
+  22: CreateGroupTransaction,
+  23: UpdateGroupTransaction,
+  24: AddGroupAdminTransaction,
+  25: RemoveGroupAdminTransaction,
+  26: GroupBanTransaction,
+  27: CancelGroupBanTransaction,
+  28: GroupKickTransaction,
+  29: GroupInviteTransaction,
+  30: CancelGroupInviteTransaction,
+  31: JoinGroupTransaction,
+  32: LeaveGroupTransaction,
+  38: RewardShareTransaction,
+  381: RemoveRewardShareTransaction,
+};
 
 export const createTransaction = (type, keyPair, params) => {
-	const tx = new transactionTypes[type]()
-	tx.keyPair = keyPair
-	Object.keys(params).forEach(param => {
-	
-		tx[param] = params[param]
-	})
+  const tx = new transactionTypes[type]();
+  tx.keyPair = keyPair;
+  Object.keys(params).forEach((param) => {
+    tx[param] = params[param];
+  });
 
-	return tx
-}
\ No newline at end of file
+  return tx;
+};
diff --git a/src/utils/decode.ts b/src/utils/decode.ts
index ba8d87d..d457cee 100644
--- a/src/utils/decode.ts
+++ b/src/utils/decode.ts
@@ -17,7 +17,6 @@ export function decodeIfEncoded(input) {
 
 export const isValidBase64 = (str: string): boolean => {
   if (typeof str !== 'string' || str.length % 4 !== 0) return false;
-
   const base64Regex = /^[A-Za-z0-9+/]*={0,2}$/;
   return base64Regex.test(str);
 };
diff --git a/src/utils/decryptWallet.ts b/src/utils/decryptWallet.ts
index 11394a2..bf27e8a 100644
--- a/src/utils/decryptWallet.ts
+++ b/src/utils/decryptWallet.ts
@@ -4,6 +4,7 @@ import { crypto } from '../constants/decryptWallet';
 import Base58 from '../deps/Base58';
 import { AES_CBC, HmacSha512 } from 'asmcrypto.js';
 import { doInitWorkers, kdf } from '../deps/kdf';
+import i18n from 'i18next';
 
 export const decryptStoredWallet = async (password, wallet) => {
   const threads = doInitWorkers(crypto.kdfThreads);
@@ -18,7 +19,7 @@ export const decryptStoredWallet = async (password, wallet) => {
     .process(encryptedSeedBytes)
     .finish().result;
   if (Base58.encode(mac) !== wallet.mac) {
-    throw new Error('Incorrect password');
+    throw new Error(i18n.t('auth:message.error.incorrect_password')); // TODO: i18n non-react integration
   }
   const decryptedBytes = AES_CBC.decrypt(
     encryptedSeedBytes,
diff --git a/src/utils/generateWallet/generateWallet.ts b/src/utils/generateWallet/generateWallet.ts
index f05c707..ee3a683 100644
--- a/src/utils/generateWallet/generateWallet.ts
+++ b/src/utils/generateWallet/generateWallet.ts
@@ -5,119 +5,123 @@ import { doInitWorkers, kdf } from '../../deps/kdf';
 import PhraseWallet from './phrase-wallet';
 import * as WORDLISTS from './wordlists';
 import FileSaver from 'file-saver';
-
 import { Filesystem, Directory, Encoding } from '@capacitor/filesystem';
 import { mimeToExtensionMap } from '../memeTypes';
-export function generateRandomSentence(template = 'adverb verb noun adjective noun adverb verb noun adjective noun adjective verbed adjective noun', maxWordLength = 0, capitalize = true) {
-    const partsOfSpeechMap = {
-        'noun': 'nouns',
-        'adverb': 'adverbs',
-        'adv': 'adverbs',
-        'verb': 'verbs',
-        'interjection': 'interjections',
-        'adjective': 'adjectives',
-        'adj': 'adjectives',
-        'verbed': 'verbed'
-    };
 
-    let _wordlists = WORDLISTS;
-
-    function _RNG(entropy) {
-        if (entropy > 1074) {
-            throw new Error('Javascript can not handle that much entropy!');
-        }
-        let randNum = 0;
-        const crypto = window.crypto || window.msCrypto;
-
-        if (crypto) {
-            const entropy256 = Math.ceil(entropy / 8);
-            let buffer = new Uint8Array(entropy256);
-            crypto.getRandomValues(buffer);
-            randNum = buffer.reduce((num, value) => num * 256 + value, 0) / Math.pow(256, entropy256);
-        } else {
-            console.warn('Secure RNG not found. Using Math.random');
-            randNum = Math.random();
-        }
-        return randNum;
-    }
-
-    function _capitalize(str) {
-        return str.charAt(0).toUpperCase() + str.slice(1);
-    }
-
-    function getWord(partOfSpeech) {
-        let words = _wordlists[partsOfSpeechMap[partOfSpeech]];
-        if (maxWordLength) {
-            words = words.filter(word => word.length <= maxWordLength);
-        }
-        const requiredEntropy = Math.log(words.length) / Math.log(2);
-        const index = Math.floor(_RNG(requiredEntropy) * words.length);
-        return words[index];
-    }
-
-    function parse(template) {
-        return template.split(/\s+/).map(token => {
-            const match = token.match(/^(\w+)(.*)$/);
-            if (!match) return token; // No match, return original token
-
-            const [ , partOfSpeech, rest ] = match;
-            if (partsOfSpeechMap[partOfSpeech]) {
-                let word = getWord(partOfSpeech);
-                if (capitalize && token === token[0].toUpperCase() + token.slice(1).toLowerCase()) {
-                    word = _capitalize(word);
-                }
-                return word + rest;
-            }
-
-            return token;
-        }).join(' ');
-    }
-
-    return parse(template);
-}
-
-export const createAccount = async(generatedSeedPhrase)=> {
-    if(!generatedSeedPhrase) throw new Error('No generated seed-phrase')
-    const threads = doInitWorkers(crypto.kdfThreads)
-
-    const seed = await kdf(generatedSeedPhrase, void 0, threads)
-    const wallet = new PhraseWallet(seed, walletVersion)
-    return wallet
-       
-  }
-
-  const hasExtension = (filename) => {
-    return filename.includes(".") && filename.split(".").pop().length > 0;
+export function generateRandomSentence(
+  template = 'adverb verb noun adjective noun adverb verb noun adjective noun adjective verbed adjective noun',
+  maxWordLength = 0,
+  capitalize = true
+) {
+  const partsOfSpeechMap = {
+    noun: 'nouns',
+    adverb: 'adverbs',
+    adv: 'adverbs',
+    verb: 'verbs',
+    interjection: 'interjections',
+    adjective: 'adjectives',
+    adj: 'adjectives',
+    verbed: 'verbed',
   };
 
-  export const saveFileToDisk = async (data, qortAddress) => {
-   
-        const dataString = JSON.stringify(data);
-        const blob = new Blob([dataString], { type: 'application/json' });
-    const fileName = "qortal_backup_" + qortAddress + ".json";
+  let _wordlists = WORDLISTS;
 
-    await FileSaver.saveAs(blob, fileName);
-  
+  function _RNG(entropy) {
+    if (entropy > 1074) {
+      throw new Error('Javascript can not handle that much entropy!');
+    }
+    let randNum = 0;
+    const crypto = window.crypto || window.msCrypto;
+
+    if (crypto) {
+      const entropy256 = Math.ceil(entropy / 8);
+      let buffer = new Uint8Array(entropy256);
+      crypto.getRandomValues(buffer);
+      randNum =
+        buffer.reduce((num, value) => num * 256 + value, 0) /
+        Math.pow(256, entropy256);
+    } else {
+      console.warn('Secure RNG not found. Using Math.random');
+      randNum = Math.random();
+    }
+    return randNum;
+  }
+
+  function _capitalize(str) {
+    return str.charAt(0).toUpperCase() + str.slice(1);
+  }
+
+  function getWord(partOfSpeech) {
+    let words = _wordlists[partsOfSpeechMap[partOfSpeech]];
+    if (maxWordLength) {
+      words = words.filter((word) => word.length <= maxWordLength);
+    }
+    const requiredEntropy = Math.log(words.length) / Math.log(2);
+    const index = Math.floor(_RNG(requiredEntropy) * words.length);
+    return words[index];
+  }
+
+  function parse(template) {
+    return template
+      .split(/\s+/)
+      .map((token) => {
+        const match = token.match(/^(\w+)(.*)$/);
+        if (!match) return token; // No match, return original token
+
+        const [, partOfSpeech, rest] = match;
+        if (partsOfSpeechMap[partOfSpeech]) {
+          let word = getWord(partOfSpeech);
+          if (
+            capitalize &&
+            token === token[0].toUpperCase() + token.slice(1).toLowerCase()
+          ) {
+            word = _capitalize(word);
+          }
+          return word + rest;
+        }
+
+        return token;
+      })
+      .join(' ');
+  }
+
+  return parse(template);
 }
 
+export const createAccount = async (generatedSeedPhrase) => {
+  if (!generatedSeedPhrase) throw new Error('No generated seed-phrase');
+  const threads = doInitWorkers(crypto.kdfThreads);
+
+  const seed = await kdf(generatedSeedPhrase, void 0, threads);
+  const wallet = new PhraseWallet(seed, walletVersion);
+  return wallet;
+};
+
+const hasExtension = (filename) => {
+  return filename.includes('.') && filename.split('.').pop().length > 0;
+};
+
+export const saveFileToDisk = async (data, qortAddress) => {
+  const dataString = JSON.stringify(data);
+  const blob = new Blob([dataString], { type: 'application/json' });
+  const fileName = 'qortal_backup_' + qortAddress + '.json';
+
+  await FileSaver.saveAs(blob, fileName);
+};
+
 export const saveFileToDiskGeneric = async (blob, filename) => {
-    const timestamp = new Date()
-                        .toISOString()
-                        .replace(/:/g, "-"); // Safe timestamp for filenames
-                
-                        const fileExtension = mimeToExtensionMap[blob.type]
-let fileName = filename ||  "qortal_file_" + timestamp + "." + fileExtension;
-fileName = hasExtension(fileName) ? fileName : fileName  + "." + fileExtension;
+  const timestamp = new Date().toISOString().replace(/:/g, '-'); // Safe timestamp for filenames
 
-await FileSaver.saveAs(blob, fileName);
+  const fileExtension = mimeToExtensionMap[blob.type];
+  let fileName = filename || 'qortal_file_' + timestamp + '.' + fileExtension;
+  fileName = hasExtension(fileName) ? fileName : fileName + '.' + fileExtension;
 
-}
+  await FileSaver.saveAs(blob, fileName);
+};
 
 export const saveSeedPhraseToDisk = async (data) => {
-   
-    const blob = new Blob([data], { type: 'text/plain;charset=utf-8' })
-    const fileName = "qortal_seedphrase.txt"
+  const blob = new Blob([data], { type: 'text/plain;charset=utf-8' });
+  const fileName = 'qortal_seedphrase.txt';
 
-await FileSaver.saveAs(blob, fileName);
-
-}
\ No newline at end of file
+  await FileSaver.saveAs(blob, fileName);
+};
diff --git a/src/utils/generateWallet/storeWallet.ts b/src/utils/generateWallet/storeWallet.ts
index 83222ae..458543f 100644
--- a/src/utils/generateWallet/storeWallet.ts
+++ b/src/utils/generateWallet/storeWallet.ts
@@ -1,31 +1,37 @@
 // @ts-nocheck
 
-import {AES_CBC, HmacSha512} from 'asmcrypto.js'
+import { AES_CBC, HmacSha512 } from 'asmcrypto.js';
+import Base58 from '../../deps/Base58';
+import { doInitWorkers, kdf } from '../../deps/kdf.js';
+import { crypto as cryptoVals } from '../../constants/decryptWallet.js';
 
-import Base58 from '../../deps/Base58'
-import { doInitWorkers, kdf } from '../../deps/kdf.js'
-import { crypto as cryptoVals } from '../../constants/decryptWallet.js'
-
-const getRandomValues = crypto ? crypto.getRandomValues.bind(crypto) : msCrypto.getRandomValues.bind(msCrypto)
+const getRandomValues = crypto
+  ? crypto.getRandomValues.bind(crypto)
+  : msCrypto.getRandomValues.bind(msCrypto);
 export const generateSaveWalletData = async (wallet, password, kdfThreads) => {
-	const threads = doInitWorkers(cryptoVals.kdfThreads)
+  const threads = doInitWorkers(cryptoVals.kdfThreads);
 
-	let iv = new Uint8Array(16)
-	getRandomValues(iv)
-	let salt = new Uint8Array(32)
-	getRandomValues(salt)
-	const key = await kdf(password, salt, threads)
-	const encryptionKey = key.slice(0, 32)
-	const macKey = key.slice(32, 63)
-	const encryptedSeed = AES_CBC.encrypt(wallet._byteSeed, encryptionKey, false, iv)
-	const mac = new HmacSha512(macKey).process(encryptedSeed).finish().result
-	return {
-		address0: wallet._addresses[0].address,
-		encryptedSeed: Base58.encode(encryptedSeed),
-		salt: Base58.encode(salt),
-		iv: Base58.encode(iv),
-		version: wallet._walletVersion,
-		mac: Base58.encode(mac),
-		kdfThreads
-	}
-}
+  let iv = new Uint8Array(16);
+  getRandomValues(iv);
+  let salt = new Uint8Array(32);
+  getRandomValues(salt);
+  const key = await kdf(password, salt, threads);
+  const encryptionKey = key.slice(0, 32);
+  const macKey = key.slice(32, 63);
+  const encryptedSeed = AES_CBC.encrypt(
+    wallet._byteSeed,
+    encryptionKey,
+    false,
+    iv
+  );
+  const mac = new HmacSha512(macKey).process(encryptedSeed).finish().result;
+  return {
+    address0: wallet._addresses[0].address,
+    encryptedSeed: Base58.encode(encryptedSeed),
+    salt: Base58.encode(salt),
+    iv: Base58.encode(iv),
+    version: wallet._walletVersion,
+    mac: Base58.encode(mac),
+    kdfThreads,
+  };
+};
diff --git a/src/utils/generateWallet/verb-past-tense.ts b/src/utils/generateWallet/verb-past-tense.ts
index 2e9da0c..b3b12b3 100644
--- a/src/utils/generateWallet/verb-past-tense.ts
+++ b/src/utils/generateWallet/verb-past-tense.ts
@@ -2,36 +2,36 @@
 // @ts-nocheck
 
 export const EXCEPTIONS = {
-	'are': 'were',
-	'eat': 'ate',
-	'go': 'went',
-	'have': 'had',
-	'inherit': 'inherited',
-	'is': 'was',
-	'run': 'ran',
-	'sit': 'sat',
-	'visit': 'visited'
-}
+  are: 'were',
+  eat: 'ate',
+  go: 'went',
+  have: 'had',
+  inherit: 'inherited',
+  is: 'was',
+  run: 'ran',
+  sit: 'sat',
+  visit: 'visited',
+};
 
 export const getPastTense = (verb, exceptions = EXCEPTIONS) => {
-	if (exceptions[verb]) {
-		return exceptions[verb]
-	}
-	if ((/e$/i).test(verb)) {
-		return verb + 'd'
-	}
-	if ((/[aeiou]c$/i).test(verb)) {
-		return verb + 'ked'
-	}
-	// for american english only
-	if ((/el$/i).test(verb)) {
-		return verb + 'ed'
-	}
-	if ((/[aeio][aeiou][dlmnprst]$/).test(verb)) {
-		return verb + 'ed'
-	}
-	if ((/[aeiou][bdglmnprst]$/i).test(verb)) {
-		return verb.replace(/(.+[aeiou])([bdglmnprst])/, '$1$2$2ed')
-	}
-	return verb + 'ed'
-}
+  if (exceptions[verb]) {
+    return exceptions[verb];
+  }
+  if (/e$/i.test(verb)) {
+    return verb + 'd';
+  }
+  if (/[aeiou]c$/i.test(verb)) {
+    return verb + 'ked';
+  }
+  // for american english only
+  if (/el$/i.test(verb)) {
+    return verb + 'ed';
+  }
+  if (/[aeio][aeiou][dlmnprst]$/.test(verb)) {
+    return verb + 'ed';
+  }
+  if (/[aeiou][bdglmnprst]$/i.test(verb)) {
+    return verb.replace(/(.+[aeiou])([bdglmnprst])/, '$1$2$2ed');
+  }
+  return verb + 'ed';
+};
diff --git a/src/utils/qortalLink/index.ts b/src/utils/qortalLink/index.ts
index bc2f132..0b884d6 100644
--- a/src/utils/qortalLink/index.ts
+++ b/src/utils/qortalLink/index.ts
@@ -1,12 +1,12 @@
 export function convertQortalLinks(inputHtml: string) {
-    // Regular expression to match 'qortal://...' URLs. 
-    // This will stop at the first whitespace, comma, or HTML tag
-    var regex = /(qortal:\/\/[^\s,<]+)/g;
+  // Regular expression to match 'qortal://...' URLs.
+  // This will stop at the first whitespace, comma, or HTML tag
+  var regex = /(qortal:\/\/[^\s,<]+)/g;
 
-    // Replace matches in inputHtml with formatted anchor tag
-    var outputHtml = inputHtml.replace(regex, function (match) {
-        return `<a href="${match}" class="qortal-link">${match}</a>`;
-    });
+  // Replace matches in inputHtml with formatted anchor tag
+  var outputHtml = inputHtml.replace(regex, function (match) {
+    return `<a href="${match}" class="qortal-link">${match}</a>`;
+  });
 
-    return outputHtml;
-}
\ No newline at end of file
+  return outputHtml;
+}
diff --git a/src/utils/seedPhrase/RandomSentenceGenerator.ts b/src/utils/seedPhrase/RandomSentenceGenerator.ts
index 8fdf71d..86ba436 100644
--- a/src/utils/seedPhrase/RandomSentenceGenerator.ts
+++ b/src/utils/seedPhrase/RandomSentenceGenerator.ts
@@ -1,173 +1,182 @@
 // Author: irontiga <irontiga@gmail.com>
 
-import { html, LitElement, css } from 'lit'
-import * as WORDLISTS from './wordList'
+import { html, LitElement, css } from 'lit';
+import * as WORDLISTS from './wordList';
 
 class RandomSentenceGenerator extends LitElement {
-	static get properties() {
-		return {
-			template: { type: String, attribute: 'template' },
-			parsedString: { type: String },
-			fetchedWordlistCount: { type: Number, value: 0 },
-			capitalize: { type: Boolean },
-			partsOfSpeechMap: { type: Object },
-			templateEntropy: { type: Number, reflect: true, attribute: 'template-entropy' },
-			maxWordLength: { type: Number, attribute: 'max-word-length' }
-		}
-	}
+  static get properties() {
+    return {
+      template: { type: String, attribute: 'template' },
+      parsedString: { type: String },
+      fetchedWordlistCount: { type: Number, value: 0 },
+      capitalize: { type: Boolean },
+      partsOfSpeechMap: { type: Object },
+      templateEntropy: {
+        type: Number,
+        reflect: true,
+        attribute: 'template-entropy',
+      },
+      maxWordLength: { type: Number, attribute: 'max-word-length' },
+    };
+  }
 
-	constructor() {
-		super()
-		this.template = 'adjective noun verb adverb.'
-		this.maxWordLength = 0
-		this.parsedString = ''
-		this.fetchedWordlistCount = 0
-		this.capitalize = true
-		this.partsOfSpeechMap = {
-			'noun': 'nouns',
-			'adverb': 'adverbs',
-			'adv': 'adverbs',
-			'verb': 'verbs',
-			'interjection': 'interjections',
-			'adjective': 'adjectives',
-			'adj': 'adjectives',
-			'verbed': 'verbed'
-		}
-		this.partsOfSpeech = Object.keys(this.partsOfSpeechMap)
-		this._wordlists = WORDLISTS
-	}
+  constructor() {
+    super();
+    this.template = 'adjective noun verb adverb.';
+    this.maxWordLength = 0;
+    this.parsedString = '';
+    this.fetchedWordlistCount = 0;
+    this.capitalize = true;
+    this.partsOfSpeechMap = {
+      noun: 'nouns',
+      adverb: 'adverbs',
+      adv: 'adverbs',
+      verb: 'verbs',
+      interjection: 'interjections',
+      adjective: 'adjectives',
+      adj: 'adjectives',
+      verbed: 'verbed',
+    };
+    this.partsOfSpeech = Object.keys(this.partsOfSpeechMap);
+    this._wordlists = WORDLISTS;
+  }
 
-	static styles = css`
+  static styles = css`
     div {
       text-align: center;
-	  width: 100%;
-	  background-color: #1f2023;
-	  border-radius: 5px;
-	  padding: 10px;
+      width: 100%;
+      background-color: #1f2023;
+      border-radius: 5px;
+      padding: 10px;
     }
   `;
 
-	render() {
-		return html`
-			<div>${this.parsedString}</div>
-		`
-	}
+  render() {
+    return html` <div>${this.parsedString}</div> `;
+  }
 
-	
+  firstUpdated() {
+    // ...
+  }
 
-	firstUpdated() {
-		// ...
-	}
+  updated(changedProperties) {
+    let regen = false;
 
-	updated(changedProperties) {
-		let regen = false
+    if (changedProperties.has('template')) {
+      regen = true;
+    }
 
-		if (changedProperties.has('template')) {
-			regen = true
-		}
+    if (changedProperties.has('maxWordLength')) {
+      console.dir(this.maxWordLength);
 
-		if (changedProperties.has('maxWordLength')) {
-			console.dir(this.maxWordLength)
+      if (this.maxWordLength) {
+        const wl = { ...this._wordlists };
 
-			if (this.maxWordLength) {
-				const wl = { ...this._wordlists }
+        for (const partOfSpeech in this._wordlists) {
+          if (Array.isArray(this._wordlists[partOfSpeech])) {
+            wl[partOfSpeech] = this._wordlists[partOfSpeech].filter(
+              (word) => word.length <= this.maxWordLength
+            );
+          }
+        }
 
-				for (const partOfSpeech in this._wordlists) {
-					if (Array.isArray(this._wordlists[partOfSpeech])) {
-						wl[partOfSpeech] = this._wordlists[partOfSpeech].filter(word => word.length <= this.maxWordLength)
-					}
-				}
+        this._wordlists = wl;
+      }
 
-				this._wordlists = wl
-			}
+      regen = true;
+    }
 
-			regen = true
-		}
+    if (regen) this.generate();
+  }
 
-		if (regen) this.generate()
-	}
+  _RNG(entropy) {
+    if (entropy > 1074) {
+      throw new Error('Javascript can not handle that much entropy!');
+    }
 
-	_RNG(entropy) {
-		if (entropy > 1074) {
-			throw new Error('Javascript can not handle that much entropy!')
-		}
+    let randNum = 0;
 
-		let randNum = 0
+    const crypto = window.crypto || window.msCrypto;
 
-		const crypto = window.crypto || window.msCrypto
+    if (crypto) {
+      const entropy256 = Math.ceil(entropy / 8);
 
-		if (crypto) {
-			const entropy256 = Math.ceil(entropy / 8)
+      let buffer = new Uint8Array(entropy256);
 
-			let buffer = new Uint8Array(entropy256)
+      crypto.getRandomValues(buffer);
 
-			crypto.getRandomValues(buffer)
+      randNum =
+        buffer.reduce((num, value) => {
+          return num * value;
+        }, 1) / Math.pow(256, entropy256);
+    } else {
+      console.warn('Secure RNG not found. Using Math.random');
 
-			randNum = buffer.reduce((num, value) => {
-				return num * value
-			}, 1) / Math.pow(256, entropy256)
-		} else {
-			console.warn('Secure RNG not found. Using Math.random')
+      randNum = Math.random();
+    }
 
-			randNum = Math.random()
-		}
+    return randNum;
+  }
 
-		return randNum
-	}
+  setRNG(fn) {
+    this._RNG = fn;
+  }
 
-	setRNG(fn) {
-		this._RNG = fn
-	}
+  _captitalize(str) {
+    return str.charAt(0).toUpperCase() + str.slice(1);
+  }
 
-	_captitalize(str) {
-		return str.charAt(0).toUpperCase() + str.slice(1)
-	}
+  getWord(partOfSpeech) {
+    const words = this._wordlists[this.partsOfSpeechMap[partOfSpeech]];
+    const requiredEntropy = Math.log(words.length) / Math.log(2);
+    const index = this._RNG(requiredEntropy) * words.length;
 
-	getWord(partOfSpeech) {
-		const words = this._wordlists[this.partsOfSpeechMap[partOfSpeech]]
-		const requiredEntropy = Math.log(words.length) / Math.log(2)
-		const index = this._RNG(requiredEntropy) * words.length
+    return {
+      word: words[Math.round(index)],
+      entropy: words.length,
+    };
+  }
 
-		return {
-			word: words[Math.round(index)],
-			entropy: words.length
-		}
-	}
+  generate() {
+    this.parsedString = this.parse(this.template);
+  }
 
-	generate() {
-		this.parsedString = this.parse(this.template)
-	}
+  parse(template) {
+    const split = template.split(/[\s]/g);
 
-	parse(template) {
-		const split = template.split(/[\s]/g)
+    let entropy = 1;
 
-		let entropy = 1
+    const final = split.map((word) => {
+      const lower = word.toLowerCase();
 
-		const final = split.map(word => {
-			const lower = word.toLowerCase()
+      this.partsOfSpeech.some((partOfSpeech) => {
+        const partOfSpeechIndex = lower.indexOf(partOfSpeech); // Check it exists
+        const nextChar = word.charAt(partOfSpeech.length);
 
-			this.partsOfSpeech.some(partOfSpeech => {
-				const partOfSpeechIndex = lower.indexOf(partOfSpeech) // Check it exists
-				const nextChar = word.charAt(partOfSpeech.length)
+        if (
+          partOfSpeechIndex === 0 &&
+          !(nextChar && nextChar.match(/[a-zA-Z]/g) != null)
+        ) {
+          const replacement = this.getWord(partOfSpeech);
+          word = replacement.word + word.slice(partOfSpeech.length); // Append the rest of the "word" (punctuation)
+          entropy = entropy * replacement.entropy;
 
-				if (partOfSpeechIndex === 0 && !(nextChar && (nextChar.match(/[a-zA-Z]/g) != null))) {
-					const replacement = this.getWord(partOfSpeech)
-					word = replacement.word + word.slice(partOfSpeech.length) // Append the rest of the "word" (punctuation)
-					entropy = entropy * replacement.entropy
+          return true;
+        }
+      });
 
-					return true
-				}
-			})
+      return word;
+    });
 
-			return word
-		})
+    this.templateEntropy = Math.floor(Math.log(entropy) / Math.log(8));
 
-		this.templateEntropy = Math.floor(Math.log(entropy) / Math.log(8))
-
-		return final.join(' ')
-	}
+    return final.join(' ');
+  }
 }
 
-window.customElements.define('random-sentence-generator', RandomSentenceGenerator)
+window.customElements.define(
+  'random-sentence-generator',
+  RandomSentenceGenerator
+);
 
-export default RandomSentenceGenerator
\ No newline at end of file
+export default RandomSentenceGenerator;
diff --git a/src/utils/seedPhrase/verb-past-tense.ts b/src/utils/seedPhrase/verb-past-tense.ts
index c5b279f..5b55086 100644
--- a/src/utils/seedPhrase/verb-past-tense.ts
+++ b/src/utils/seedPhrase/verb-past-tense.ts
@@ -1,40 +1,40 @@
 export const EXCEPTIONS = {
-	'are': 'were',
-	'eat': 'ate',
-	'go': 'went',
-	'have': 'had',
-	'inherit': 'inherited',
-	'is': 'was',
-	'run': 'ran',
-	'sit': 'sat',
-	'visit': 'visited'
-}
+  are: 'were',
+  eat: 'ate',
+  go: 'went',
+  have: 'had',
+  inherit: 'inherited',
+  is: 'was',
+  run: 'ran',
+  sit: 'sat',
+  visit: 'visited',
+};
 
 export const getPastTense = (verb, exceptions = EXCEPTIONS) => {
-	if (exceptions[verb]) {
-		return exceptions[verb]
-	}
+  if (exceptions[verb]) {
+    return exceptions[verb];
+  }
 
-	if ((/e$/i).test(verb)) {
-		return verb + 'd'
-	}
+  if (/e$/i.test(verb)) {
+    return verb + 'd';
+  }
 
-	if ((/[aeiou]c$/i).test(verb)) {
-		return verb + 'ked'
-	}
+  if (/[aeiou]c$/i.test(verb)) {
+    return verb + 'ked';
+  }
 
-	// for american english only
-	if ((/el$/i).test(verb)) {
-		return verb + 'ed'
-	}
+  // for american english only
+  if (/el$/i.test(verb)) {
+    return verb + 'ed';
+  }
 
-	if ((/[aeio][aeiou][dlmnprst]$/).test(verb)) {
-		return verb + 'ed'
-	}
+  if (/[aeio][aeiou][dlmnprst]$/.test(verb)) {
+    return verb + 'ed';
+  }
 
-	if ((/[aeiou][bdglmnprst]$/i).test(verb)) {
-		return verb.replace(/(.+[aeiou])([bdglmnprst])/, '$1$2$2ed')
-	}
+  if (/[aeiou][bdglmnprst]$/i.test(verb)) {
+    return verb.replace(/(.+[aeiou])([bdglmnprst])/, '$1$2$2ed');
+  }
 
-	return verb + 'ed'
-}
\ No newline at end of file
+  return verb + 'ed';
+};
diff --git a/src/utils/validateAddress.ts b/src/utils/validateAddress.ts
index bbab210..4238311 100644
--- a/src/utils/validateAddress.ts
+++ b/src/utils/validateAddress.ts
@@ -4,6 +4,7 @@ import Base58 from '../deps/Base58';
 
 export const validateAddress = (address) => {
   let isAddress = false;
+
   try {
     const decodePubKey = Base58.decode(address);