Merge pull request #1111 from Giveth/merge_master_to_staging

Merge master to staging
Giveth · Aug 31, 2023 · 77b526f · 77b526f
2 parents 74599a3 + 6d74546
commit 77b526f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/develop-pipeline.yml b/.github/workflows/develop-pipeline.yml
@@ -7,7 +7,6 @@ on:
   pull_request:
     branches:
       - develop
-
 jobs:
   test:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/master-pipeline.yml b/.github/workflows/master-pipeline.yml
@@ -7,7 +7,6 @@ on:
   pull_request:
     branches:
       - master
-
 jobs:
   test:
     runs-on: ubuntu-latest

diff --git a/src/services/donationService.ts b/src/services/donationService.ts
@@ -317,10 +317,6 @@ export const syncDonationStatusWithBlockchainNetwork = async (params: {
     }
     await donation.save();
 
-    // Update materialized view for project and qfRound data
-    await refreshProjectEstimatedMatchingView();
-    await refreshProjectDonationSummaryView();
-
     // ONLY verified donations should be accumulated
     // After updating, recalculate user total donated and owner total received
     await updateUserTotalDonated(donation.userId);
@@ -332,6 +328,10 @@ export const syncDonationStatusWithBlockchainNetwork = async (params: {
       donation,
     });
 
+    // Update materialized view for project and qfRound data
+    await refreshProjectEstimatedMatchingView();
+    await refreshProjectDonationSummaryView();
+
     // send chainvine the referral as last step to not interrupt previous
     if (donation.referrerWallet && donation.isReferrerGivbackEligible) {
       logger.info(
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,6 @@ on: @@
       pull_request:
         branches:
           - develop
     jobs:
       test:
         runs-on: ubuntu-latest
@@ Expand Down @@