src/App.tsx

@@ -21,7 +21,6 @@ import {
   DialogContentText,
   DialogTitle,
   Divider,
-  FormControlLabel,
   Input,
   InputLabel,
   Popover,
@@ -30,7 +29,6 @@ import {
 } from "@mui/material";
 import { decryptStoredWallet } from "./utils/decryptWallet";
 import AccountBalanceWalletIcon from '@mui/icons-material/AccountBalanceWallet';
-import PriorityHighIcon from '@mui/icons-material/PriorityHigh';
 
 import { JsonView, allExpanded, darkStyles } from 'react-json-view-lite';
 import 'react-json-view-lite/dist/index.css';
@@ -488,8 +486,6 @@ function App() {
     url: "http://127.0.0.1:12391",
   });
     const [useLocalNode, setUseLocalNode] = useState(false);
-    const [confirmRequestRead, setConfirmRequestRead] = useState(false);
-
   const [isSettingsOpen, setIsSettingsOpen] = useState(false);
   const [showSeed, setShowSeed] = useState(false)
   const [creationStep, setCreationStep] = useState(1)
@@ -882,8 +878,6 @@ function App() {
         if(message?.payload?.checkbox1){
           qortalRequestCheckbox1Ref.current = message?.payload?.checkbox1?.value || false
         }
-        setConfirmRequestRead(false)
-
         await showQortalRequestExtension(message?.payload);
         if (qortalRequestCheckbox1Ref.current) {
           event.source.postMessage(
@@ -3116,7 +3110,7 @@ await showInfo({
         >
           <CountdownCircleTimer
             isPlaying
-            duration={60}
+            duration={30}
             colors={["#004777", "#F7B801", "#A30000", "#A30000"]}
             colorsTime={[7, 5, 2, 0]}
             onComplete={() => {
@@ -3347,35 +3341,6 @@ await showInfo({
                 </Typography>
               </Box>
             )}
-            {messageQortalRequestExtension?.confirmCheckbox && (
-              <FormControlLabel
-              control={
-                <Checkbox
-                  onChange={(e) => setConfirmRequestRead(e.target.checked)}
-                  checked={confirmRequestRead}
-                  edge="start"
-                  tabIndex={-1}
-                  disableRipple
-                  sx={{
-                    "&.Mui-checked": {
-                      color: "white",
-                    },
-                    "& .MuiSvgIcon-root": {
-                      color: "white",
-                    },
-                  }}
-                />
-              }
-              label={
-                <Box sx={{ display: 'flex', alignItems: 'center' }}>
-                  <Typography sx={{ fontSize: "14px" }}>
-                    I have read this request
-                  </Typography>
-                  <PriorityHighIcon color="warning" />
-                </Box>
-              }
-            />
-            )}
 
             <Spacer height="29px" />
             <Box
@@ -3385,21 +3350,13 @@ await showInfo({
                 gap: "14px",
               }}
             >
-              <CustomButtonAccept
+             <CustomButtonAccept
               color="black"
               bgColor="var(--green)"
                 sx={{
                   minWidth: "102px",
-                  opacity: messageQortalRequestExtension?.confirmCheckbox && !confirmRequestRead ? 0.1 : 0.7,
-                  cursor: messageQortalRequestExtension?.confirmCheckbox && !confirmRequestRead ? 'default' : 'pointer',
-                  "&:hover": {
-      opacity: messageQortalRequestExtension?.confirmCheckbox && !confirmRequestRead ? 0.1 : 1,
-    }
-                }}
-                onClick={() => {
-                  if(messageQortalRequestExtension?.confirmCheckbox && !confirmRequestRead) return
-                  onOkQortalRequestExtension("accepted")
                 }}
+                onClick={() => onOkQortalRequestExtension("accepted")}
               >
                 accept
               </CustomButtonAccept>

src/atoms/global.ts

@@ -41,14 +41,6 @@ export const sortablePinnedAppsAtom = atom({
   {
     name: 'Q-Wallets',
     service: 'APP'
-  },
-  {
-    name: 'Q-Search',
-    service: 'APP'
-  },
-  {
-    name: 'Q-Nodecontrol',
-    service: 'APP'
   }
 ], 
 });
@@ -188,8 +180,3 @@ export const lastPaymentSeenTimestampAtom = atom<null | number>({
   key: 'lastPaymentSeenTimestampAtom', 
   default: null, 
 });
-
-export const isOpenBlockedModalAtom = atom({
-  key: 'isOpenBlockedModalAtom', 
-  default: false, 
-});

src/background.ts

@@ -2247,150 +2247,6 @@ export async function createGroup({
   if (!res?.signature) throw new Error(res?.message || "Transaction was not able to be processed");
   return res;
 }
-
-export async function sellName({
-  name,
-  sellPrice
-}) {
-  const wallet = await getSaveWallet();
-  const address = wallet.address0;
-  if (!address) throw new Error("Cannot find user");
-  const lastReference = await getLastRef();
-  const feeres = await getFee("SELL_NAME");
-  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,
-  };
-
-  const tx = await createTransaction(5, keyPair, {
-    fee: feeres.fee,
-    name,
-    sellPrice: sellPrice,
-    lastReference: lastReference,
-  });
-
-  const signedBytes = Base58.encode(tx.signedBytes);
-
-  const res = await processTransactionVersion2(signedBytes);
-  if (!res?.signature)
-    throw new Error(res?.message || "Transaction was not able to be processed");
-  return res;
-}
-
-export async function cancelSellName({
-  name
-}) {
-  const wallet = await getSaveWallet();
-  const address = wallet.address0;
-  if (!address) throw new Error("Cannot find user");
-  const lastReference = await getLastRef();
-  const feeres = await getFee("SELL_NAME");
-  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,
-  };
-
-  const tx = await createTransaction(6, keyPair, {
-    fee: feeres.fee,
-    name,
-    lastReference: lastReference,
-  });
-
-  const signedBytes = Base58.encode(tx.signedBytes);
-
-  const res = await processTransactionVersion2(signedBytes);
-  if (!res?.signature)
-    throw new Error(res?.message || "Transaction was not able to be processed");
-  return res;
-}
-
-export async function buyName({
-  name,
-  sellerAddress,
-  sellPrice
-}) {
-  const wallet = await getSaveWallet();
-  const address = wallet.address0;
-  if (!address) throw new Error("Cannot find user");
-  const lastReference = await getLastRef();
-  const feeres = await getFee("BUY_NAME");
-  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,
-  };
-
-  const tx = await createTransaction(7, keyPair, {
-    fee: feeres.fee,
-    name,
-		sellPrice,
-		recipient: sellerAddress,
-    lastReference: lastReference,
-  });
-
-  const signedBytes = Base58.encode(tx.signedBytes);
-
-  const res = await processTransactionVersion2(signedBytes);
-  if (!res?.signature)
-    throw new Error(res?.message || "Transaction was not able to be processed");
-  return res;
-}
-
-export async function updateGroup({
-  groupId,
-  newOwner,
-  newIsOpen,
-  newDescription,
-  newApprovalThreshold,
-  newMinimumBlockDelay,
-  newMaximumBlockDelay
-}) {
-  const wallet = await getSaveWallet();
-  const address = wallet.address0;
-  if (!address) throw new Error("Cannot find user");
-  const lastReference = await getLastRef();
-  const feeres = await getFee("UPDATE_GROUP");
-  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,
-  };
-
-  const tx = await createTransaction(23, keyPair, {
-    fee: feeres.fee,
-    _groupId: groupId,
-     newOwner,
-     newIsOpen,
-    newDescription,
-    newApprovalThreshold,
-    newMinimumBlockDelay,
-    newMaximumBlockDelay,
-    lastReference: lastReference,
-  });
-
-  const signedBytes = Base58.encode(tx.signedBytes);
-
-  const res = await processTransactionVersion2(signedBytes);
-  if (!res?.signature)
-    throw new Error(res?.message || "Transaction was not able to be processed");
-  return res;
-}
-
-
 export async function inviteToGroup({ groupId, qortalAddress, inviteTime }) {
   const address = await getNameOrAddress(qortalAddress);
   if (!address) throw new Error("Cannot find user");

src/common/BoundedNumericTextField.tsx

@@ -130,17 +130,12 @@ export const BoundedNumericTextField = ({
         ...props?.InputProps,
         endAdornment: addIconButtons ? (
           <InputAdornment position="end">
-            <IconButton size="small" onClick={() => 
+            <IconButton size="small" onClick={() => changeValueWithIncDecButton(1)}>
-               changeValueWithIncDecButton(1)
-            
-            } onTouchStart={(e)=> e.stopPropagation()}>
               <AddIcon sx={{
                 color: 'white'
               }} />{" "}
             </IconButton>
-            <IconButton onTouchStart={(e)=> e.stopPropagation()} size="small" onClick={() => 
+            <IconButton size="small" onClick={() => changeValueWithIncDecButton(-1)}>
-          changeValueWithIncDecButton(-1)
-            }>
               <RemoveIcon sx={{
                 color: 'white'
               }} />{" "}

src/components/Apps/AppsCategory.tsx

@@ -41,9 +41,7 @@ const officialAppList = [
   "q-trade",
   "q-support",
   "q-manager",
-   "q-wallets",
+   "q-wallets"
-   "q-search",
-   "q-nodecontrol"
 ];
 
 const ScrollerStyled = styled('div')({

src/components/Apps/AppsCategoryDesktop.tsx

@@ -47,9 +47,7 @@ const officialAppList = [
   "q-fund",
   "q-shop",
   "q-manager",
-   "q-wallets",
+   "q-wallets"
-   "q-search",
-   "q-nodecontrol"
 ];
 
 const ScrollerStyled = styled("div")({

src/components/Apps/AppsLibrary.tsx

@@ -45,9 +45,7 @@ const officialAppList = [
   "q-support",
   "q-manager",
   "q-mintership",
-   "q-wallets",
+   "q-wallets"
-   "q-search",
-   "q-nodecontrol"
 ];
 
 const ScrollerStyled = styled('div')({

src/components/Apps/AppsLibraryDesktop.tsx

@@ -56,9 +56,7 @@ const officialAppList = [
   "q-shop",
   "q-manager",
   "q-mintership",
-   "q-wallets",
+   "q-wallets"
-   "q-search",
-   "q-nodecontrol"
 ];
 
 const ScrollerStyled = styled("div")({

src/components/Apps/useQortalMessageListener.tsx

@@ -255,11 +255,7 @@ export function openIndexedDB() {
     'GET_NODE_INFO',
     'GET_NODE_STATUS',
     'GET_ARRR_SYNC_STATUS',
-     'SHOW_PDF_READER',
+     'SHOW_PDF_READER'
-     'UPDATE_GROUP',
-     'SELL_NAME',
-  'CANCEL_SELL_NAME',
-  'BUY_NAME'
   ]
   
 
@@ -273,9 +269,7 @@ const UIQortalRequests = [
   'GET_SERVER_CONNECTION_HISTORY', 'SET_CURRENT_FOREIGN_SERVER',
   'ADD_FOREIGN_SERVER', 'REMOVE_FOREIGN_SERVER', 'GET_DAY_SUMMARY', 'CREATE_TRADE_BUY_ORDER',
   'CREATE_TRADE_SELL_ORDER', 'CANCEL_TRADE_SELL_ORDER', 'IS_USING_PUBLIC_NODE', 'SIGN_TRANSACTION', 'ADMIN_ACTION', 'OPEN_NEW_TAB', 'CREATE_AND_COPY_EMBED_LINK', 'DECRYPT_QORTAL_GROUP_DATA', 'DECRYPT_DATA_WITH_SHARING_KEY', 'DELETE_HOSTED_DATA', 'GET_HOSTED_DATA', 'SHOW_ACTIONS', 'REGISTER_NAME', 'UPDATE_NAME', 'LEAVE_GROUP', 'INVITE_TO_GROUP', 'KICK_FROM_GROUP', 'BAN_FROM_GROUP',  'CANCEL_GROUP_BAN', 'ADD_GROUP_ADMIN', 'REMOVE_GROUP_ADMIN','DECRYPT_AESGCM', 'CANCEL_GROUP_INVITE', 'CREATE_GROUP', 'GET_USER_WALLET_TRANSACTIONS', 'GET_NODE_INFO',
-  'GET_NODE_STATUS', 'GET_ARRR_SYNC_STATUS', 'SHOW_PDF_READER', 'UPDATE_GROUP', 'SELL_NAME',
+  'GET_NODE_STATUS', 'GET_ARRR_SYNC_STATUS', 'SHOW_PDF_READER'
-  'CANCEL_SELL_NAME',
-  'BUY_NAME'
 ];
 
 
@@ -557,7 +551,7 @@ isDOMContentLoaded: false
               result: null,
               error: {
                 error: response.error,
-                message: typeof response?.error === 'string' ? response?.error : typeof response?.message === 'string' ? response?.message : 'An error has occurred'
+                message: typeof response?.error === 'string' ? response.error : 'An error has occurred'
               },
             });
           } else {

src/components/Chat/AdminSpaceInner.tsx

@@ -79,7 +79,7 @@ export const AdminSpaceInner = ({
       const res = await fetch(
         `${getBaseApiReact()}/arbitrary/DOCUMENT_PRIVATE/${
           getLatestPublish.name
-        }/${getLatestPublish.identifier}?encoding=base64&rebuild=true`
+        }/${getLatestPublish.identifier}?encoding=base64`
       );
       data = await res.text();
 

src/components/Chat/CreateCommonSecret.tsx

@@ -66,7 +66,7 @@ export const CreateCommonSecret = ({groupId, secretKey, isOwner,  myAddress, sec
       const res = await fetch(
         `${getBaseApiReact()}/arbitrary/DOCUMENT_PRIVATE/${publish.name}/${
           publish.identifier
-        }?encoding=base64&rebuild=true`
+        }?encoding=base64`
       );
       const data = await res.text();
    

src/components/Chat/useBlockUsers.tsx

@@ -1,5 +1,6 @@
 import React, { useCallback,  useEffect,  useRef } from "react";
-
+import { getBaseApiReact } from "../../App";
+import { truncate } from "lodash";
 
 
 
@@ -18,7 +19,7 @@ export const useBlockedAddresses = () => {
   const isUserBlocked = useCallback((address, name)=> {
     try {
       if(!address) return false
-      if(userBlockedRef.current[address]) return true
+      if(userBlockedRef.current[address] || userNamesBlockedRef.current[name]) return true
       return false
 
      
@@ -89,13 +90,43 @@ export const useBlockedAddresses = () => {
   }, [])
 
   const removeBlockFromList = useCallback(async (address, name)=> {
-    if(name){
+    await new Promise((res, rej) => {
+      window.sendMessage("listActions", {
+      
+          type: 'remove',
+          items: name ? [name] : [address],
+          listName: name ? 'blockedNames' : 'blockedAddresses'
+     
+      })
+      .then((response) => {
+        if (response.error) {
+          rej(response?.message);
+          return;
+        } else {
+          if(!name){
+            const copyObject = {...userBlockedRef.current}
+            delete copyObject[address]
+            userBlockedRef.current = copyObject
+          } else {
+            const copyObject = {...userNamesBlockedRef.current}
+            delete copyObject[name]
+            userNamesBlockedRef.current = copyObject
+          }
+        
+          res(response);
+        }
+      })
+      .catch((error) => {
+        console.error("Failed qortalRequest", error);
+      });
+    })
+    if(name && userBlockedRef.current[address]){
       await new Promise((res, rej) => {
         window.sendMessage("listActions", {
         
             type: 'remove',
-            items:  [name] ,
+            items: !name ? [name] : [address],
-            listName: 'blockedNames' 
+            listName: !name ? 'blockedNames' : 'blockedAddresses'
        
         })
         .then((response) => {
@@ -103,12 +134,9 @@ export const useBlockedAddresses = () => {
             rej(response?.message);
             return;
           } else {
-           
+            const copyObject = {...userBlockedRef.current}
-              const copyObject = {...userNamesBlockedRef.current}
+            delete copyObject[address]
-              delete copyObject[name]
+            userBlockedRef.current = copyObject
-              userNamesBlockedRef.current = copyObject
-            
-          
             res(response);
           }
         })
@@ -118,94 +146,41 @@ export const useBlockedAddresses = () => {
       })
     }
     
-    if(address){
-      await new Promise((res, rej) => {
-        window.sendMessage("listActions", {
-        
-            type: 'remove',
-            items: [address],
-            listName: 'blockedAddresses'
-       
-        })
-        .then((response) => {
-          if (response.error) {
-            rej(response?.message);
-            return;
-          } else {
-        
-              const copyObject = {...userBlockedRef.current}
-              delete copyObject[address]
-              userBlockedRef.current = copyObject
-            
-          
-            res(response);
-          }
-        })
-        .catch((error) => {
-          console.error("Failed qortalRequest", error);
-        });
-      })
-    }
- 
-    
   }, [])
 
   const addToBlockList = useCallback(async (address, name)=> {
-    if(name){
+    await new Promise((res, rej) => {
-      await new Promise((res, rej) => {
+      window.sendMessage("listActions", {
-        window.sendMessage("listActions", {
       
-            type: 'add',
+          type: 'add',
-            items: [name],
+          items: name ? [name] : [address],
-            listName: 'blockedNames'
+          listName: name ? 'blockedNames' : 'blockedAddresses'
      
-        })
-        .then((response) => {
-          if (response.error) {
-            rej(response?.message);
-            return;
-          } else {
-              const copyObject = {...userNamesBlockedRef.current}
-              copyObject[name] = true
-               userNamesBlockedRef.current = copyObject
-            
-          
-            res(response);
-          }
-        })
-        .catch((error) => {
-          console.error("Failed qortalRequest", error);
-        });
       })
-    }
+      .then((response) => {
-    if(address){
+        if (response.error) {
-      await new Promise((res, rej) => {
+          rej(response?.message);
-        window.sendMessage("listActions", {
+          return;
+        } else {
+          if(name){
             
-            type: 'add',
+            const copyObject = {...userNamesBlockedRef.current}
-            items: [address],
+            copyObject[name] = true
-            listName: 'blockedAddresses'
+             userNamesBlockedRef.current = copyObject
+          }else { 
+            const copyObject = {...userBlockedRef.current}
+            copyObject[address] = true
+             userBlockedRef.current = copyObject
             
-        })
-        .then((response) => {
-          if (response.error) {
-            rej(response?.message);
-            return;
-          } else {
-           
-              const copyObject = {...userBlockedRef.current}
-              copyObject[address] = true
-               userBlockedRef.current = copyObject
-          
-            res(response);
           }
-        })
-        .catch((error) => {
-          console.error("Failed qortalRequest", error);
-        });
-      })
-    }
         
+          res(response);
+        }
+      })
+      .catch((error) => {
+        console.error("Failed qortalRequest", error);
+      });
+    })
   }, [])
 
   return {

src/components/Group/BlockedUsersModal.tsx

@@ -10,23 +10,15 @@ import {
   Typography,
 } from "@mui/material";
 import React, { useContext, useEffect, useState } from "react";
-import { getBaseApiReact, MyContext } from "../../App";
+import { MyContext } from "../../App";
 import { Spacer } from "../../common/Spacer";
-import { executeEvent, subscribeToEvent, unsubscribeFromEvent } from "../../utils/events";
+import { executeEvent } from "../../utils/events";
-import { validateAddress } from "../../utils/validateAddress";
+
-import { getNameInfo, requestQueueMemberNames } from "./Group";
+export const BlockedUsersModal = ({ close }) => {
-import { useModal } from "../../common/useModal";
-import { useRecoilState } from "recoil";
-import { isOpenBlockedModalAtom } from "../../atoms/global";
-import InfoIcon from '@mui/icons-material/Info';
-export const BlockedUsersModal = () => {
-  const [isOpenBlockedModal, setIsOpenBlockedModal] = useRecoilState(isOpenBlockedModalAtom)
   const [hasChanged, setHasChanged] = useState(false);
   const [value, setValue] = useState("");
-  const [addressesWithNames, setAddressesWithNames] = useState({})
+
-  const { isShow, onCancel, onOk, show, message } = useModal();
+  const { getAllBlockedUsers, removeBlockFromList, addToBlockList } = useContext(MyContext);
-  const { getAllBlockedUsers, removeBlockFromList, addToBlockList, setOpenSnackGlobal, setInfoSnackCustom } =
-    useContext(MyContext);
   const [blockedUsers, setBlockedUsers] = useState({
     addresses: {},
     names: {},
@@ -36,162 +28,60 @@ export const BlockedUsersModal = () => {
   };
 
   useEffect(() => {
-    if(!isOpenBlockedModal) return
     fetchBlockedUsers();
-  }, [isOpenBlockedModal]);
+  }, []);
-
-   const getNames = async () => {
-    // const validApi = await findUsableApi();
-    const addresses = Object.keys(blockedUsers?.addresses)
-    const addressNames = {}
-
-  
-    const getMemNames = addresses.map(async (address) => {
-        const name = await requestQueueMemberNames.enqueue(() => {
-          return getNameInfo(address);
-        });
-        if (name) {
-          addressNames[address] = name
-        } 
-   
-  
-      return true;
-    });
-  
-    await Promise.all(getMemNames);
-  
-    setAddressesWithNames(addressNames)
-  };
-
-  const blockUser = async (e, user?: string) => {
-    try {
-      const valUser = user || value
-      if (!valUser) return;
-      const isAddress = validateAddress(valUser);
-      let userName = null;
-      let userAddress = null;
-      if (isAddress) {
-        userAddress = valUser;
-        const name = await getNameInfo(valUser);
-        if (name) {
-          userName = name;
-        }
-      }
-      if (!isAddress) {
-        const response = await fetch(`${getBaseApiReact()}/names/${valUser}`);
-        const data = await response.json();
-        if (!data?.owner) throw new Error("Name does not exist");
-        if (data?.owner) {
-          userAddress = data.owner;
-          userName = valUser;
-        }
-      }
-      if(!userName){
-        await addToBlockList(userAddress, null);
-        fetchBlockedUsers();
-        setHasChanged(true);
-        executeEvent('updateChatMessagesWithBlocks', true)
-        setValue('')
-        return
-      }
-      const responseModal = await show({
-        userName,
-        userAddress,
-      });
-      if (responseModal === "both") {
-        await addToBlockList(userAddress, userName);
-      } else if (responseModal === "address") {
-        await addToBlockList(userAddress, null);
-      } else if (responseModal === "name") {
-        await addToBlockList(null, userName);
-      }
-      fetchBlockedUsers();
-      setHasChanged(true);
-      setValue('')
-      if(user){
-        setIsOpenBlockedModal(false)
-      }
-      if(responseModal === 'both' || responseModal === 'address'){
-        executeEvent('updateChatMessagesWithBlocks', true)
-      }
-    } catch (error) {
-      setOpenSnackGlobal(true);
-
-      setInfoSnackCustom({
-        type: "error",
-        message: error?.message || "Unable to block user",
-      });
-    }
-  };
-  const blockUserFromOutsideModalFunc = (e) => {
-      const user = e.detail?.user;
-      setIsOpenBlockedModal(true)
-      blockUser(null, user)
-    };
-  
-    useEffect(() => {
-      subscribeToEvent("blockUserFromOutside", blockUserFromOutsideModalFunc);
-  
-      return () => {
-        unsubscribeFromEvent("blockUserFromOutside", blockUserFromOutsideModalFunc);
-      };
-    }, []);
   return (
     <Dialog
-      open={isOpenBlockedModal}
+      open={true}
       aria-labelledby="alert-dialog-title"
       aria-describedby="alert-dialog-description"
     >
-      <DialogTitle>Blocked Users</DialogTitle>
+        <DialogTitle>Blocked Users</DialogTitle>
-      <DialogContent
+        <DialogContent sx={{
-        sx={{
+            padding: '20px'
-          padding: "20px",
+        }}>
+      <Box
+       
+      sx={{
+          display: "flex",
+          alignItems: "center",
+          gap: "10px",
         }}
-      >
-        <Box
-          sx={{
-            display: "flex",
-            alignItems: "center",
-            gap: "10px",
-          }}
         >
-          <TextField
+        <TextField
-            placeholder="Name or address"
+          placeholder="Name"
-            value={value}
+          value={value}
-            onChange={(e) => {
+          onChange={(e) => {
-              setValue(e.target.value);
+            setValue(e.target.value);
-            }}
+          }}
-          />
+        />
-          <Button
+        <Button variant="contained" onClick={async ()=> {
-            sx={{
+            try {
-              flexShrink: 0,
+                if(!value) return
-            }}
+                await addToBlockList(undefined, value)
-            variant="contained"
+                fetchBlockedUsers()
-            onClick={blockUser}
+                setHasChanged(true)
-          >
+            } catch (error) {
-            Block
+                console.error(error)
-          </Button>
+            }
-        </Box>
+        }}>Block</Button>
+      </Box>
    
         {Object.entries(blockedUsers?.addresses).length > 0 && (
           <>
             <Spacer height="20px" />
             <DialogContentText id="alert-dialog-description">
-              Blocked addresses- blocks processing of txs
+              Blocked Users for Chat ( addresses )
             </DialogContentText>
             <Spacer height="10px" />
-            <Button variant="contained" size="small" onClick={getNames}>Fetch names</Button>
-            <Spacer height="10px" />
           </>
         )}
 
-        <Box
+        <Box sx={{
-          sx={{
+            display: 'flex',
-            display: "flex",
+            flexDirection: 'column',
-            flexDirection: "column",
+            gap: '10px'
-            gap: "10px",
+        }}>
-          }}
-        >
           {Object.entries(blockedUsers?.addresses || {})?.map(
             ([key, value]) => {
               return (
@@ -200,22 +90,18 @@ export const BlockedUsersModal = () => {
                     display: "flex",
                     alignItems: "center",
                     gap: "10px",
-                    width: "100%",
+                    width: '100%',
-                    justifyContent: "space-between",
+                    justifyContent: 'space-between'
                   }}
                 >
-                  <Typography>{addressesWithNames[key] || key}</Typography>
+                  <Typography>{key}</Typography>
                   <Button
-                    sx={{
-                      flexShrink: 0,
-                    }}
-                    size="small"
                     variant="contained"
                     onClick={async () => {
                       try {
                         await removeBlockFromList(key, undefined);
                         setHasChanged(true);
-                        setValue("");
+                        setValue('')
                         fetchBlockedUsers();
                       } catch (error) {
                         console.error(error);
@@ -233,19 +119,17 @@ export const BlockedUsersModal = () => {
           <>
             <Spacer height="20px" />
             <DialogContentText id="alert-dialog-description">
-              Blocked names for QDN
+              Blocked Users for QDN and Chat (names)
             </DialogContentText>
             <Spacer height="10px" />
           </>
         )}
 
-        <Box
+        <Box sx={{
-          sx={{
+            display: 'flex',
-            display: "flex",
+            flexDirection: 'column',
-            flexDirection: "column",
+            gap: '10px'
-            gap: "10px",
+        }}>
-          }}
-        >
           {Object.entries(blockedUsers?.names || {})?.map(([key, value]) => {
             return (
               <Box
@@ -253,16 +137,12 @@ export const BlockedUsersModal = () => {
                   display: "flex",
                   alignItems: "center",
                   gap: "10px",
-                  width: "100%",
+                  width: '100%',
-                  justifyContent: "space-between",
+                    justifyContent: 'space-between'
                 }}
               >
                 <Typography>{key}</Typography>
                 <Button
-                  size="small"
-                  sx={{
-                    flexShrink: 0,
-                  }}
                   variant="contained"
                   onClick={async () => {
                     try {
@@ -295,67 +175,16 @@ export const BlockedUsersModal = () => {
             },
           }}
           variant="contained"
-          onClick={() => {
+          onClick={()=> {
-            if (hasChanged) {
+            if(hasChanged){
-              executeEvent("updateChatMessagesWithBlocks", true);
+                executeEvent('updateChatMessagesWithBlocks', true)
             }
-            setIsOpenBlockedModal(false);
+            close()
           }}
         >
           close
         </Button>
       </DialogActions>
-
-      <Dialog
-        open={isShow}
-        aria-labelledby="alert-dialog-title"
-        aria-describedby="alert-dialog-description"
-      >
-        <DialogTitle id="alert-dialog-title">
-          {"Decide what to block"}
-        </DialogTitle>
-        <DialogContent>
-          <DialogContentText id="alert-dialog-description">
-            Blocking {message?.userName || message?.userAddress}
-          </DialogContentText>
-          <Box sx={{
-            display: 'flex',
-            alignItems: 'center',
-            gap: '10px',
-            marginTop: '20px'
-          }}>
-            <InfoIcon sx={{
-              color: 'fff'
-            }}/> <Typography>Choose "block txs" or "all" to block chat messages </Typography>
-          </Box>
-        </DialogContent>
-        <DialogActions>
-          <Button
-            variant="contained"
-            onClick={() => {
-              onOk("address");
-            }}
-          >
-            Block txs
-          </Button>
-          <Button
-            variant="contained"
-            onClick={() => {
-              onOk("name");
-            }}
-          >
-            Block QDN data
-          </Button>
-          <Button
-            variant="contained"
-            onClick={() => {
-              onOk("both");
-            }}
-          >
-            Block All
-          </Button>
-        </DialogActions>
-      </Dialog>
     </Dialog>
   );
 };

src/components/Group/Group.tsx

@@ -19,8 +19,7 @@ import React, {
   useRef,
   useState,
 } from "react";
-import PersonOffIcon from '@mui/icons-material/PersonOff';
+import BlockIcon from '@mui/icons-material/Block';
-
 import { WalletsAppWrapper } from "./WalletsAppWrapper";
 
 import SettingsIcon from "@mui/icons-material/Settings";
@@ -100,7 +99,7 @@ import { formatEmailDate } from "./QMailMessages";
 import { useHandleMobileNativeBack } from "../../hooks/useHandleMobileNativeBack";
 import { AdminSpace } from "../Chat/AdminSpace";
 import { useRecoilState, useSetRecoilState } from "recoil";
-import { addressInfoControllerAtom, groupsPropertiesAtom, isOpenBlockedModalAtom, lastEnteredGroupIdAtom, selectedGroupIdAtom } from "../../atoms/global";
+import { addressInfoControllerAtom, groupsPropertiesAtom, lastEnteredGroupIdAtom, selectedGroupIdAtom } from "../../atoms/global";
 import { sortArrayByTimestampAndGroupName } from "../../utils/time";
 import { BlockedUsersModal } from "./BlockedUsersModal";
 import { GlobalTouchMenu } from "../GlobalTouchMenu";
@@ -484,8 +483,6 @@ export const Group = ({
   const [groupAnnouncements, setGroupAnnouncements] = React.useState({});
   const [defaultThread, setDefaultThread] = React.useState(null);
   const [isOpenDrawer, setIsOpenDrawer] = React.useState(false);
-  const setIsOpenBlockedUserModal = useSetRecoilState(isOpenBlockedModalAtom)
-
   const [hideCommonKeyPopup, setHideCommonKeyPopup] = React.useState(false);
   const [isLoadingGroupMessage, setIsLoadingGroupMessage] = React.useState("");
   const [drawerMode, setDrawerMode] = React.useState("groups");
@@ -510,6 +507,7 @@ export const Group = ({
   const [isForceShowCreationKeyPopup, setIsForceShowCreationKeyPopup] = useState(false)
   const [groupsProperties, setGroupsProperties] = useRecoilState(groupsPropertiesAtom)
   const setUserInfoForLevels = useSetRecoilState(addressInfoControllerAtom);
+  const [isOpenBlockedUserModal, setIsOpenBlockedUserModal] = React.useState(false);
   const setLastEnteredGroupIdAtom = useSetRecoilState(lastEnteredGroupIdAtom)
   const isPrivate = useMemo(()=> {
     if(selectedGroup?.groupId === '0') return false
@@ -841,7 +839,7 @@ export const Group = ({
         const res = await fetch(
           `${getBaseApiReact()}/arbitrary/DOCUMENT_PRIVATE/${publish.name}/${
             publish.identifier
-          }?encoding=base64&rebuild=true`
+          }?encoding=base64`
         );
         data = await res.text();
       }
@@ -2161,7 +2159,7 @@ export const Group = ({
                    padding: '10px'
                  }}
                >
-                 <PersonOffIcon
+                 <BlockIcon
                    sx={{
                      color: "white",
                    }}
@@ -2658,9 +2656,11 @@ export const Group = ({
               )}
             </>
           )}
-            
+             {isOpenBlockedUserModal && (
-        <BlockedUsersModal />
+        <BlockedUsersModal close={()=> {
-      
+          setIsOpenBlockedUserModal(false)
+        }} />
+       )}
           {selectedDirect && !newChat && (
             <>
               <Box

src/components/WrapperUserAction.tsx

@@ -167,9 +167,12 @@ useEffect(()=> {
     onClick={async () => {
       try {
         setIsLoading(true)
-        executeEvent("blockUserFromOutside", {
+        if(isAlreadyBlocked === true){
-          user: address
+          await removeBlockFromList(address, name)
-        })
+        } else if(isAlreadyBlocked === false) {
+          await addToBlockList(address, name)
+        }
+        executeEvent('updateChatMessagesWithBlocks', true)
       } catch (error) {
         console.error(error)
       } finally {

src/messaging/messagesToBackground.tsx

@@ -24,7 +24,7 @@ window.addEventListener("message", (event) => {
   }
 });
 
-export const sendMessageBackground = (action, data = {}, timeout = 240000, isExtension, appInfo, skipAuth) => {
+export const sendMessageBackground = (action, data = {}, timeout = 180000, isExtension, appInfo, skipAuth) => {
   return new Promise((resolve, reject) => {
     const requestId = generateRequestId(); // Unique ID for each request
     callbackMap.set(requestId, { resolve, reject }); // Store both resolve and reject callbacks

src/qortalRequests.ts

@@ -1,6 +1,6 @@
 import { gateways, getApiKeyFromStorage } from "./background";
 import { listOfAllQortalRequests } from "./components/Apps/useQortalMessageListener";
-import { addForeignServer, addGroupAdminRequest, addListItems, adminAction, banFromGroupRequest, buyNameRequest, cancelGroupBanRequest, cancelGroupInviteRequest, cancelSellNameRequest, cancelSellOrder, createAndCopyEmbedLink, createBuyOrder, createGroupRequest, createPoll, decryptAESGCMRequest, decryptData, decryptDataWithSharingKey, decryptQortalGroupData, deleteHostedData, deleteListItems, deployAt, encryptData, encryptDataWithSharingKey, encryptQortalGroupData, getArrrSyncStatus, getCrossChainServerInfo, getDaySummary, getForeignFee, getHostedData, getListItems, getNodeInfo, getNodeStatus, getServerConnectionHistory, getTxActivitySummary, getUserAccount, getUserWallet, getUserWalletInfo, getUserWalletTransactions, getWalletBalance, inviteToGroupRequest, joinGroup, kickFromGroupRequest, leaveGroupRequest, openNewTab, publishMultipleQDNResources, publishQDNResource, registerNameRequest, removeForeignServer, removeGroupAdminRequest, saveFile, sellNameRequest, sendChatMessage, sendCoin, setCurrentForeignServer, signTransaction, updateForeignFee, updateGroupRequest, updateNameRequest, voteOnPoll } from "./qortalRequests/get";
+import { addForeignServer, addGroupAdminRequest, addListItems, adminAction, banFromGroupRequest, cancelGroupBanRequest, cancelGroupInviteRequest, cancelSellOrder, createAndCopyEmbedLink, createBuyOrder, createGroupRequest, createPoll, decryptAESGCMRequest, decryptData, decryptDataWithSharingKey, decryptQortalGroupData, deleteHostedData, deleteListItems, deployAt, encryptData, encryptDataWithSharingKey, encryptQortalGroupData, getArrrSyncStatus, getCrossChainServerInfo, getDaySummary, getForeignFee, getHostedData, getListItems, getNodeInfo, getNodeStatus, getServerConnectionHistory, getTxActivitySummary, getUserAccount, getUserWallet, getUserWalletInfo, getUserWalletTransactions, getWalletBalance, inviteToGroupRequest, joinGroup, kickFromGroupRequest, leaveGroupRequest, openNewTab, publishMultipleQDNResources, publishQDNResource, registerNameRequest, removeForeignServer, removeGroupAdminRequest, saveFile, sendChatMessage, sendCoin, setCurrentForeignServer, signTransaction, updateForeignFee, updateNameRequest, voteOnPoll } from "./qortalRequests/get";
 import { getData, storeData } from "./utils/chromeStorage";
 import { executeEvent } from "./utils/events";
 
@@ -1206,82 +1206,6 @@ export const isRunningGateway = async ()=> {
           }
           break;
         }
-        case "UPDATE_GROUP" : {
-          try {
-            const res =  await updateGroupRequest(request.payload, isFromExtension)
-            event.source.postMessage({
-              requestId: request.requestId,
-              action: request.action,
-              payload: res,
-              type: "backgroundMessageResponse",
-            }, event.origin);
-          } catch (error) {
-            event.source.postMessage({
-              requestId: request.requestId,
-              action: request.action,
-              error: error?.message,
-              type: "backgroundMessageResponse",
-            }, event.origin);
-          }
-          break;
-        }
-        case "BUY_NAME": {
-          try {
-            const res = await buyNameRequest(request.payload, isFromExtension);
-            event.source.postMessage({
-              requestId: request.requestId,
-              action: request.action,
-              payload: res,
-              type: "backgroundMessageResponse",
-            }, event.origin);
-          } catch (error) {
-            event.source.postMessage({
-              requestId: request.requestId,
-              action: request.action,
-              error: error.message,
-              type: "backgroundMessageResponse",
-            }, event.origin);
-          }
-          break;
-        }
-        case "SELL_NAME": {
-          try {
-            const res = await sellNameRequest(request.payload, isFromExtension);
-            event.source.postMessage({
-              requestId: request.requestId,
-              action: request.action,
-              payload: res,
-              type: "backgroundMessageResponse",
-            }, event.origin);
-          } catch (error) {
-            event.source.postMessage({
-              requestId: request.requestId,
-              action: request.action,
-              error: error.message,
-              type: "backgroundMessageResponse",
-            }, event.origin);
-          }
-          break;
-        }
-        case "CANCEL_SELL_NAME": {
-          try {
-            const res = await cancelSellNameRequest(request.payload, isFromExtension);
-            event.source.postMessage({
-              requestId: request.requestId,
-              action: request.action,
-              payload: res,
-              type: "backgroundMessageResponse",
-            }, event.origin);
-          } catch (error) {
-            event.source.postMessage({
-              requestId: request.requestId,
-              action: request.action,
-              error: error.message,
-              type: "backgroundMessageResponse",
-            }, event.origin);
-          }
-          break;
-        }
         default:
           break;
       }

src/qortalRequests/get.ts

@@ -27,12 +27,7 @@ import {
   makeAdmin,
   removeAdmin,
   cancelInvitationToGroup,
-  createGroup,
+  createGroup
-  updateGroup,
-  getBaseApi,
-  buyName,
-  cancelSellName,
-  sellName
 } from "../background";
 import { getNameInfo, uint8ArrayToObject } from "../backgroundFunctions/encryption";
 import { showSaveFilePicker } from "../components/Apps/useQortalMessageListener";
@@ -378,7 +373,7 @@ async function getUserPermission(payload, isFromExtension) {
         responseResolvers.get(requestId)(false); // Resolve with `false` if no response
         responseResolvers.delete(requestId);
       }
-    }, 60000); // 30-second timeout
+    }, 30000); // 30-second timeout
   });
 }
 
@@ -485,7 +480,7 @@ export const encryptQortalGroupData = async (data, sender) => {
   if(publish === false) throw new Error('No group key found.')
   const url = await createEndpoint(`/arbitrary/DOCUMENT_PRIVATE/${publish.name}/${
     publish.identifier
-  }?encoding=base64&rebuild=true`);
+  }?encoding=base64`);
 
   const res = await fetch(
 url
@@ -519,7 +514,7 @@ url
   if(publish === false) throw new Error('No group key found.')
   const url = await createEndpoint(`/arbitrary/DOCUMENT_PRIVATE/${publish.name}/${
     publish.identifier
-  }?encoding=base64&rebuild=true`);
+  }?encoding=base64`);
 
   const res = await fetch(
 url
@@ -580,7 +575,7 @@ export const decryptQortalGroupData = async (data, sender) => {
   if(publish === false) throw new Error('No group key found.')
   const url = await createEndpoint(`/arbitrary/DOCUMENT_PRIVATE/${publish.name}/${
     publish.identifier
-  }?encoding=base64&rebuild=true`);
+  }?encoding=base64`);
 
   const res = await fetch(
 url
@@ -611,7 +606,7 @@ url
   if(publish === false) throw new Error('No group key found.')
   const url = await createEndpoint(`/arbitrary/DOCUMENT_PRIVATE/${publish.name}/${
     publish.identifier
-  }?encoding=base64&rebuild=true`);
+  }?encoding=base64`);
 
   const res = await fetch(
 url
@@ -1234,7 +1229,6 @@ export const publishMultipleQDNResources = async (data: any, sender, isFromExten
         failedPublishesIdentifiers.push({
           reason: errorMsg,
           identifier: resource.identifier,
-          service: resource.service,
         });
         continue;
       }
@@ -1243,7 +1237,6 @@ export const publishMultipleQDNResources = async (data: any, sender, isFromExten
         failedPublishesIdentifiers.push({
           reason: errorMsg,
           identifier: resource.identifier,
-          service: resource.service,
         });
         continue;
       }
@@ -1274,7 +1267,6 @@ export const publishMultipleQDNResources = async (data: any, sender, isFromExten
         failedPublishesIdentifiers.push({
           reason: errorMsg,
           identifier: resource.identifier,
-          service: resource.service,
         });
         continue;
       }
@@ -1302,7 +1294,6 @@ export const publishMultipleQDNResources = async (data: any, sender, isFromExten
           failedPublishesIdentifiers.push({
             reason: errorMsg,
             identifier: resource.identifier,
-            service: resource.service,
           });
           continue;
         }
@@ -1329,7 +1320,7 @@ export const publishMultipleQDNResources = async (data: any, sender, isFromExten
           apiVersion: 2,
           withFee: true,
           },
-        ], true);
+        ], false);
         await new Promise((res) => {
           setTimeout(() => {
             res();
@@ -1340,25 +1331,21 @@ export const publishMultipleQDNResources = async (data: any, sender, isFromExten
         failedPublishesIdentifiers.push({
           reason: errorMsg,
           identifier: resource.identifier,
-          service: resource.service,
         });
       }
     } catch (error) {
       failedPublishesIdentifiers.push({
         reason: error?.message || "Unknown error",
         identifier: resource.identifier,
-        service: resource.service,
       });
     }
   }
   if (failedPublishesIdentifiers.length > 0) {
-    const obj = {
+    const obj = {};
-      message: "Some resources have failed to publish.",
+    obj["error"] = {
-   };
+      unsuccessfulPublishes: failedPublishesIdentifiers,
-   obj["error"] = {
+    };
-     unsuccessfulPublishes: failedPublishesIdentifiers,
+    return obj;
-   };
-   return obj;
   }
   if(hasAppFee && checkbox1){
     sendCoinFunc({
@@ -2747,14 +2734,13 @@ export const sendCoin = async (data, isFromExtension) => {
             text1: "Do you give this application permission to send coins?",
             text2: `To: ${recipient}`, 
             highlightedText: `${amount} ${checkCoin}`,
-            fee: fee,
+            fee: fee
-            confirmCheckbox: true
           }, isFromExtension);
           const { accepted } = resPermission;
         
           if (accepted) {
             const makePayment = await sendCoinFunc({amount, password: null, receiver: recipient }, true)
-            return makePayment.res?.data
+            return makePayment.res
           } else {
             throw new Error("User declined request")
           }
@@ -3843,11 +3829,6 @@ export const registerNameRequest = async (data, isFromExtension) => {
       missingFields.push(field);
     }
   });
-  if (missingFields.length > 0) {
-    const missingFieldsString = missingFields.join(", ");
-    const errorMsg = `Missing fields: ${missingFieldsString}`;
-    throw new Error(errorMsg);
-  }
   const fee = await getFee("REGISTER_NAME");
   const resPermission = await getUserPermission(
     {
@@ -3861,7 +3842,7 @@ export const registerNameRequest = async (data, isFromExtension) => {
   const { accepted } = resPermission;
   if (accepted) {
   const name = data.name
-  const description = data?.description || ""
+  const description = data?.description
   const response = await registerName({ name, description });
   return response
 
@@ -3878,14 +3859,9 @@ export const updateNameRequest = async (data, isFromExtension) => {
       missingFields.push(field);
     }
   });
-  if (missingFields.length > 0) {
-    const missingFieldsString = missingFields.join(", ");
-    const errorMsg = `Missing fields: ${missingFieldsString}`;
-    throw new Error(errorMsg);
-  }
   const oldName = data.oldName
   const newName = data.newName
-  const description = data?.description || ""
+  const description = data?.description
   const fee = await getFee("UPDATE_NAME");
   const resPermission = await getUserPermission(
     {
@@ -3914,11 +3890,6 @@ export const leaveGroupRequest = async (data, isFromExtension) => {
       missingFields.push(field);
     }
   });
-  if (missingFields.length > 0) {
-    const missingFieldsString = missingFields.join(", ");
-    const errorMsg = `Missing fields: ${missingFieldsString}`;
-    throw new Error(errorMsg);
-  }
   const groupId = data.groupId
   let groupInfo = null;
   try {
@@ -3959,11 +3930,6 @@ export const inviteToGroupRequest = async (data, isFromExtension) => {
       missingFields.push(field);
     }
   });
-  if (missingFields.length > 0) {
-    const missingFieldsString = missingFields.join(", ");
-    const errorMsg = `Missing fields: ${missingFieldsString}`;
-    throw new Error(errorMsg);
-  }
   const groupId = data.groupId
   const qortalAddress = data?.inviteeAddress
   const inviteTime = data?.inviteTime
@@ -4013,11 +3979,6 @@ export const kickFromGroupRequest = async (data, isFromExtension) => {
       missingFields.push(field);
     }
   });
-  if (missingFields.length > 0) {
-    const missingFieldsString = missingFields.join(", ");
-    const errorMsg = `Missing fields: ${missingFieldsString}`;
-    throw new Error(errorMsg);
-  }
   const groupId = data.groupId
   const qortalAddress = data?.qortalAddress
   const reason = data?.reason
@@ -4067,11 +4028,6 @@ export const banFromGroupRequest = async (data, isFromExtension) => {
       missingFields.push(field);
     }
   });
-  if (missingFields.length > 0) {
-    const missingFieldsString = missingFields.join(", ");
-    const errorMsg = `Missing fields: ${missingFieldsString}`;
-    throw new Error(errorMsg);
-  }
   const groupId = data.groupId
   const qortalAddress = data?.qortalAddress
   const rBanTime = data?.banTime
@@ -4122,11 +4078,6 @@ export const cancelGroupBanRequest = async (data, isFromExtension) => {
       missingFields.push(field);
     }
   });
-  if (missingFields.length > 0) {
-    const missingFieldsString = missingFields.join(", ");
-    const errorMsg = `Missing fields: ${missingFieldsString}`;
-    throw new Error(errorMsg);
-  }
   const groupId = data.groupId
   const qortalAddress = data?.qortalAddress
 
@@ -4174,11 +4125,6 @@ export const addGroupAdminRequest = async (data, isFromExtension) => {
       missingFields.push(field);
     }
   });
-  if (missingFields.length > 0) {
-    const missingFieldsString = missingFields.join(", ");
-    const errorMsg = `Missing fields: ${missingFieldsString}`;
-    throw new Error(errorMsg);
-  }
   const groupId = data.groupId
   const qortalAddress = data?.qortalAddress
 
@@ -4226,11 +4172,6 @@ export const removeGroupAdminRequest = async (data, isFromExtension) => {
       missingFields.push(field);
     }
   });
-  if (missingFields.length > 0) {
-    const missingFieldsString = missingFields.join(", ");
-    const errorMsg = `Missing fields: ${missingFieldsString}`;
-    throw new Error(errorMsg);
-  }
   const groupId = data.groupId
   const qortalAddress = data?.qortalAddress
 
@@ -4278,11 +4219,6 @@ export const cancelGroupInviteRequest = async (data, isFromExtension) => {
       missingFields.push(field);
     }
   });
-  if (missingFields.length > 0) {
-    const missingFieldsString = missingFields.join(", ");
-    const errorMsg = `Missing fields: ${missingFieldsString}`;
-    throw new Error(errorMsg);
-  }
   const groupId = data.groupId
   const qortalAddress = data?.qortalAddress
 
@@ -4377,20 +4313,15 @@ export const decryptAESGCMRequest = async (data, isFromExtension) => {
 };
 
 export const createGroupRequest = async (data, isFromExtension) => {
-  const requiredFields = ["groupId", "qortalAddress", "groupName", "type", "approvalThreshold", "minBlock", "maxBlock"];
+  const requiredFields = ["groupId", "qortalAddress"];
   const missingFields: string[] = [];
   requiredFields.forEach((field) => {
-    if (data[field] !== undefined && data[field] !== null) {
+    if (!data[field]) {
       missingFields.push(field);
     }
   });
-  if (missingFields.length > 0) {
-    const missingFieldsString = missingFields.join(", ");
-    const errorMsg = `Missing fields: ${missingFieldsString}`;
-    throw new Error(errorMsg);
-  }
   const groupName = data.groupName
-  const description = data?.description || ""
+  const description = data?.description
   const type = +data.type
   const approvalThreshold = +data?.approvalThreshold
   const minBlock = +data?.minBlock
@@ -4423,70 +4354,6 @@ export const createGroupRequest = async (data, isFromExtension) => {
   }
 };
 
-export const updateGroupRequest = async (data, isFromExtension) => {
-  const requiredFields = ["groupId", "newOwner",  "type", "approvalThreshold", "minBlock", "maxBlock"];
-  const missingFields: string[] = [];
-  requiredFields.forEach((field) => {
-    if (data[field] !== undefined && data[field] !== null) {
-      missingFields.push(field);
-    }
-  });
-  if (missingFields.length > 0) {
-    const missingFieldsString = missingFields.join(", ");
-    const errorMsg = `Missing fields: ${missingFieldsString}`;
-    throw new Error(errorMsg);
-  }
-  const groupId = +data.groupId
-  const newOwner = data.newOwner
-  const description = data?.description || ""
-  const type = +data.type
-  const approvalThreshold = +data?.approvalThreshold
-  const minBlock = +data?.minBlock
-  const maxBlock = +data.maxBlock
-
-  let groupInfo = null;
-  try {
-    const url = await createEndpoint(`/groups/${groupId}`);
-    const response = await fetch(url);
-    if (!response.ok) throw new Error("Failed to fetch group");
-
-    groupInfo = await response.json();
-  } catch (error) {
-    const errorMsg = (error && error.message) || "Group not found";
-    throw new Error(errorMsg);
-  }
-
-  const displayInvitee = await getNameInfoForOthers(newOwner)
-
-
-  const fee = await getFee("CREATE_GROUP");
-  const resPermission = await getUserPermission(
-    {
-      text1: `Do you give this application permission to update this group?`,
-      text2: `New owner: ${displayInvitee || newOwner}`,
-      highlightedText: `Group: ${groupInfo.groupName}`,
-      fee: fee.fee,
-    },
-    isFromExtension
-  );
-  const { accepted } = resPermission;
-  if (accepted) {
-  const response = await updateGroup({
-    groupId,
-    newOwner,
-    newIsOpen: type,
-    newDescription: description,
-    newApprovalThreshold: approvalThreshold,
-    newMinimumBlockDelay: minBlock,
-    newMaximumBlockDelay: maxBlock
-      })
-  return response
-
-  } else {
-    throw new Error("User declined request");
-  }
-};
-
 export const getUserWalletTransactions = async (data, isFromExtension, appInfo) => {
   const requiredFields = ["coin"];
   const missingFields: string[] = [];
@@ -4495,7 +4362,6 @@ export const getUserWalletTransactions = async (data, isFromExtension, appInfo)
       missingFields.push(field);
     }
   });
-
   if (missingFields.length > 0) {
     const missingFieldsString = missingFields.join(", ");
     const errorMsg = `Missing fields: ${missingFieldsString}`;
@@ -4672,136 +4538,3 @@ export const getArrrSyncStatus = async () => {
     throw new Error(error?.message || "Error in retrieving arrr sync status");
   }
 };
-
-export const sellNameRequest = async (data, isFromExtension) => {
-  const requiredFields = ["salePrice", "nameForSale"];
-  const missingFields: string[] = [];
-  requiredFields.forEach((field) => {
-    if (data[field] !== undefined && data[field] !== null) {
-      missingFields.push(field);
-    }
-  });
-  if (missingFields.length > 0) {
-    const missingFieldsString = missingFields.join(", ");
-    const errorMsg = `Missing fields: ${missingFieldsString}`;
-    throw new Error(errorMsg);
-  }
-  const name = data.nameForSale
-  const sellPrice = +data.salePrice
-
-  const validApi = await getBaseApi();
-
-  const response = await fetch(validApi + "/names/" + name);
-  const nameData = await response.json();
-if(!nameData) throw new Error("This name does not exist")
-
-if(nameData?.isForSale) throw new Error("This name is already for sale")
-  const fee = await getFee("SELL_NAME");
-  const resPermission = await getUserPermission(
-    {
-      text1: `Do you give this application permission to create a sell name transaction?`,
-      highlightedText: `Sell ${name} for ${sellPrice} QORT`,
-      fee: fee.fee,
-    },
-    isFromExtension
-  );
-  const { accepted } = resPermission;
-  if (accepted) {
-  const response = await sellName({
-        name,
-        sellPrice
-      })
-  return response
-
-  } else {
-    throw new Error("User declined request");
-  }
-};
-
-export const cancelSellNameRequest = async (data, isFromExtension) => {
-  const requiredFields = ["nameForSale"];
-  const missingFields: string[] = [];
-  requiredFields.forEach((field) => {
-    if (data[field] !== undefined && data[field] !== null) {
-      missingFields.push(field);
-    }
-  });
-  if (missingFields.length > 0) {
-    const missingFieldsString = missingFields.join(", ");
-    const errorMsg = `Missing fields: ${missingFieldsString}`;
-    throw new Error(errorMsg);
-  }
-  const name = data.nameForSale
-  const validApi = await getBaseApi();
-
-  const response = await fetch(validApi + "/names/" + name);
-  const nameData = await response.json();
-if(!nameData?.isForSale) throw new Error("This name is not for sale")
-
-  const fee = await getFee("CANCEL_SELL_NAME");
-  const resPermission = await getUserPermission(
-    {
-      text1: `Do you give this application permission to cancel the selling of a name?`,
-      highlightedText: `Name: ${name}`,
-      fee: fee.fee,
-    },
-    isFromExtension
-  );
-  const { accepted } = resPermission;
-  if (accepted) {
-  const response = await cancelSellName({
-        name
-      })
-  return response
-
-  } else {
-    throw new Error("User declined request");
-  }
-};
-
-export const buyNameRequest = async (data, isFromExtension) => {
-  const requiredFields = ["nameForSale"];
-  const missingFields: string[] = [];
-  requiredFields.forEach((field) => {
-    if (data[field] !== undefined && data[field] !== null) {
-      missingFields.push(field);
-    }
-  });
-  if (missingFields.length > 0) {
-    const missingFieldsString = missingFields.join(", ");
-    const errorMsg = `Missing fields: ${missingFieldsString}`;
-    throw new Error(errorMsg);
-  }
-  const name = data.nameForSale
-
-  const validApi = await getBaseApi();
-  
-      const response = await fetch(validApi + "/names/" + name);
-      const nameData = await response.json();
-  if(!nameData?.isForSale) throw new Error("This name is not for sale")
-  const sellerAddress = nameData.owner
-  const sellPrice = +nameData.salePrice
-  
-
-  const fee = await getFee("BUY_NAME");
-  const resPermission = await getUserPermission(
-    {
-      text1: `Do you give this application permission to buy a name?`,
-      highlightedText: `Buying ${name} for ${sellPrice} QORT`,
-      fee: fee.fee,
-    },
-    isFromExtension
-  );
-  const { accepted } = resPermission;
-  if (accepted) {
-  const response = await buyName({
-        name,
-        sellerAddress,
-        sellPrice
-      })
-  return response
-
-  } else {
-    throw new Error("User declined request");
-  }
-};

src/transactions/BuyNameTransacion.ts

@@ -1,45 +0,0 @@
-// @ts-nocheck
-
-import { QORT_DECIMALS } from "../constants/constants"
-import TransactionBase from "./TransactionBase"
-
-
-export default class BuyNameTransacion extends TransactionBase {
-	constructor() {
-		super()
-		this.type = 7
-	}
-
-	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 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
-	}
-
-	get params() {
-		const params = super.params
-		params.push(
-			this._nameLength,
-			this._nameBytes,
-			this._sellPriceBytes,
-			this._recipient,
-			this._feeBytes
-		)
-		return params
-	}
-}

src/transactions/CancelSellNameTransacion.ts

@@ -1,33 +0,0 @@
-// @ts-nocheck
-
-import { QORT_DECIMALS } from "../constants/constants"
-import TransactionBase from "./TransactionBase"
-
-
-export default class CancelSellNameTransacion extends TransactionBase {
-	constructor() {
-		super()
-		this.type = 6
-	}
-
-	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)
-	}
-
-	get params() {
-		const params = super.params
-		params.push(
-			this._nameLength,
-			this._nameBytes,
-			this._feeBytes
-		)
-		return params
-	}
-}

src/transactions/SellNameTransacion.ts

@@ -1,40 +0,0 @@
-// @ts-nocheck
-
-import { QORT_DECIMALS } from "../constants/constants"
-import TransactionBase from "./TransactionBase"
-
-
-export default class SellNameTransacion extends TransactionBase {
-	constructor() {
-		super()
-		this.type = 5
-	}
-
-	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 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
-	}
-}

src/transactions/UpdateGroupTransaction.ts

@@ -1,62 +0,0 @@
-// @ts-nocheck
-
-
-import { QORT_DECIMALS } from "../constants/constants";
-import TransactionBase from "./TransactionBase";
-
-export default class UpdateGroupTransaction extends TransactionBase {
-    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 _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
-    }
-}

src/transactions/transactions.ts

@@ -20,25 +20,17 @@ 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'
 
 export const transactionTypes = {
 	3: RegisterNameTransaction,
 	4: UpdateNameTransaction,
 	2: PaymentTransaction,
-	5: SellNameTransacion,
-	6: CancelSellNameTransacion,
-	7: BuyNameTransacion,
 	8: CreatePollTransaction,
 	9: VoteOnPollTransaction,
 	16: DeployAtTransaction,
 	18: ChatTransaction,
 	181: GroupChatTransaction,
 	22: CreateGroupTransaction,
-	23: UpdateGroupTransaction,
 	24: AddGroupAdminTransaction,
 	25: RemoveGroupAdminTransaction,
 	26: GroupBanTransaction,