From 7f4c6a6322112539f1637226587b30e50908472c Mon Sep 17 00:00:00 2001
From: HARALD <danddycandy@gmail.com>
Date: Fri, 14 Jul 2023 02:47:22 +0900
Subject: [PATCH 01/16] feat: add assign_command_enabled config

---
 src/configs/shared.ts                   |  1 +
 src/configs/strings.ts                  |  1 +
 src/handlers/assign/auto.ts             |  3 +++
 src/handlers/comment/handlers/assign.ts | 10 ++++++++--
 src/handlers/comment/handlers/help.ts   |  4 +++-
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/configs/shared.ts b/src/configs/shared.ts
index 65d499402..b59f1e753 100644
--- a/src/configs/shared.ts
+++ b/src/configs/shared.ts
@@ -7,6 +7,7 @@ export const COLORS = {
 export const DEFAULT_BOT_DELAY = 100; // 100ms
 export const DEFAULT_TIME_RANGE_FOR_MAX_ISSUE = 24;
 export const DEFAULT_TIME_RANGE_FOR_MAX_ISSUE_ENABLED = true;
+export const ASSIGN_COMMAND_ENABLED = true;
 /**
  * ms('2 days')  // 172800000
  * ms('1d')      // 86400000
diff --git a/src/configs/strings.ts b/src/configs/strings.ts
index ef96a0f2b..83ef907fb 100644
--- a/src/configs/strings.ts
+++ b/src/configs/strings.ts
@@ -1,4 +1,5 @@
 export const GLOBAL_STRINGS = {
   unassignComment: "Releasing the bounty back to dev pool because the allocated duration already ended!",
   askUpdate: "Do you have any updates",
+  assignCommandDisabledComment: "`/assign` command is disabled.",
 };
diff --git a/src/handlers/assign/auto.ts b/src/handlers/assign/auto.ts
index bc11cc48e..1643d1771 100644
--- a/src/handlers/assign/auto.ts
+++ b/src/handlers/assign/auto.ts
@@ -1,4 +1,5 @@
 import { getBotContext, getLogger } from "../../bindings";
+import { ASSIGN_COMMAND_ENABLED } from "../../configs";
 import { addAssignees, getIssueByNumber, getPullRequests } from "../../helpers";
 import { gitLinkedIssueParser } from "../../helpers/parser";
 import { Payload } from "../../types";
@@ -9,6 +10,8 @@ export const checkPullRequests = async () => {
   const logger = getLogger();
   const pulls = await getPullRequests(context);
 
+  if (ASSIGN_COMMAND_ENABLED) return;
+
   if (pulls.length === 0) {
     logger.debug(`No pull requests found at this time`);
     return;
diff --git a/src/handlers/comment/handlers/assign.ts b/src/handlers/comment/handlers/assign.ts
index af0759fd7..9c2930c74 100644
--- a/src/handlers/comment/handlers/assign.ts
+++ b/src/handlers/comment/handlers/assign.ts
@@ -1,10 +1,11 @@
-import { addAssignees, getAssignedIssues, getCommentsOfIssue, getAvailableOpenedPullRequests } from "../../../helpers";
+import { addAssignees, getAssignedIssues, getCommentsOfIssue, getAvailableOpenedPullRequests, addCommentToIssue } from "../../../helpers";
 import { getBotConfig, getBotContext, getLogger } from "../../../bindings";
 import { Payload, LabelItem, Comment, IssueType } from "../../../types";
 import { deadLinePrefix } from "../../shared";
 import { getWalletAddress, getWalletMultiplier, getMultiplierReason } from "../../../adapters/supabase";
 import { tableComment } from "./table";
 import { bountyInfo } from "../../wildcard";
+import { ASSIGN_COMMAND_ENABLED, GLOBAL_STRINGS } from "../../../configs";
 
 export const assign = async (body: string) => {
   const { payload: _payload } = getBotContext();
@@ -19,6 +20,12 @@ export const assign = async (body: string) => {
     return "Skipping '/assign' because of no issue instance";
   }
 
+  if (!ASSIGN_COMMAND_ENABLED) {
+    logger.info(`Ignore '/assign' command from user: ASSIGN_COMMAND_ENABLED config is set false`);
+    await addCommentToIssue(GLOBAL_STRINGS.assignCommandDisabledComment, issue.number);
+    return;
+  }
+
   const openedPullRequests = await getAvailableOpenedPullRequests(payload.sender.login);
   logger.info(`Opened Pull Requests with no reviews but over 24 hours have passed: ${JSON.stringify(openedPullRequests)}`);
 
@@ -91,7 +98,6 @@ export const assign = async (body: string) => {
     <ul>`,
   };
 
-
   if (!assignees.map((i) => i.login).includes(payload.sender.login)) {
     logger.info(`Adding the assignee: ${payload.sender.login}`);
     await addAssignees(issue.number, [payload.sender.login]);
diff --git a/src/handlers/comment/handlers/help.ts b/src/handlers/comment/handlers/help.ts
index 84764c00b..70cd5d825 100644
--- a/src/handlers/comment/handlers/help.ts
+++ b/src/handlers/comment/handlers/help.ts
@@ -1,5 +1,6 @@
 import { userCommands } from ".";
 import { getBotContext, getLogger } from "../../../bindings";
+import { ASSIGN_COMMAND_ENABLED } from "../../../configs";
 import { IssueType, Payload } from "../../../types";
 import { IssueCommentCommands } from "../commands";
 
@@ -33,6 +34,7 @@ export const generateHelpMenu = () => {
     // if first command, add a new line
     if (command.id === userCommands[0].id) {
       helpMenu += `\n`;
+      if (!ASSIGN_COMMAND_ENABLED) return;
     }
     helpMenu += `- ${command.id}: ${command.description}`;
     // if not last command, add a new line (fixes too much space below)
@@ -41,6 +43,6 @@ export const generateHelpMenu = () => {
     }
   });
 
-  helpMenu += "```";
+  if (!ASSIGN_COMMAND_ENABLED) helpMenu += "```\n***_To assign yourself to this issue, you should open a draft pull request that is linked._***";
   return helpMenu;
 };

From e7dcc778ace59ff972c61bba23be89875180549e Mon Sep 17 00:00:00 2001
From: Wanna C The Future! <danddycandy@gmail.com>
Date: Fri, 14 Jul 2023 14:39:41 +0900
Subject: [PATCH 02/16] Update src/handlers/comment/handlers/help.ts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: アレクサンダー.eth <4975670+pavlovcik@users.noreply.github.com>
---
 src/handlers/comment/handlers/help.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/handlers/comment/handlers/help.ts b/src/handlers/comment/handlers/help.ts
index 70cd5d825..815e8fa79 100644
--- a/src/handlers/comment/handlers/help.ts
+++ b/src/handlers/comment/handlers/help.ts
@@ -43,6 +43,6 @@ export const generateHelpMenu = () => {
     }
   });
 
-  if (!ASSIGN_COMMAND_ENABLED) helpMenu += "```\n***_To assign yourself to this issue, you should open a draft pull request that is linked._***";
+  if (!ASSIGN_COMMAND_ENABLED) helpMenu += "```\n***_To assign yourself to an issue, please open a draft pull request that is linked to it._***";
   return helpMenu;
 };

From 7117195646fd5653e23be1248b20f010833c83e1 Mon Sep 17 00:00:00 2001
From: Wanna C The Future! <danddycandy@gmail.com>
Date: Fri, 14 Jul 2023 14:39:51 +0900
Subject: [PATCH 03/16] Update src/configs/strings.ts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: アレクサンダー.eth <4975670+pavlovcik@users.noreply.github.com>
---
 src/configs/strings.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/configs/strings.ts b/src/configs/strings.ts
index 83ef907fb..9bc705a20 100644
--- a/src/configs/strings.ts
+++ b/src/configs/strings.ts
@@ -1,5 +1,5 @@
 export const GLOBAL_STRINGS = {
   unassignComment: "Releasing the bounty back to dev pool because the allocated duration already ended!",
   askUpdate: "Do you have any updates",
-  assignCommandDisabledComment: "`/assign` command is disabled.",
+  assignCommandDisabledComment: "The `/assign` command is disabled for this repository.",
 };

From 42e0993568c09aa3e84c97bd64a9e100df0f883d Mon Sep 17 00:00:00 2001
From: Wanna C The Future! <danddycandy@gmail.com>
Date: Fri, 14 Jul 2023 15:17:05 +0900
Subject: [PATCH 04/16] Update auto.ts

---
 src/handlers/assign/auto.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/handlers/assign/auto.ts b/src/handlers/assign/auto.ts
index 1643d1771..b09808ff6 100644
--- a/src/handlers/assign/auto.ts
+++ b/src/handlers/assign/auto.ts
@@ -10,8 +10,6 @@ export const checkPullRequests = async () => {
   const logger = getLogger();
   const pulls = await getPullRequests(context);
 
-  if (ASSIGN_COMMAND_ENABLED) return;
-
   if (pulls.length === 0) {
     logger.debug(`No pull requests found at this time`);
     return;

From b751f786c2a3e545fac1f2ade4f78c5ef6541df9 Mon Sep 17 00:00:00 2001
From: Wanna C The Future! <danddycandy@gmail.com>
Date: Fri, 14 Jul 2023 15:20:22 +0900
Subject: [PATCH 05/16] feat: Update auto.ts

---
 src/handlers/assign/auto.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/handlers/assign/auto.ts b/src/handlers/assign/auto.ts
index b09808ff6..bc11cc48e 100644
--- a/src/handlers/assign/auto.ts
+++ b/src/handlers/assign/auto.ts
@@ -1,5 +1,4 @@
 import { getBotContext, getLogger } from "../../bindings";
-import { ASSIGN_COMMAND_ENABLED } from "../../configs";
 import { addAssignees, getIssueByNumber, getPullRequests } from "../../helpers";
 import { gitLinkedIssueParser } from "../../helpers/parser";
 import { Payload } from "../../types";

From 73a8c2c0f09bc6cd55ea29359a87de9b4b0c078d Mon Sep 17 00:00:00 2001
From: me505 <jainarjav886@gmail.com>
Date: Sat, 15 Jul 2023 00:48:29 +0530
Subject: [PATCH 06/16] chore: replace all 'chain' with 'network'

---
 .github/ubiquibot-config.yml |  2 +-
 src/bindings/config.ts       |  8 ++++----
 src/configs/shared.ts        |  2 +-
 src/helpers/payout.ts        | 14 +++++++-------
 src/helpers/permit.ts        |  8 ++++----
 src/types/config.ts          |  2 +-
 src/utils/helpers.ts         | 14 +++++++-------
 src/utils/private.ts         |  6 +++---
 8 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/.github/ubiquibot-config.yml b/.github/ubiquibot-config.yml
index 48a9f91c4..e40c74ee5 100644
--- a/.github/ubiquibot-config.yml
+++ b/.github/ubiquibot-config.yml
@@ -1,5 +1,5 @@
 ---
-chain-id: 100
+network-id: 100
 base-multiplier: 1500
 time-labels:
   - name: "Time: <1 Hour"
diff --git a/src/bindings/config.ts b/src/bindings/config.ts
index 05d7b64c9..369269688 100644
--- a/src/bindings/config.ts
+++ b/src/bindings/config.ts
@@ -2,7 +2,7 @@ import ms from "ms";
 
 import { BotConfig, BotConfigSchema } from "../types";
 import { DEFAULT_BOT_DELAY, DEFAULT_DISQUALIFY_TIME, DEFAULT_FOLLOWUP_TIME, DEFAULT_PERMIT_BASE_URL } from "../configs";
-import { getPayoutConfigByChainId } from "../helpers";
+import { getPayoutConfigByNetworkId } from "../helpers";
 import { ajv } from "../utils";
 import { Context } from "probot";
 import { getScalarKey, getWideConfig } from "../utils/private";
@@ -18,12 +18,12 @@ export const loadConfig = async (context: Context): Promise<BotConfig> => {
     analyticsMode,
     bountyHunterMax,
     incentiveMode,
-    chainId,
+    networkId,
     issueCreatorMultiplier,
   } = await getWideConfig(context);
 
   const publicKey = await getScalarKey(process.env.X25519_PRIVATE_KEY);
-  const { rpc, paymentToken } = getPayoutConfigByChainId(chainId);
+  const { rpc, paymentToken } = getPayoutConfigByNetworkId(networkId);
 
   const botConfig: BotConfig = {
     log: {
@@ -38,7 +38,7 @@ export const loadConfig = async (context: Context): Promise<BotConfig> => {
       commentElementPricing,
     },
     payout: {
-      chainId: chainId,
+      networkId: networkId,
       rpc: rpc,
       privateKey: privateKey,
       paymentToken: paymentToken,
diff --git a/src/configs/shared.ts b/src/configs/shared.ts
index 65d499402..ea011441d 100644
--- a/src/configs/shared.ts
+++ b/src/configs/shared.ts
@@ -24,7 +24,7 @@ export const DEFAULT_TIME_RANGE_FOR_MAX_ISSUE_ENABLED = true;
 export const DEFAULT_FOLLOWUP_TIME = "4 days"; // 4 days
 export const DEFAULT_DISQUALIFY_TIME = "7 days"; // 7 days
 
-export const DEFAULT_CHAIN_ID = 1; // ethereum
+export const DEFAULT_NETWORK_ID = 1; // ethereum
 export const DEFAULT_RPC_ENDPOINT = "https://rpc-bot.ubq.fi/v1/mainnet";
 export const DEFAULT_PERMIT_BASE_URL = "https://pay.ubq.fi";
 export const COMMAND_INSTRUCTIONS = generateHelpMenu();
diff --git a/src/helpers/payout.ts b/src/helpers/payout.ts
index 361920060..7ef127f77 100644
--- a/src/helpers/payout.ts
+++ b/src/helpers/payout.ts
@@ -16,7 +16,7 @@ import { DEFAULT_RPC_ENDPOINT } from "../configs";
 import { PayoutConfigSchema } from "../types";
 
 // available tokens for payouts
-const PAYMENT_TOKEN_PER_CHAIN: Record<string, { rpc: string; token: string }> = {
+const PAYMENT_TOKEN_PER_NETWORK: Record<string, { rpc: string; token: string }> = {
   "1": {
     rpc: DEFAULT_RPC_ENDPOINT,
     token: "0x6B175474E89094C44Da98b954EedeAC495271d0F", // DAI
@@ -27,17 +27,17 @@ const PAYMENT_TOKEN_PER_CHAIN: Record<string, { rpc: string; token: string }> =
   },
 };
 
-type PayoutConfigPartial = Omit<Static<typeof PayoutConfigSchema>, "chainId" | "privateKey" | "permitBaseUrl">;
+type PayoutConfigPartial = Omit<Static<typeof PayoutConfigSchema>, "networkId" | "privateKey" | "permitBaseUrl">;
 
 /**
- * Returns payout config for a particular chain
- * @param chainId chain id
+ * Returns payout config for a particular network
+ * @param networkId network id
  * @returns RPC URL and payment token
  */
-export const getPayoutConfigByChainId = (chainId: number): PayoutConfigPartial => {
-  const paymentToken = PAYMENT_TOKEN_PER_CHAIN[chainId.toString()];
+export const getPayoutConfigByNetworkId = (networkId: number): PayoutConfigPartial => {
+  const paymentToken = PAYMENT_TOKEN_PER_NETWORK[networkId.toString()];
   if (!paymentToken) {
-    throw new Error(`No config setup for chainId: ${chainId}`);
+    throw new Error(`No config setup for networkId: ${networkId}`);
   }
 
   return {
diff --git a/src/helpers/permit.ts b/src/helpers/permit.ts
index 290064230..de17b98eb 100644
--- a/src/helpers/permit.ts
+++ b/src/helpers/permit.ts
@@ -3,7 +3,7 @@ import { BigNumber, ethers } from "ethers";
 import { getBotConfig, getLogger } from "../bindings";
 import { keccak256, toUtf8Bytes } from "ethers/lib/utils";
 
-const PERMIT2_ADDRESS = "0x000000000022D473030F116dDEE9F6B43aC78BA3"; // same on all chains
+const PERMIT2_ADDRESS = "0x000000000022D473030F116dDEE9F6B43aC78BA3"; // same on all networks
 
 /**
  * Generates permit2 signature data with `spender` and `amountInETH`
@@ -15,7 +15,7 @@ const PERMIT2_ADDRESS = "0x000000000022D473030F116dDEE9F6B43aC78BA3"; // same on
  */
 export const generatePermit2Signature = async (spender: string, amountInEth: string, identifier: string): Promise<string> => {
   const {
-    payout: { chainId, privateKey, permitBaseUrl, rpc, paymentToken },
+    payout: { networkId, privateKey, permitBaseUrl, rpc, paymentToken },
   } = getBotConfig();
   const logger = getLogger();
   const provider = new ethers.providers.JsonRpcProvider(rpc);
@@ -35,7 +35,7 @@ export const generatePermit2Signature = async (spender: string, amountInEth: str
     deadline: MaxUint256,
   };
 
-  const { domain, types, values } = SignatureTransfer.getPermitData(permitTransferFromData, PERMIT2_ADDRESS, chainId);
+  const { domain, types, values } = SignatureTransfer.getPermitData(permitTransferFromData, PERMIT2_ADDRESS, networkId);
 
   const signature = await adminWallet._signTypedData(domain, types, values);
   const txData = {
@@ -57,7 +57,7 @@ export const generatePermit2Signature = async (spender: string, amountInEth: str
 
   const base64encodedTxData = Buffer.from(JSON.stringify(txData)).toString("base64");
 
-  const result = `${permitBaseUrl}?claim=${base64encodedTxData}&network=${chainId}`;
+  const result = `${permitBaseUrl}?claim=${base64encodedTxData}&network=${networkId}`;
   logger.info(`Generated permit2 url: ${result}`);
   return result;
 };
diff --git a/src/types/config.ts b/src/types/config.ts
index 56d48079a..3862e783d 100644
--- a/src/types/config.ts
+++ b/src/types/config.ts
@@ -30,7 +30,7 @@ export const TelegramBotConfigSchema = Type.Object({
 });
 
 export const PayoutConfigSchema = Type.Object({
-  chainId: Type.Number(),
+  networkId: Type.Number(),
   rpc: Type.String(),
   privateKey: Type.String(),
   paymentToken: Type.String(),
diff --git a/src/utils/helpers.ts b/src/utils/helpers.ts
index ec8f0d57d..8c7d20626 100644
--- a/src/utils/helpers.ts
+++ b/src/utils/helpers.ts
@@ -1,14 +1,14 @@
-import { DEFAULT_CHAIN_ID, DefaultPriceConfig } from "../configs";
+import { DEFAULT_NETWORK_ID, DefaultPriceConfig } from "../configs";
 import { CommentElementPricing } from "../types";
 import { WideLabel, WideOrgConfig, WideRepoConfig } from "./private";
 
-export const getChainId = (parsedRepo: WideRepoConfig | undefined, parsedOrg: WideOrgConfig | undefined): number => {
-  if (parsedRepo && parsedRepo["chain-id"] && !Number.isNaN(Number(parsedRepo["chain-id"]))) {
-    return Number(parsedRepo["chain-id"]);
-  } else if (parsedOrg && parsedOrg["chain-id"] && !Number.isNaN(Number(parsedOrg["chain-id"]))) {
-    return Number(parsedOrg["chain-id"]);
+export const getNetworkId = (parsedRepo: WideRepoConfig | undefined, parsedOrg: WideOrgConfig | undefined): number => {
+  if (parsedRepo && parsedRepo["network-id"] && !Number.isNaN(Number(parsedRepo["network-id"]))) {
+    return Number(parsedRepo["network-id"]);
+  } else if (parsedOrg && parsedOrg["network-id"] && !Number.isNaN(Number(parsedOrg["network-id"]))) {
+    return Number(parsedOrg["network-id"]);
   } else {
-    return DEFAULT_CHAIN_ID;
+    return DEFAULT_NETWORK_ID;
   }
 };
 
diff --git a/src/utils/private.ts b/src/utils/private.ts
index ab0cab303..ae9ebc65f 100644
--- a/src/utils/private.ts
+++ b/src/utils/private.ts
@@ -9,7 +9,7 @@ import {
   getCreatorMultiplier,
   getBountyHunterMax,
   getIncentiveMode,
-  getChainId,
+  getNetworkId,
   getPriorityLabels,
   getTimeLabels,
   getCommentItemPrice,
@@ -47,7 +47,7 @@ export interface WideLabel {
 }
 
 export interface WideConfig {
-  "chain-id"?: number;
+  "network-id"?: number;
   "base-multiplier"?: number;
   "issue-creator-multiplier": number;
   "time-labels"?: WideLabel[];
@@ -126,7 +126,7 @@ export const getWideConfig = async (context: Context) => {
   const privateKeyDecrypted = parsedOrg && parsedOrg[KEY_NAME] ? await getPrivateKey(parsedOrg[KEY_NAME]) : undefined;
 
   const configData = {
-    chainId: getChainId(parsedRepo, parsedOrg),
+    networkId: getNetworkId(parsedRepo, parsedOrg),
     privateKey: privateKeyDecrypted ?? "",
     baseMultiplier: getBaseMultiplier(parsedRepo, parsedOrg),
     issueCreatorMultiplier: getCreatorMultiplier(parsedRepo, parsedOrg),

From 5f1b527c6a37020cbcd99445b80f8fc75a694003 Mon Sep 17 00:00:00 2001
From: whilefoo <whilefoo@users.noreply.github.com>
Date: Sat, 15 Jul 2023 08:35:41 +0200
Subject: [PATCH 07/16] feat: run migration job

---
 .github/workflows/build.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8843bee39..261a1c031 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,3 +23,26 @@ jobs:
 
       - name: Lint
         run: yarn lint
+
+  run-migration:
+    runs-on: ubuntu-latest
+    needs: build
+    if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/development')
+    env:
+      SUPABASE_ACCESS_TOKEN: ${{ github.ref == 'refs/heads/main' && secrets.PRODUCTION_SUPABASE_ACCESS_TOKEN || secrets.STAGING_SUPABASE_ACCESS_TOKEN }}
+      SUPABASE_DB_PASSWORD: ${{ github.ref == 'refs/heads/main' && secrets.PRODUCTION_SUPABASE_DB_PASSWORD || secrets.STAGING_SUPABASE_DB_PASSWORD }}
+      PROJECT_ID: ${{ github.ref == 'refs/heads/main' && vars.PRODUCTION_SUPABASE_PROJECT_ID || vars.STAGING_SUPABASE_PROJECT_ID }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - uses: supabase/setup-cli@v1
+        with:
+          version: latest
+
+      - name: Link Supabase project
+        run: supabase link --project-ref $PROJECT_ID
+
+      - name: Run migrations
+        run: supabase db push

From 19689aa9e8665d11f731c10de696ab2115451dcd Mon Sep 17 00:00:00 2001
From: me505 <jainarjav886@gmail.com>
Date: Sat, 15 Jul 2023 14:42:39 +0530
Subject: [PATCH 08/16] chore: replace all 'network-id' with 'evm-network-id'

---
 .github/ubiquibot-config.yml | 2 +-
 src/utils/helpers.ts         | 8 ++++----
 src/utils/private.ts         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/ubiquibot-config.yml b/.github/ubiquibot-config.yml
index e40c74ee5..b800b7a18 100644
--- a/.github/ubiquibot-config.yml
+++ b/.github/ubiquibot-config.yml
@@ -1,5 +1,5 @@
 ---
-network-id: 100
+evm-network-id: 100
 base-multiplier: 1500
 time-labels:
   - name: "Time: <1 Hour"
diff --git a/src/utils/helpers.ts b/src/utils/helpers.ts
index 8c7d20626..acc1d962f 100644
--- a/src/utils/helpers.ts
+++ b/src/utils/helpers.ts
@@ -3,10 +3,10 @@ import { CommentElementPricing } from "../types";
 import { WideLabel, WideOrgConfig, WideRepoConfig } from "./private";
 
 export const getNetworkId = (parsedRepo: WideRepoConfig | undefined, parsedOrg: WideOrgConfig | undefined): number => {
-  if (parsedRepo && parsedRepo["network-id"] && !Number.isNaN(Number(parsedRepo["network-id"]))) {
-    return Number(parsedRepo["network-id"]);
-  } else if (parsedOrg && parsedOrg["network-id"] && !Number.isNaN(Number(parsedOrg["network-id"]))) {
-    return Number(parsedOrg["network-id"]);
+  if (parsedRepo && parsedRepo["evm-network-id"] && !Number.isNaN(Number(parsedRepo["evm-network-id"]))) {
+    return Number(parsedRepo["evm-network-id"]);
+  } else if (parsedOrg && parsedOrg["evm-network-id"] && !Number.isNaN(Number(parsedOrg["evm-network-id"]))) {
+    return Number(parsedOrg["evm-network-id"]);
   } else {
     return DEFAULT_NETWORK_ID;
   }
diff --git a/src/utils/private.ts b/src/utils/private.ts
index ae9ebc65f..00d6e917a 100644
--- a/src/utils/private.ts
+++ b/src/utils/private.ts
@@ -47,7 +47,7 @@ export interface WideLabel {
 }
 
 export interface WideConfig {
-  "network-id"?: number;
+  "evm-network-id"?: number;
   "base-multiplier"?: number;
   "issue-creator-multiplier": number;
   "time-labels"?: WideLabel[];

From 5285eee7e626ddea4c9f7d9e867af6ce90305bb3 Mon Sep 17 00:00:00 2001
From: me505 <jainarjav886@gmail.com>
Date: Sun, 16 Jul 2023 23:44:43 +0530
Subject: [PATCH 09/16] docs: update description for /multiplier

---
 src/handlers/comment/handlers/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/handlers/comment/handlers/index.ts b/src/handlers/comment/handlers/index.ts
index c5fd31427..9db704275 100644
--- a/src/handlers/comment/handlers/index.ts
+++ b/src/handlers/comment/handlers/index.ts
@@ -120,7 +120,7 @@ export const userCommands: UserCommands[] = [
   },*/
   {
     id: IssueCommentCommands.MULTIPLIER,
-    description: `Set bounty multiplier (for treasury)`,
+    description: `Set bounty multiplier (for treasury) with a reason. \n  usage: "/wallet @user 0.5 'Multiplier reason'" (parameters can be given in any order)`,
     handler: multiplier,
     callback: commandCallback,
   },

From 16b2ac6759335a7f4e4491a41f1d99cd5e7670df Mon Sep 17 00:00:00 2001
From: me505 <62057938+me505@users.noreply.github.com>
Date: Mon, 17 Jul 2023 00:20:07 +0530
Subject: [PATCH 10/16] Update src/handlers/comment/handlers/index.ts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: アレクサンダー.eth <4975670+pavlovcik@users.noreply.github.com>
---
 src/handlers/comment/handlers/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/handlers/comment/handlers/index.ts b/src/handlers/comment/handlers/index.ts
index 9db704275..b6b27599a 100644
--- a/src/handlers/comment/handlers/index.ts
+++ b/src/handlers/comment/handlers/index.ts
@@ -120,7 +120,7 @@ export const userCommands: UserCommands[] = [
   },*/
   {
     id: IssueCommentCommands.MULTIPLIER,
-    description: `Set bounty multiplier (for treasury) with a reason. \n  usage: "/wallet @user 0.5 'Multiplier reason'" (parameters can be given in any order)`,
+    description: `Set the bounty payout multiplier for a specific contributor, and provide the reason for why. \n  example usage: "/wallet @user 0.5 'Multiplier reason'"`,
     handler: multiplier,
     callback: commandCallback,
   },

From 5cdd36bbad98465851011e176a4d5ef1b936689f Mon Sep 17 00:00:00 2001
From: HARALD <danddycandy@gmail.com>
Date: Mon, 17 Jul 2023 10:13:22 +0900
Subject: [PATCH 11/16] feat: consolidate promotion message

---
 src/handlers/comment/handlers/index.ts | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/handlers/comment/handlers/index.ts b/src/handlers/comment/handlers/index.ts
index c5fd31427..e2af99994 100644
--- a/src/handlers/comment/handlers/index.ts
+++ b/src/handlers/comment/handlers/index.ts
@@ -45,11 +45,8 @@ export const issueClosedCallback = async (): Promise<void> => {
   if (!issue) return;
   try {
     const comment = await handleIssueClosed();
-    if (comment) await addCommentToIssue(comment, issue.number);
-    await addCommentToIssue(
-      `If you enjoy the DevPool experience, please follow <a href="https://github.com/ubiquity">Ubiquity on GitHub</a> and star <a href="https://github.com/ubiquity/devpool-directory">this repo</a> to show your support. It helps a lot!`,
-      issue.number
-    );
+    const promotionCommnet = `\n<h6>If you enjoy the DevPool experience, please follow <a href="https://github.com/ubiquity">Ubiquity on GitHub</a> and star <a href="https://github.com/ubiquity/devpool-directory">this repo</a> to show your support. It helps a lot!</h6>`;
+    if (comment) await addCommentToIssue(comment + promotionCommnet, issue.number);
   } catch (err: unknown) {
     return await addCommentToIssue(`Error: ${err}`, issue.number);
   }

From 9f2d7402fe91e385283c235ea88a3c23738b61d0 Mon Sep 17 00:00:00 2001
From: HARALD <danddycandy@gmail.com>
Date: Mon, 17 Jul 2023 10:21:50 +0900
Subject: [PATCH 12/16] feat: minor fix

---
 src/handlers/payout/action.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/handlers/payout/action.ts b/src/handlers/payout/action.ts
index 4d33917a5..a0ffcad3c 100644
--- a/src/handlers/payout/action.ts
+++ b/src/handlers/payout/action.ts
@@ -48,7 +48,7 @@ export const handleIssueClosed = async () => {
   const multiplier = await getWalletMultiplier(assignee.login);
 
   if (multiplier === 0) {
-    const errMsg = "Refusing to generate the payment permit because" + `@${assignee.login}` + "'s payment `multiplier` is `0`";
+    const errMsg = "Refusing to generate the payment permit because " + `@${assignee.login}` + "'s payment `multiplier` is `0`";
     logger.info(errMsg);
     return errMsg;
   }

From dd97e04aeea3c693a36c151c46f8bd842f180c01 Mon Sep 17 00:00:00 2001
From: HARALD <danddycandy@gmail.com>
Date: Mon, 17 Jul 2023 11:39:49 +0900
Subject: [PATCH 13/16] feat: max-bounty-hunter improvement IV

---
 src/handlers/comment/handlers/assign.ts | 3 +--
 src/helpers/issue.ts                    | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/handlers/comment/handlers/assign.ts b/src/handlers/comment/handlers/assign.ts
index af0759fd7..5bde6df45 100644
--- a/src/handlers/comment/handlers/assign.ts
+++ b/src/handlers/comment/handlers/assign.ts
@@ -20,7 +20,7 @@ export const assign = async (body: string) => {
   }
 
   const openedPullRequests = await getAvailableOpenedPullRequests(payload.sender.login);
-  logger.info(`Opened Pull Requests with no reviews but over 24 hours have passed: ${JSON.stringify(openedPullRequests)}`);
+  logger.info(`Opened Pull Requests with approved reviews or with no reviews but over 24 hours have passed: ${JSON.stringify(openedPullRequests)}`);
 
   const assignedIssues = await getAssignedIssues(payload.sender.login);
   logger.info(`Max issue allowed is ${config.assign.bountyHunterMax}`);
@@ -91,7 +91,6 @@ export const assign = async (body: string) => {
     <ul>`,
   };
 
-
   if (!assignees.map((i) => i.login).includes(payload.sender.login)) {
     logger.info(`Adding the assignee: ${payload.sender.login}`);
     await addAssignees(issue.number, [payload.sender.login]);
diff --git a/src/helpers/issue.ts b/src/helpers/issue.ts
index 01cf8bf85..53e23bd79 100644
--- a/src/helpers/issue.ts
+++ b/src/helpers/issue.ts
@@ -415,7 +415,10 @@ export const getAvailableOpenedPullRequests = async (username: string) => {
     const pr = opened_prs[i];
     const reviews = await getAllPullRequestReviews(context, pr.number);
 
-    if (reviews.length > 0) result.push(pr);
+    if (reviews.length > 0) {
+      const approvedReviews = reviews.find((review) => review.state === "APPROVED");
+      if (approvedReviews) result.push(pr);
+    }
 
     if (reviews.length === 0 && (new Date().getTime() - new Date(pr.created_at).getTime()) / (1000 * 60 * 60) >= DEFAULT_TIME_RANGE_FOR_MAX_ISSUE) {
       result.push(pr);

From d817e4a15509b8097dd16a1ad4aec70cd53a044b Mon Sep 17 00:00:00 2001
From: HARALD <danddycandy@gmail.com>
Date: Mon, 17 Jul 2023 16:49:14 +0900
Subject: [PATCH 14/16] feat: configurable promotion message

---
 src/configs/strings.ts                 | 1 +
 src/handlers/comment/handlers/index.ts | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/configs/strings.ts b/src/configs/strings.ts
index ef96a0f2b..2d981201d 100644
--- a/src/configs/strings.ts
+++ b/src/configs/strings.ts
@@ -1,4 +1,5 @@
 export const GLOBAL_STRINGS = {
   unassignComment: "Releasing the bounty back to dev pool because the allocated duration already ended!",
   askUpdate: "Do you have any updates",
+  promotionComment: `\n<h6>If you enjoy the DevPool experience, please follow <a href="https://github.com/ubiquity">Ubiquity on GitHub</a> and star <a href="https://github.com/ubiquity/devpool-directory">this repo</a> to show your support. It helps a lot!</h6>`,
 };
diff --git a/src/handlers/comment/handlers/index.ts b/src/handlers/comment/handlers/index.ts
index e2af99994..be755e052 100644
--- a/src/handlers/comment/handlers/index.ts
+++ b/src/handlers/comment/handlers/index.ts
@@ -12,6 +12,7 @@ import { multiplier } from "./multiplier";
 import { addCommentToIssue, createLabel, addLabelToIssue } from "../../../helpers";
 import { getBotContext } from "../../../bindings";
 import { handleIssueClosed } from "../../payout";
+import { GLOBAL_STRINGS } from "../../../configs";
 
 export * from "./assign";
 export * from "./wallet";
@@ -45,8 +46,7 @@ export const issueClosedCallback = async (): Promise<void> => {
   if (!issue) return;
   try {
     const comment = await handleIssueClosed();
-    const promotionCommnet = `\n<h6>If you enjoy the DevPool experience, please follow <a href="https://github.com/ubiquity">Ubiquity on GitHub</a> and star <a href="https://github.com/ubiquity/devpool-directory">this repo</a> to show your support. It helps a lot!</h6>`;
-    if (comment) await addCommentToIssue(comment + promotionCommnet, issue.number);
+    if (comment) await addCommentToIssue(comment + GLOBAL_STRINGS.promotionComment, issue.number);
   } catch (err: unknown) {
     return await addCommentToIssue(`Error: ${err}`, issue.number);
   }

From 3a3ad05b42b89fab849c0c544eb9741d3571c627 Mon Sep 17 00:00:00 2001
From: HARALD <danddycandy@gmail.com>
Date: Mon, 17 Jul 2023 18:34:23 +0900
Subject: [PATCH 15/16] feat: configurable promotion comment

---
 .github/ubiquibot-config.yml           |  1 +
 src/bindings/config.ts                 |  4 ++++
 src/configs/strings.ts                 |  1 -
 src/handlers/comment/handlers/index.ts |  4 ++--
 src/types/config.ts                    |  5 +++++
 src/utils/helpers.ts                   | 10 ++++++++++
 src/utils/private.ts                   |  3 +++
 7 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/.github/ubiquibot-config.yml b/.github/ubiquibot-config.yml
index 48a9f91c4..1accb1ea9 100644
--- a/.github/ubiquibot-config.yml
+++ b/.github/ubiquibot-config.yml
@@ -31,3 +31,4 @@ priority-labels:
 auto-pay-mode: true
 analytics-mode: true
 max-concurrent-bounties: 2
+promotion-comment: `\n<h6>If you enjoy the DevPool experience, please follow <a href="https://github.com/ubiquity">Ubiquity on GitHub</a> and star <a href="https://github.com/ubiquity/devpool-directory">this repo</a> to show your support. It helps a lot!</h6>`
\ No newline at end of file
diff --git a/src/bindings/config.ts b/src/bindings/config.ts
index 05d7b64c9..a52ca0742 100644
--- a/src/bindings/config.ts
+++ b/src/bindings/config.ts
@@ -20,6 +20,7 @@ export const loadConfig = async (context: Context): Promise<BotConfig> => {
     incentiveMode,
     chainId,
     issueCreatorMultiplier,
+    promotionComment,
   } = await getWideConfig(context);
 
   const publicKey = await getScalarKey(process.env.X25519_PRIVATE_KEY);
@@ -37,6 +38,9 @@ export const loadConfig = async (context: Context): Promise<BotConfig> => {
       priorityLabels,
       commentElementPricing,
     },
+    comments: {
+      promotionComment: promotionComment,
+    },
     payout: {
       chainId: chainId,
       rpc: rpc,
diff --git a/src/configs/strings.ts b/src/configs/strings.ts
index 2d981201d..ef96a0f2b 100644
--- a/src/configs/strings.ts
+++ b/src/configs/strings.ts
@@ -1,5 +1,4 @@
 export const GLOBAL_STRINGS = {
   unassignComment: "Releasing the bounty back to dev pool because the allocated duration already ended!",
   askUpdate: "Do you have any updates",
-  promotionComment: `\n<h6>If you enjoy the DevPool experience, please follow <a href="https://github.com/ubiquity">Ubiquity on GitHub</a> and star <a href="https://github.com/ubiquity/devpool-directory">this repo</a> to show your support. It helps a lot!</h6>`,
 };
diff --git a/src/handlers/comment/handlers/index.ts b/src/handlers/comment/handlers/index.ts
index be755e052..067c55c37 100644
--- a/src/handlers/comment/handlers/index.ts
+++ b/src/handlers/comment/handlers/index.ts
@@ -12,7 +12,6 @@ import { multiplier } from "./multiplier";
 import { addCommentToIssue, createLabel, addLabelToIssue } from "../../../helpers";
 import { getBotContext } from "../../../bindings";
 import { handleIssueClosed } from "../../payout";
-import { GLOBAL_STRINGS } from "../../../configs";
 
 export * from "./assign";
 export * from "./wallet";
@@ -42,11 +41,12 @@ export const commentParser = (body: string): IssueCommentCommands[] => {
 
 export const issueClosedCallback = async (): Promise<void> => {
   const { payload: _payload } = getBotContext();
+  const { comments } = getBotConfig();
   const issue = (_payload as Payload).issue;
   if (!issue) return;
   try {
     const comment = await handleIssueClosed();
-    if (comment) await addCommentToIssue(comment + GLOBAL_STRINGS.promotionComment, issue.number);
+    if (comment) await addCommentToIssue(comment + comments.promotionComment, issue.number);
   } catch (err: unknown) {
     return await addCommentToIssue(`Error: ${err}`, issue.number);
   }
diff --git a/src/types/config.ts b/src/types/config.ts
index 56d48079a..795693f8b 100644
--- a/src/types/config.ts
+++ b/src/types/config.ts
@@ -62,6 +62,10 @@ export const SodiumSchema = Type.Object({
   privateKey: Type.String(),
 });
 
+export const CommentsSchema = Type.Object({
+  promotionComment: Type.String(),
+});
+
 export const BotConfigSchema = Type.Object({
   log: LogConfigSchema,
   price: PriceConfigSchema,
@@ -72,6 +76,7 @@ export const BotConfigSchema = Type.Object({
   mode: ModeSchema,
   assign: AssignSchema,
   sodium: SodiumSchema,
+  comments: CommentsSchema,
 });
 
 export type BotConfig = Static<typeof BotConfigSchema>;
diff --git a/src/utils/helpers.ts b/src/utils/helpers.ts
index ec8f0d57d..235112737 100644
--- a/src/utils/helpers.ts
+++ b/src/utils/helpers.ts
@@ -82,6 +82,16 @@ export const getAnalyticsMode = (parsedRepo: WideRepoConfig | undefined, parsedO
   }
 };
 
+export const getPromotionComment = (parsedRepo: WideRepoConfig | undefined, parsedOrg: WideOrgConfig | undefined): string => {
+  if (parsedRepo && parsedRepo["promotion-comment"] && typeof parsedRepo["promotion-comment"] === "string") {
+    return parsedRepo["promotion-comment"];
+  } else if (parsedOrg && parsedOrg["promotion-comment"] && typeof parsedOrg["promotion-comment"] === "string") {
+    return parsedOrg["promotion-comment"];
+  } else {
+    return "";
+  }
+};
+
 export const getIncentiveMode = (parsedRepo?: WideRepoConfig, parsedOrg?: WideOrgConfig): boolean => {
   if (parsedRepo && parsedRepo["incentive-mode"] && typeof parsedRepo["incentive-mode"] === "boolean") {
     return parsedRepo["incentive-mode"];
diff --git a/src/utils/private.ts b/src/utils/private.ts
index ab0cab303..3d77bfe61 100644
--- a/src/utils/private.ts
+++ b/src/utils/private.ts
@@ -13,6 +13,7 @@ import {
   getPriorityLabels,
   getTimeLabels,
   getCommentItemPrice,
+  getPromotionComment,
 } from "./helpers";
 
 const CONFIG_REPO = "ubiquibot-config";
@@ -53,6 +54,7 @@ export interface WideConfig {
   "time-labels"?: WideLabel[];
   "priority-labels"?: WideLabel[];
   "auto-pay-mode"?: boolean;
+  "promotion-comment"?: string;
   "analytics-mode"?: boolean;
   "incentive-mode"?: boolean;
   "max-concurrent-bounties"?: number;
@@ -137,6 +139,7 @@ export const getWideConfig = async (context: Context) => {
     bountyHunterMax: getBountyHunterMax(parsedRepo, parsedOrg),
     incentiveMode: getIncentiveMode(parsedRepo, parsedOrg),
     commentElementPricing: getCommentItemPrice(parsedRepo, parsedOrg),
+    promotionComment: getPromotionComment(parsedRepo, parsedOrg),
   };
 
   return configData;

From 7e597ec93d23d5aa0b467e2f49919eb7773f814f Mon Sep 17 00:00:00 2001
From: 0xcodercrane <108444211+0xcodercrane@users.noreply.github.com>
Date: Mon, 17 Jul 2023 20:59:44 +0800
Subject: [PATCH 16/16] chore: use secrets

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 261a1c031..973953d53 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
     env:
       SUPABASE_ACCESS_TOKEN: ${{ github.ref == 'refs/heads/main' && secrets.PRODUCTION_SUPABASE_ACCESS_TOKEN || secrets.STAGING_SUPABASE_ACCESS_TOKEN }}
       SUPABASE_DB_PASSWORD: ${{ github.ref == 'refs/heads/main' && secrets.PRODUCTION_SUPABASE_DB_PASSWORD || secrets.STAGING_SUPABASE_DB_PASSWORD }}
-      PROJECT_ID: ${{ github.ref == 'refs/heads/main' && vars.PRODUCTION_SUPABASE_PROJECT_ID || vars.STAGING_SUPABASE_PROJECT_ID }}
+      PROJECT_ID: ${{ github.ref == 'refs/heads/main' && secrets.PRODUCTION_SUPABASE_PROJECT_ID || secrets.STAGING_SUPABASE_PROJECT_ID }}
 
     steps:
       - name: Checkout repository