From d9104ea044ee7fba9f0e2c75d9fe7437596613fb Mon Sep 17 00:00:00 2001
From: Aditya Anand M C <aditya.anandmc@gmail.com>
Date: Mon, 27 Jan 2025 10:56:39 +0530
Subject: [PATCH 1/4] fix apply

---
 packages/common/.env.test | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/common/.env.test b/packages/common/.env.test
index 1b85c49269..ea61df1c53 100644
--- a/packages/common/.env.test
+++ b/packages/common/.env.test
@@ -1,5 +1,4 @@
 REACT_APP_GRANTS_STACK_SEARCH_API_BASE_URL="https://gitcoin-search-dev.fly.dev"
-REACT_APP_ALLO_API_URL="https://grants-stack-indexer-v2.gitcoin.co/graphql"
 REACT_APP_PINATA_JWT=token-test
 REACT_APP_PINATA_BASE_URL=http://localhost
 REACT_APP_PASSPORT_API_KEY="test-key"

From 63c765efd3e75aadd44a6f137a81b6747363fbd8 Mon Sep 17 00:00:00 2001
From: Aditya Anand M C <aditya.anandmc@gmail.com>
Date: Mon, 27 Jan 2025 12:28:48 +0530
Subject: [PATCH 2/4] fix index

---
 packages/builder/src/utils/roundApplication.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/utils/roundApplication.ts b/packages/builder/src/utils/roundApplication.ts
index c3b5778cfb..1ad17e2567 100644
--- a/packages/builder/src/utils/roundApplication.ts
+++ b/packages/builder/src/utils/roundApplication.ts
@@ -72,15 +72,15 @@ export const parseRoundApplicationMetadata = (
     );
 
   metadata.applicationSchema.questions = [
+    ...metadata.applicationSchema.questions,
     {
-      id: metadata.applicationSchema.questions.length,
+      id: metadata.applicationSchema.questions.length + 1,
       type: "project",
     },
     {
-      id: metadata.applicationSchema.questions.length + 1,
+      id: metadata.applicationSchema.questions.length + 2,
       type: "recipient",
     },
-    ...metadata.applicationSchema.questions,
   ];
 
   return metadata;

From f28525e03ade1c1d8a2743c79bbb3c786601bb97 Mon Sep 17 00:00:00 2001
From: Aditya Anand M C <aditya.anandmc@gmail.com>
Date: Mon, 27 Jan 2025 12:34:02 +0530
Subject: [PATCH 3/4] make it foolproof

---
 packages/builder/src/utils/roundApplication.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/builder/src/utils/roundApplication.ts b/packages/builder/src/utils/roundApplication.ts
index 1ad17e2567..765af37d87 100644
--- a/packages/builder/src/utils/roundApplication.ts
+++ b/packages/builder/src/utils/roundApplication.ts
@@ -56,8 +56,6 @@ export const parseRoundApplicationMetadata = (
     };
   }
 
-  // const [major, minor, patch] = object.version.split(".").map(Number);
-  //
   metadata.applicationSchema.questions =
     metadata.applicationSchema.questions.map(
       (q: any): RoundApplicationQuestion => ({
@@ -71,14 +69,18 @@ export const parseRoundApplicationMetadata = (
       })
     );
 
+  const maxId = Math.max(
+    ...metadata.applicationSchema.questions.map((q) => q.id)
+  );
+
   metadata.applicationSchema.questions = [
     ...metadata.applicationSchema.questions,
     {
-      id: metadata.applicationSchema.questions.length + 1,
+      id: maxId + 1,
       type: "project",
     },
     {
-      id: metadata.applicationSchema.questions.length + 2,
+      id: maxId + 2,
       type: "recipient",
     },
   ];

From 4ad05a46ba77301044544018efa03e3b5048e35e Mon Sep 17 00:00:00 2001
From: Aditya Anand M C <aditya.anandmc@gmail.com>
Date: Mon, 27 Jan 2025 12:37:01 +0530
Subject: [PATCH 4/4] fix

---
 packages/builder/src/utils/roundApplication.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/utils/roundApplication.ts b/packages/builder/src/utils/roundApplication.ts
index 765af37d87..71561fc110 100644
--- a/packages/builder/src/utils/roundApplication.ts
+++ b/packages/builder/src/utils/roundApplication.ts
@@ -74,7 +74,6 @@ export const parseRoundApplicationMetadata = (
   );
 
   metadata.applicationSchema.questions = [
-    ...metadata.applicationSchema.questions,
     {
       id: maxId + 1,
       type: "project",
@@ -83,6 +82,7 @@ export const parseRoundApplicationMetadata = (
       id: maxId + 2,
       type: "recipient",
     },
+    ...metadata.applicationSchema.questions,
   ];
 
   return metadata;