fix: resolved conflicts

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

.github/workflows/deploy-qa.yml

@@ -17,6 +17,13 @@ jobs:
       - name: Clone repository
         uses: actions/checkout@v3
 
+
+      - name: Install Deno
+        uses: denoland/setup-deno@v1
+        with:
+          deno-version: v1.x
+
+
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:

src/components/Verification/VerificationSchemasList.tsx

@@ -396,4 +396,4 @@ const VerificationSchemasList = () => {
 	);
 };
 
-export default VerificationSchemasList;
+export default VerificationSchemasList;

src/components/organization/Dashboard.tsx

@@ -39,6 +39,8 @@ const Dashboard = () => {
 	const [ecoCount, setEcoCount] = useState(0);
 	const [error, setError] = useState<string | null>(null);
 	const [redirectToEndorsment, setRedirectToEndorsment] = useState<boolean>();
+	const [ecosystemUserRoles, setEcosystemUserRoles] = useState<string>('');
+
 
 
 	const EditOrgDetails = () => {
@@ -91,7 +93,6 @@ const Dashboard = () => {
 		}
 		setLoading(false);
 	};
-
 
 	const fetchEcosystems = async () => {
 		let organizationId = await getFromLocalStorage(storageKeys.ORG_ID);
@@ -349,4 +350,4 @@ const Dashboard = () => {
 	);
 };
 
-export default Dashboard;
+export default Dashboard;

src/components/organization/DeleteOrganization.tsx

@@ -307,11 +307,13 @@ const DeleteOrganizations = () => {
           setError(null);
         }}
       />
+
 {ecosystemRoles.length > 0 &&
         <h2 className="mb-4 dark:text-white">
           You are Ecosystem Lead for <strong>{ecosystemRoles.join(', ')}</strong>. You cannot remove yourself from the ecosystem, delete the organization's wallet, and delete your organization.
         </h2>
       }
+
       {organizationData && (
         <div>
           {cardData.map((card, index) => (

src/components/organization/interfaces/index.ts

@@ -240,6 +240,7 @@ export interface ILedgerItem {
     deletedAt: string | null;
   }
 
+
   export interface IOrgCount {
     verificationRecordsCount: number;
     connectionRecordsCount: number;
@@ -265,4 +266,4 @@ export interface ILedgerItem {
     createDateTime: string;
     lastChangedDateTime: string;
     deletedAt: string | null;
-  }
+  }