merge master into staging

src/provider.ts

@@ -121,13 +121,46 @@ export const superTokens = [
     underlyingToken: {
       decimals: 6,
       id: '0x7f5c764cbc14f9669b88837ca1490cca17c31607',
+      name: 'Bridged USD Coin',
+      symbol: 'USDC.e',
+      coingeckoId: 'usd-coin',
+    },
+    decimals: 18,
+    id: '0x8430f084b939208e2eded1584889c9a66b90562f',
+    name: 'Super Bridged USD Coin',
+    symbol: 'USDC.ex',
+    isSuperToken: true,
+    coingeckoId: 'usd-coin',
+  },
+  {
+    underlyingToken: {
+      decimals: 6,
+      id: '0x0b2c639c533813f4aa9d7837caf62653d097ff85',
       name: 'USD Coin',
       symbol: 'USDC',
+      coingeckoId: 'usd-coin',
     },
     decimals: 18,
-    id: '0x8430f084b939208e2eded1584889c9a66b90562f',
+    id: '0x35Adeb0638EB192755B6E52544650603Fe65A006',
     name: 'Super USD Coin',
     symbol: 'USDCx',
+    isSuperToken: true,
+    coingeckoId: 'usd-coin',
+  },
+  {
+    underlyingToken: {
+      decimals: 18,
+      id: '0x4F604735c1cF31399C6E711D5962b2B3E0225AD3',
+      name: 'Glo Dollar',
+      symbol: 'USDGLO',
+      coingeckoId: 'glo-dollar',
+    },
+    decimals: 18,
+    id: '0x9F41d0AA24E599fd8D0c180Ee3C0F609dc41c622',
+    name: 'Super Glo Dollar',
+    symbol: 'USDGLOx',
+    isSuperToken: true,
+    coingeckoId: 'glo-dollar',
   },
 ];
 

src/repositories/projectRepository.ts

@@ -215,7 +215,10 @@ export const filterProjectsQuery = (params: FilterProjectQueryInputParams) => {
           'projectInstantPower.totalPower',
           OrderDirection.DESC,
           'NULLS LAST',
-        );
+        )
+        .addOrderBy('project.isGivbackEligible', 'DESC') // Primary sorting condition
+        .addOrderBy('project.verified', 'DESC'); // Secondary sorting condition
+
       if (isFilterByQF) {
         query.addOrderBy(
           'project.sumDonationValueUsdForActiveQfRound',

src/resolvers/projectResolver.allProject.test.ts

@@ -550,12 +550,25 @@ function allProjectsTestCases() {
     const user1 = await saveUserDirectlyToDb(generateRandomEtheriumAddress());
     const user2 = await saveUserDirectlyToDb(generateRandomEtheriumAddress());
 
-    const project1 = await saveProjectDirectlyToDb(createProjectData());
-    const project2 = await saveProjectDirectlyToDb(createProjectData());
-    const project3 = await saveProjectDirectlyToDb(createProjectData());
+    const project1 = await saveProjectDirectlyToDb({
+      ...createProjectData(),
+      verified: true,
+      isGivbackEligible: true,
+    });
+    const project2 = await saveProjectDirectlyToDb({
+      ...createProjectData(),
+      verified: true,
+      isGivbackEligible: false,
+    });
+    const project3 = await saveProjectDirectlyToDb({
+      ...createProjectData(),
+      verified: true,
+      isGivbackEligible: true,
+    });
     const project4 = await saveProjectDirectlyToDb({
       ...createProjectData(),
       verified: false,
+      isGivbackEligible: false,
     }); // Not boosted -Not verified project
     await saveProjectDirectlyToDb(createProjectData()); // Not boosted project
 

src/server/adminJs/tabs/projectsTab.test.ts

@@ -35,12 +35,12 @@ import {
   addFeaturedProjectUpdate,
   exportProjectsWithFiltersToCsv,
   listDelist,
+  revokeGivbacksEligibility,
   updateStatusOfProjects,
   verifyProjects,
 } from './projectsTab';
 import { messages } from '../../../utils/messages';
 import { ProjectStatus } from '../../../entities/projectStatus';
-import { revokeGivbacksEligibility } from './projectVerificationTab';
 
 describe(
   'verifyMultipleProjects() test cases',

src/server/adminJs/tabs/projectsTab.ts

@@ -12,6 +12,7 @@ import {
   ProjectUpdate,
   ProjStatus,
   ReviewStatus,
+  RevokeSteps,
 } from '../../../entities/project';
 import { canAccessProjectAction, ResourceActions } from '../adminJsPermissions';
 import {
@@ -183,6 +184,60 @@ export const addFeaturedProjectUpdate = async (
   };
 };
 
+export const revokeGivbacksEligibility = async (
+  context: AdminJsContextInterface,
+  request: AdminJsRequestInterface,
+) => {
+  const { records, currentAdmin } = context;
+  try {
+    const projectIds = request?.query?.recordIds
+      ?.split(',')
+      ?.map(strId => Number(strId)) as number[];
+    const updateParams = { isGivbackEligible: false };
+    const projects = await Project.createQueryBuilder('project')
+      .update<Project>(Project, updateParams)
+      .where('project.id IN (:...ids)')
+      .setParameter('ids', projectIds)
+      .returning('*')
+      .updateEntity(true)
+      .execute();
+
+    for (const project of projects.raw) {
+      const projectWithAdmin = (await findProjectById(project.id)) as Project;
+      projectWithAdmin.verificationStatus = RevokeSteps.Revoked;
+      await projectWithAdmin.save();
+      await getNotificationAdapter().projectBadgeRevoked({
+        project: projectWithAdmin,
+      });
+      const verificationForm = await getVerificationFormByProjectId(project.id);
+      if (verificationForm) {
+        await makeFormDraft({
+          formId: verificationForm.id,
+          adminId: currentAdmin.id,
+        });
+      }
+    }
+    await Promise.all([
+      refreshUserProjectPowerView(),
+      refreshProjectPowerView(),
+      refreshProjectFuturePowerView(),
+    ]);
+  } catch (error) {
+    logger.error('revokeGivbacksEligibility() error', error);
+    throw error;
+  }
+  return {
+    redirectUrl: '/admin/resources/Project',
+    records: records.map(record => {
+      record.toJSON(context.currentAdmin);
+    }),
+    notice: {
+      message: 'Project(s) successfully revoked from Givbacks eligibility',
+      type: 'success',
+    },
+  };
+};
+
 export const verifyProjects = async (
   context: AdminJsContextInterface,
   request: AdminJsRequestInterface,

src/utils/validators/projectValidator.test.ts

@@ -29,7 +29,9 @@ describe(
 );
 // describe('validateProjectTitleForEdit() test cases', validateProjectTitleForEditTestCases);
 describe('validateProjectTitleTestCases', validateProjectTitleTestCases);
-describe(
+
+// It's failing because of network issues, so I skip them temporarily
+describe.skip(
   'isWalletAddressSmartContract() test cases',
   isWalletAddressSmartContractTestCases,
 );

test/pre-test-scripts.ts

@@ -40,9 +40,9 @@ import { ProjectActualMatchingViewV161717646612482 } from '../migration/17176466
 import { LastSnapshotProjectPowerViewV21717648491606 } from '../migration/1717648491606-LastSnapshotProjectPowerView_V2';
 import { ProjectFuturePowerViewV21717643016553 } from '../migration/1717643016553-ProjectFuturePowerView_V2';
 import { ProjectUserInstantPowerViewV21717644442966 } from '../migration/1717644442966-ProjectUserInstantPowerView_V2';
-import { ProjectInstantPowerViewV21717648653115 } from '../migration/1717648653115-ProjectInstantPowerView_V2';
 import { UserProjectPowerViewV21717645768886 } from '../migration/1717645768886-UserProjectPowerView_V2';
 import { ProjectGivbackRankViewV31725260193333 } from '../migration/1725260193333-projectGivbackRankView';
+import { ProjectInstantPowerViewV31724223781248 } from '../migration/1724223781248-ProjectInstantPowerViewV3';
 
 async function seedDb() {
   await seedUsers();
@@ -538,7 +538,7 @@ async function runMigrations() {
       queryRunner,
     );
     await new createOrganisatioTokenTable1646302349926().up(queryRunner);
-    await new ProjectInstantPowerViewV21717648653115().up(queryRunner);
+    await new ProjectInstantPowerViewV31724223781248().up(queryRunner);
     await new ProjectEstimatedMatchingViewV21717646357435().up(queryRunner);
     await new ProjectUserInstantPowerViewV21717644442966().up(queryRunner);
     await new TakePowerBoostingSnapshotProcedureSecondVersion1690723242749().up(