resolved conflicts

Signed-off-by: bhavanakarwade <[email protected]>

src/api/Auth.ts

@@ -308,4 +308,4 @@ export const getFromCookies = (cookies: AstroCookies, key: string) =>{
 export const removeFromLocalStorage = async (key: string) => {
 	await localStorage.removeItem(key);
 	return true;
-};
+};

src/components/AddOrganizationInEcosystem.tsx

@@ -353,7 +353,6 @@ const AddOrganizationInEcosystem = () => {
 			await removeFromLocalStorage(storageKeys.ERROR_ORG_IN_ECOSYSTEM);
 		})()
 	}, [])
-
 
 	useEffect(() => {
 		(async () => {

src/components/Issuance/Issuance.tsx

@@ -83,7 +83,6 @@ const IssueCred = () => {
 				attributes: attributesArray,
 			};
 		});
-
 		const issuancePayload = {
 			credentialData,
 			credentialDefinitionId: credDefId,
@@ -93,7 +92,7 @@ const IssueCred = () => {
 		setIssuanceFormPayload(issuancePayload);
 		setUserLoader(false);
 	};
-
+	
 	const createAttributeValidationSchema = (
 		name: string,
 		value: string,
@@ -139,7 +138,6 @@ const IssueCred = () => {
 		const schemaAttributes = await getFromLocalStorage(storageKeys.SCHEMA_ATTR);
 
 		const parsedSchemaAttributes = JSON.parse(schemaAttributes) || [];
-
 		setSchemaAttributesDetails(parsedSchemaAttributes?.attribute);
 
 		return parsedSchemaAttributes.attribute;
@@ -179,12 +177,11 @@ const IssueCred = () => {
 		const convertedAttributesValues = {
 			...issuancePayload,
 		};
-
+	
 		setIssuanceLoader(true);
 		const issueCredRes = await issueCredential(convertedAttributesValues);
-
 		const { data } = issueCredRes as AxiosResponse;
-
+	
 		if (data?.statusCode === apiStatusCodes.API_STATUS_CREATED) {
 			setSuccess(data?.message);
 			window.location.href = `${pathRoutes.organizations.issuedCredentials}`;
@@ -195,7 +192,7 @@ const IssueCred = () => {
 			setIssuanceLoader(false);
 		}
 	};
-
+	
 	return (
 		<div className="px-4 pt-2">
 			<div className="mb-4 col-span-full xl:mb-2">

src/components/organization/EditOrgdetailsModal.tsx

@@ -14,7 +14,7 @@ import type { EditOrgdetailsModalProps, ILogoImage, Organisation, Values } from
 import { processImage } from '../../utils/processImage';
 import FormikErrorMessage from '../../commonComponents/formikerror/index'
 import CustomSpinner from '../CustomSpinner';
-
+	
 interface IUpdateOrgPayload {
 	orgId: string | undefined;
 	name: string;

src/components/organization/OrganizationDetails.tsx

@@ -241,4 +241,4 @@ const OrganizationDetails = ({ orgData }: { orgData: Organisation | null }) => {
 	);
 };
 
-export default OrganizationDetails;
+export default OrganizationDetails;

src/components/organization/interfaces/index.ts

@@ -222,7 +222,6 @@ export interface IFormikValues {
 	privatekey: string;
 	endorserDid: string;
 }
-
 export interface IDedicatedAgentConfig {
 	walletName: string;
 	agentEndpoint: string;
@@ -250,7 +249,6 @@ export interface ILedgerItem {
     deletedAt: string | null;
   }
 
-
   export interface IOrgCount {
     verificationRecordsCount: number;
     connectionRecordsCount: number;

src/components/organization/invitations/ReceivedInvitations.tsx

@@ -1,4 +1,4 @@
-import { Button, Card, Pagination } from 'flowbite-react';
+import { Button, Pagination } from 'flowbite-react';
 import { useEffect, useState } from 'react';
 import type { ChangeEvent } from 'react';
 
@@ -33,7 +33,6 @@ const ReceivedInvitations = () => {
 	const [error, setError] = useState<string | null>(null);
 
 	const [currentPage, setCurrentPage] = useState(initialPageState);
-	const timestamp = Date.now();
 
 	const onPageChange = (page: number) => {
 		setCurrentPage({

src/components/organization/walletCommonComponents/WalletSpinup.tsx

@@ -1,5 +1,5 @@
 import { apiStatusCodes, storageKeys } from '../../../config/CommonConstant';
-import { getFromLocalStorage, passwordEncryption } from '../../../api/Auth';
+import { getFromLocalStorage } from '../../../api/Auth';
 import {
 	createDid,
 	getOrganizationById,
@@ -17,7 +17,6 @@ import DedicatedAgentForm from '../walletCommonComponents/DedicatedAgent';
 import SharedAgentForm from './SharedAgent';
 import WalletSteps from './WalletSteps';
 import type { IValuesShared } from './interfaces';
-import React from 'react';
 import OrganizationDetails from '../OrganizationDetails';
 import type { Organisation } from '../interfaces';
 
@@ -49,8 +48,7 @@ const WalletSpinup = (props: {
 	const [orgData, setOrgData] = useState<Organisation | null>(null);
 	const [isShared, setIsShared] = useState<boolean>(false);
 	const [isConfiguredDedicated, setIsConfiguredDedicated] = useState<boolean>(false);
-
-
+
 	const maskSeeds = (seed: string) => {
 		const visiblePart = seed.slice(0, -10);
 		const maskedPart = seed.slice(-10).replace(/./g, '*');
@@ -92,7 +90,7 @@ const WalletSpinup = (props: {
 	useEffect(() => {
        fetchOrganizationDetails()
     }, []);
-
+		
 	const onRadioSelect = (type: string) => {
 		setAgentType(type);
 	};