From 44b127b364e4a00c5d0d3ea306d6e395ca8b300f Mon Sep 17 00:00:00 2001
From: achille <achillegley@gmail.com>
Date: Tue, 15 Oct 2024 22:07:50 +0700
Subject: [PATCH 01/26] fix:#637 - merge develop

---
 src/components/Advertiser/AdvertiserTable.vue | 150 +++++++++++-------
 src/stores/wallet.js                          |  22 ++-
 2 files changed, 116 insertions(+), 56 deletions(-)

diff --git a/src/components/Advertiser/AdvertiserTable.vue b/src/components/Advertiser/AdvertiserTable.vue
index f365b4b1..d5876198 100644
--- a/src/components/Advertiser/AdvertiserTable.vue
+++ b/src/components/Advertiser/AdvertiserTable.vue
@@ -38,7 +38,12 @@
         <template #body-cell-action="props">
           <q-td :props="props">
             <q-icon
-              v-if="userStore.getUser.role === 'Admin' && props.row.campaignCode?.length > 5 && props.row.status === 'Active'"
+              v-if="
+                userStore.getUser.role === 'Admin' &&
+                props.row.campaignCode?.length > 5 &&
+                props.row.status !== 'Inactive' &&
+                props.row.status !== 'Complete'
+              "
               flat
               color="green"
               name="payment"
@@ -52,7 +57,10 @@
             </q-icon>
             <q-icon
               v-if="
-                userStore.getUser.email === props.row.author.email && props.row.campaignCode?.length > 5 && props.row.status === 'Active'
+                userStore.getUser.uid === props.row.author.id &&
+                props.row.campaignCode?.length > 5 &&
+                props.row.status !== 'Inactive' &&
+                props.row.status !== 'Complete'
               "
               flat
               color="primary"
@@ -187,7 +195,7 @@
     <q-dialog v-model="withdrawAmountSpentDialog.show">
       <q-card>
         <q-card-section class="q-pb-none">
-          <h6 class="q-my-sm">Withdraw Amount Spent : {{ withdrawAmountSpentDialog.currentAmountSpent }}</h6>
+          <h6 class="q-my-sm">Available Amount to withdraw : {{ withdrawAmountSpentDialog.unclaimedAmount }}</h6>
         </q-card-section>
         <q-card-section>Are you sure you want to withdraw it ?</q-card-section>
         <q-card-actions align="right">
@@ -243,6 +251,7 @@ import { useAdvertiseStore, useErrorStore, useUserStore } from 'src/stores'
 import { useRouter } from 'vue-router'
 import { getCurrentDate, calculateEndDate, computedDuration, dayMonthYear } from 'src/utils/date'
 import { claimPayment, requestAndApproveWithdrawal, getEventsForCampaign } from 'app/src/web3/adCampaignManager'
+import { customWeb3modal } from 'app/src/web3/walletConnect'
 
 const props = defineProps({
   advertises: {
@@ -301,41 +310,48 @@ async function calculateAmountSpent(advertise) {
 async function _getEventsForCampaign(advertise) {
   if (advertise?.campaignCode) {
     $q.loading.show()
-    const result = await getEventsForCampaign(advertise.campaignCode)
-
-    if (result.status.includes('success')) {
-      // Combine events into a single array with eventType field
-
-      const adCampaignCreatedEvents = result.events.adCampaignCreatedEvents.map((event) => ({
-        ...event,
-        eventType: 'Campaign Created'
-      }))
-
-      const paymentReleasedEvents = result.events.paymentReleasedEvents.map((event) => ({
-        ...event,
-        eventType: 'Payment Released'
-      }))
-
-      const budgetWithdrawnEvents = result.events.budgetWithdrawnEvents.map((event) => ({
-        ...event,
-        eventType: 'Remaining Budget Withdrawn'
-      }))
-
-      const paymentReleasedOnWithdrawApprovalEvents = result.events.paymentReleasedOnWithdrawApprovalEvents.map((event) => ({
-        ...event,
-        eventType: 'Payment Released on Withdraw Approval'
-      }))
-
-      eventRows.value = [
-        ...adCampaignCreatedEvents,
-        ...paymentReleasedEvents,
-        ...budgetWithdrawnEvents,
-        ...paymentReleasedOnWithdrawApprovalEvents
-      ]
-      //let's change the advertise status.
-      advertismentPaymentEventsDialog.value.show = true
+    if (!customWeb3modal.getAddress() && customWeb3modal.getChainId() !== 137) {
+      $q.notify({ type: 'negative', message: ' please connect your wallet to polygon mainet network ' })
+      customWeb3modal.open()
+      $q.loading.hide()
     } else {
-      $q.notify({ message: result?.error?.message, type: 'negative' })
+      const result = await getEventsForCampaign(advertise.campaignCode)
+
+      if (result.status.includes('success')) {
+        $q.notify({ message: 'events retreived successfully ', type: 'positive' })
+        // Combine events into a single array with eventType field
+
+        const adCampaignCreatedEvents = result.events.adCampaignCreatedEvents.map((event) => ({
+          ...event,
+          eventType: 'Campaign Created'
+        }))
+
+        const paymentReleasedEvents = result.events.paymentReleasedEvents.map((event) => ({
+          ...event,
+          eventType: 'Payment Released'
+        }))
+
+        const budgetWithdrawnEvents = result.events.budgetWithdrawnEvents.map((event) => ({
+          ...event,
+          eventType: 'Remaining Budget Withdrawn'
+        }))
+
+        const paymentReleasedOnWithdrawApprovalEvents = result.events.paymentReleasedOnWithdrawApprovalEvents.map((event) => ({
+          ...event,
+          eventType: 'Payment Released on Withdraw Approval'
+        }))
+
+        eventRows.value = [
+          ...adCampaignCreatedEvents,
+          ...paymentReleasedEvents,
+          ...budgetWithdrawnEvents,
+          ...paymentReleasedOnWithdrawApprovalEvents
+        ]
+        //let's change the advertise status.
+        advertismentPaymentEventsDialog.value.show = true
+      } else {
+        $q.notify({ message: result?.error?.message, type: 'negative' })
+      }
     }
   } else {
     $q.notify({ message: 'No campaign code associated', type: 'negative' })
@@ -362,8 +378,21 @@ async function onwithdrawAmountSpentDialog(advertise) {
   if (advertise?.campaignCode) {
     $q.loading.show()
     const currentAmountSpent = await calculateAmountSpent(advertise)
-    if (currentAmountSpent > 0) {
+    const adEvents = await getEventsForCampaign(advertise.campaignCode)
+    let releasedAmount = 0
+    let unclaimedAmount = 0
+    if (adEvents.status.includes('success')) {
+      if (adEvents.events.paymentReleasedEvents) {
+        adEvents.events.paymentReleasedEvents.forEach((paymentReleasedEvent) => {
+          releasedAmount += parseFloat(paymentReleasedEvent.amount)
+        })
+      }
+    }
+    unclaimedAmount = parseFloat(currentAmountSpent - releasedAmount).toFixed(3)
+
+    if (unclaimedAmount > 0) {
       withdrawAmountSpentDialog.value.advertise = advertise
+      withdrawAmountSpentDialog.value.unclaimedAmount = unclaimedAmount
       withdrawAmountSpentDialog.value.currentAmountSpent = currentAmountSpent
       withdrawAmountSpentDialog.value.show = true
     } else {
@@ -377,16 +406,23 @@ async function onwithdrawAmountSpentDialog(advertise) {
 
 async function _claimPayment(advertise, currentAmountSpent) {
   $q.loading.show()
-  const result = await claimPayment({ campaignCode: advertise.campaignCode, currentAmounSpentInMatic: currentAmountSpent })
-  if (result.status.includes('success')) {
-    $q.notify({ message: 'Campaign payment claimed successfully', type: 'positive' })
-    //let's change the advertise status.
-    if (currentAmountSpent >= advertise.budget) {
-      await _completeAdvertise(advertise)
-    }
+  if (!customWeb3modal.getAddress() && customWeb3modal.getChainId() !== 137) {
+    $q.notify({ type: 'negative', message: ' please connect your wallet to polygon mainet network ' })
+    customWeb3modal.open()
+    $q.loading.hide()
   } else {
-    $q.notify({ message: result?.error?.message, type: 'negative' })
+    const result = await claimPayment({ campaignCode: advertise.campaignCode, currentAmounSpentInMatic: currentAmountSpent.toString() })
+    if (result.status.includes('success')) {
+      $q.notify({ message: 'campaign payment claimed successfully ', type: 'positive' })
+      //let's change the advertise status.
+      if (currentAmountSpent >= advertise.budget) {
+        await _completeAdvertise(advertise)
+      }
+    } else {
+      $q.notify({ message: result?.error?.message, type: 'negative' })
+    }
   }
+
   $q.loading.hide()
 }
 
@@ -401,13 +437,19 @@ async function _completeAdvertise(advertise) {
 }
 async function _withdrawRemainingBudget(advertise, currentAmounSpent) {
   $q.loading.show()
-  const result = await requestAndApproveWithdrawal({ campaignCode: advertise.campaignCode, currentAmounSpentInMatic: currentAmounSpent })
-  if (result.status.includes('success')) {
-    $q.notify({ message: 'Remaining budget withdrawn successfully ', type: 'positive' })
-    //let's change the advertise status
-    await _completeAdvertise(advertise)
+  if (!customWeb3modal.getAddress() && customWeb3modal.getChainId() !== 137) {
+    $q.notify({ type: 'negative', message: ' please connect your wallet to polygon mainet network ' })
+    customWeb3modal.open()
+    $q.loading.hide()
   } else {
-    $q.notify({ message: result?.error?.message, type: 'negative' })
+    const result = await requestAndApproveWithdrawal({ campaignCode: advertise.campaignCode, currentAmounSpentInMatic: currentAmounSpent })
+    if (result.status.includes('success')) {
+      $q.notify({ message: 'remaing budget withdrawn successfully ', type: 'positive' })
+      //let's change the advertise status
+      await _completeAdvertise(advertise)
+    } else {
+      $q.notify({ message: result?.error?.message, type: 'negative' })
+    }
   }
   $q.loading.hide()
 }
@@ -479,10 +521,10 @@ function onDeselect() {
 function onApproveAdvertise() {
   advertiseStore
     .editAdvertise(selectedAdvertise.value)
-    .then(() => $q.notify({ type: 'info', message: 'Advertise approved successfully' }))
+    .then(() => $q.notify({ type: 'info', message: 'Advertise Approved successfully' }))
     .catch((error) => {
       console.log(error)
-      errorStore.throwError(error, 'Advertise approval failed')
+      errorStore.throwError(error, 'Advertise Approval failed')
     })
     .finally(() => {
       selectedAdvertise.value = {}
diff --git a/src/stores/wallet.js b/src/stores/wallet.js
index 5e522aa5..25712de7 100644
--- a/src/stores/wallet.js
+++ b/src/stores/wallet.js
@@ -24,12 +24,30 @@ export const useWalletStore = defineStore('wallet', {
         rpcUrl: import.meta.env.VITE_ALCHEMY_SEPOLIA_PROVIDER_URL
       },
       matic: {
-        chainId: import.meta.env.VITE_POLYGON_MAINET_CHAIN_ID,
+        chainId: 137,
         name: import.meta.env.VITE_INFURA_POLYGON_MAINET_NETWORK_NAME,
         currency: import.meta.env.VITE_POLYGON_MAINET_CURRENCY,
         explorerUrl: import.meta.env.VITE_INFURA_POLYGON_MAINET_SCAN_URL,
-        rpcUrl: import.meta.env.VITE_INFURA_POLYGON_MAINET_PROVIDER_URL
+        rpcUrl: 'https://polygon-mainnet.infura.io',
+        blockExplorerUrls: ['https://polygonscan.com/'],
+
+        nativeCurrency: {
+          name: 'Polygon',
+          symbol: 'MATIC',
+          decimals: 18
+        }
       }
+      // const chainConfig = {
+      //   chainId: 137,
+      //   "name": "Polygon Matic",
+      //   rpcUrls: ['https://rpc-mainnet.maticvigil.com/'],
+      //   nativeCurrency: {
+      //     name: 'Polygon',
+      //     symbol: 'MATIC',
+      //     decimals: 18
+      //   },
+      //   blockExplorerUrls: ['https://polygonscan.com/']
+      // }
     }
   }),
 

From 810e1ac3f6533ef2bc3d22bddeedda114786dbda Mon Sep 17 00:00:00 2001
From: achille <achillegley@gmail.com>
Date: Tue, 15 Oct 2024 21:02:13 +0700
Subject: [PATCH 02/26] fix:#637 - Update provider

---
 .env | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.env b/.env
index 6301da76..6f1b7455 100644
--- a/.env
+++ b/.env
@@ -17,6 +17,7 @@ VITE_TEST_PASSWORD=12345678
 
 #BLOCKCHAIN
 VITE_WALLET_CONNECT_PROJECT_ID='9dcf39cb8034882a971d5086066c7f17'
+#VITE_WALLET_CONNECT_PROJECT_ID="b3d5d26d4242be7040324934e9d6a5f2"
 VITE_CURRENT_NETWORK_NAME="matic"
 
 #sepolia
@@ -35,7 +36,8 @@ VITE_POLYGON_AMOY_NETWORK_ID=80002
 VITE_MATIC_RATE_API_LINK="https://api.coingecko.com/api/v3/simple/price?ids=matic-network&vs_currencies=USD"
 
 #polygon mainet
-VITE_INFURA_POLYGON_MAINET_PROVIDER_URL="https://polygon-mainnet.g.alchemy.com/v2/Pwf_zLL-IbGvFhwTSbnreQUHi50dynvZ"
+#VITE_INFURA_POLYGON_MAINET_PROVIDER_URL="https://polygon-mainnet.g.alchemy.com/v2/Pwf_zLL-IbGvFhwTSbnreQUHi50dynvZ"
+VITE_INFURA_POLYGON_MAINET_PROVIDER_URL="https://polygon-mainnet.g.alchemy.com/v2/00lwM-S0sm1EDraB9zsyZmQbLjzLtQKZ"
 VITE_INFURA_POLYGON_MAINET_SCAN_URL="https://polygonscan.com/tx/"
 VITE_INFURA_POLYGON_MAINET_NETWORK_NAME="Polygon Matic"
 VITE_POLYGON_MAINET_CHAIN_ID=137
@@ -46,6 +48,7 @@ VITE_ADVERTISEMENT_COMPAIGN_CONTRACT_OWNER= "0xdb0f8aACC19a779b9020a693c35014DaF
 
 VITE_ADVERTISE_CLICK_RATE='0.001'
 VITE_ADVERTISE_IMPRESSION_RATE='0.001'
+VITE_ADVERTISE_VIEWS_RATE="0.001"
 
 VITE_LAYER8_PROXY=https://layer8proxy.net
 #DEV ENV FOR STATS API

From 67f2c9c46d6ba7e6f0fc1ce0e53c9691a8e37410 Mon Sep 17 00:00:00 2001
From: achille <achillegley@gmail.com>
Date: Wed, 25 Sep 2024 20:15:36 +0700
Subject: [PATCH 03/26] workin on network detection issues

---
 src/web3/#walletConnect.js# | 42 +++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 src/web3/#walletConnect.js#

diff --git a/src/web3/#walletConnect.js# b/src/web3/#walletConnect.js#
new file mode 100644
index 00000000..7c620796
--- /dev/null
+++ b/src/web3/#walletConnect.js#
@@ -0,0 +1,42 @@
+import { createWeb3Modal, defaultConfig } from '@web3modal/ethers5'
+
+import { useWalletStore } from '../stores'
+
+// 1. Get projectId at https://cloud.walletconnect.com
+const projectId = import.meta.env.VITE_WALLET_CONNECT_PROJECT_ID
+
+const baseUrl = window.location.origin
+
+const currentNetworkName = import.meta.env.VITE_CURRENT_NETWORK_NAME.toLowerCase()
+
+// 3. Define a function to get the chain configuration based on the current network name
+
+// 4. Get the chain configuration
+const chainConfig = useWalletStore().getChainConfig(currentNetworkName)
+
+// 3. Create your application's metadata object
+const metadata = {
+  name: 'Celebrity Fanalyser',
+  description: 'Celebrity Fanalyser',
+  // url must match your domain & subdomain
+  url: baseUrl,
+  icons: ['']
+}
+
+// 4. Create Ethers config
+const ethersConfig = defaultConfig({
+  /*Required*/
+  metadata
+  /*Optional*/
+})
+
+// 5. Create a Web3Modal instance
+export const customWeb3modal = createWeb3Modal({
+  ethersConfig,
+  chains: [chainConfig],
+  projectId,
+  // Optional - defaults to your Cloud configuration
+  enableAnalytics: true,
+  // Optional - false as default
+  enableOnramp: true
+})

From aaa6743afa138487a88f365b162a1fc5426fc999 Mon Sep 17 00:00:00 2001
From: achille <achillegley@gmail.com>
Date: Tue, 15 Oct 2024 22:13:45 +0700
Subject: [PATCH 04/26] fix:#637 - merge develop

---
 .env                                          | 2 +-
 src/components/Admin/ManagePromptsEntries.vue | 4 ++--
 src/components/Admin/TableEntry.vue           | 4 ++--
 src/web3/adCampaignManager.js                 | 1 -
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.env b/.env
index 6f1b7455..20878276 100644
--- a/.env
+++ b/.env
@@ -48,7 +48,7 @@ VITE_ADVERTISEMENT_COMPAIGN_CONTRACT_OWNER= "0xdb0f8aACC19a779b9020a693c35014DaF
 
 VITE_ADVERTISE_CLICK_RATE='0.001'
 VITE_ADVERTISE_IMPRESSION_RATE='0.001'
-VITE_ADVERTISE_VIEWS_RATE="0.001"
+VITE_ADVERTISE_VIEWS_RATE='0.001'
 
 VITE_LAYER8_PROXY=https://layer8proxy.net
 #DEV ENV FOR STATS API
diff --git a/src/components/Admin/ManagePromptsEntries.vue b/src/components/Admin/ManagePromptsEntries.vue
index a9f0d39a..b0f83ef5 100644
--- a/src/components/Admin/ManagePromptsEntries.vue
+++ b/src/components/Admin/ManagePromptsEntries.vue
@@ -325,8 +325,8 @@ function handleDeleteEntry(entryId, promptId) {
 //proceed deposit funds.
 async function onProceedDepositFundDialog(props) {
   //let's check if the entry already have valid payment..
-  if (!customWeb3modal.getAddress()) {
-    $q.notify({ type: 'negative', message: 'Please connect your wallet and try again' })
+  if (!customWeb3modal.getAddress() && customWeb3modal.getChainId() !== 137) {
+    $q.notify({ type: 'negative', message: ' please connect your wallet to polygon mainet network ' })
     customWeb3modal.open()
   } else {
     proceedDepositFundDialog.value.show = true
diff --git a/src/components/Admin/TableEntry.vue b/src/components/Admin/TableEntry.vue
index 0a6cdffb..87076e76 100644
--- a/src/components/Admin/TableEntry.vue
+++ b/src/components/Admin/TableEntry.vue
@@ -301,8 +301,8 @@ async function onProceedPaymentDialog(props) {
   }
   if (_currentPrompt.value) {
     $q.loading.show()
-    if (!customWeb3modal.getAddress()) {
-      $q.notify({ type: 'negative', message: 'Please connect your wallet and try again' })
+    if (!customWeb3modal.getAddress() || customWeb3modal.getChainId() !== 137) {
+      $q.notify({ type: 'negative', message: ' please connect your wallet to polygon mainet network ' })
       customWeb3modal.open()
       $q.loading.hide()
     } else {
diff --git a/src/web3/adCampaignManager.js b/src/web3/adCampaignManager.js
index 6ea01610..a3025d97 100644
--- a/src/web3/adCampaignManager.js
+++ b/src/web3/adCampaignManager.js
@@ -225,7 +225,6 @@ export const getEventsForCampaign = async (campaignCode) => {
         adCampaignCreatedEvents: adCampaignCreatedData
       }
 
-      //console.log('Events retrieved successfully')
       return { status: 'success', events: result }
     } catch (error) {
       const errorMessage = error.error ? error.error.data : error

From e762f5de729c6c67e72c5b36028fdaef26f7113c Mon Sep 17 00:00:00 2001
From: achille <achillegley@gmail.com>
Date: Tue, 15 Oct 2024 23:32:31 +0700
Subject: [PATCH 05/26] fix:#637 - update claim and view entry payment condtion

---
 src/components/Admin/TableEntry.vue | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/components/Admin/TableEntry.vue b/src/components/Admin/TableEntry.vue
index 87076e76..a05d3c78 100644
--- a/src/components/Admin/TableEntry.vue
+++ b/src/components/Admin/TableEntry.vue
@@ -66,23 +66,20 @@
               <q-tooltip class="positive" :offset="[10, 10]">Select winner</q-tooltip>
             </q-btn>
             <q-btn
-              v-if="
-                _currentPrompt?.isTreated ? props.row.isWinner && !_currentPrompt?.isTreated : props.row.isWinner && !props.row.isTreated
-              "
+              v-if="props.row.isWinner == true && props.row.author.uid == userStore.getUserId"
               color="green"
-              :disable="props.row.author.uid !== userStore.getUserId"
               icon="payment"
               unelevated
               size="sm"
-              round
+              flat
               label=""
               @click="onProceedPaymentDialog(props.row)"
             >
-              <q-tooltip class="positive" :offset="[10, 10]">Claim payment</q-tooltip>
+              <q-tooltip class="positive" :offset="[10, 10]">claim or view payment</q-tooltip>
             </q-btn>
             <q-btn
               class="payment-buttons"
-              v-if="_currentPrompt?.isTreated ? props.row.isWinner && _currentPrompt?.isTreated : props.row.isWinner && props.row.isTreated"
+              v-if="_currentPrompt ? props.row.isWinner && _currentPrompt?.isTreated : false"
               color="blue"
               flat
               icon="payment"
@@ -308,6 +305,7 @@ async function onProceedPaymentDialog(props) {
     } else {
       //let's check if the entry already have valid payment..
       const cryptoTransactionExist = await cryptoTransactions.getCryptoTransactionsByEntry(props.id)
+
       if (cryptoTransactionExist.length > 0) {
         const escrowEvents = await getEventsForEscrow({ escrowId: _currentPrompt.value.escrowId })
         if (escrowEvents?.status?.includes('success')) {

From 449b5f22db0d60153d36c15f8a0bea19be7ac0ff Mon Sep 17 00:00:00 2001
From: achille <achillegley@gmail.com>
Date: Tue, 15 Oct 2024 23:35:51 +0700
Subject: [PATCH 06/26] fix:#637 - update .env

---
 .env | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.env b/.env
index 20878276..56f1df58 100644
--- a/.env
+++ b/.env
@@ -36,8 +36,7 @@ VITE_POLYGON_AMOY_NETWORK_ID=80002
 VITE_MATIC_RATE_API_LINK="https://api.coingecko.com/api/v3/simple/price?ids=matic-network&vs_currencies=USD"
 
 #polygon mainet
-#VITE_INFURA_POLYGON_MAINET_PROVIDER_URL="https://polygon-mainnet.g.alchemy.com/v2/Pwf_zLL-IbGvFhwTSbnreQUHi50dynvZ"
-VITE_INFURA_POLYGON_MAINET_PROVIDER_URL="https://polygon-mainnet.g.alchemy.com/v2/00lwM-S0sm1EDraB9zsyZmQbLjzLtQKZ"
+VITE_INFURA_POLYGON_MAINET_PROVIDER_URL="https://polygon-mainnet.g.alchemy.com/v2/Pwf_zLL-IbGvFhwTSbnreQUHi50dynvZ"
 VITE_INFURA_POLYGON_MAINET_SCAN_URL="https://polygonscan.com/tx/"
 VITE_INFURA_POLYGON_MAINET_NETWORK_NAME="Polygon Matic"
 VITE_POLYGON_MAINET_CHAIN_ID=137

From 06087a799216f3df151ac681fb060b013d648061 Mon Sep 17 00:00:00 2001
From: achille <achillegley@gmail.com>
Date: Tue, 15 Oct 2024 23:49:37 +0700
Subject: [PATCH 07/26] fix:#637 - remove uncessaries comments in wallet.js

---
 src/stores/wallet.js | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/stores/wallet.js b/src/stores/wallet.js
index 25712de7..8017d8be 100644
--- a/src/stores/wallet.js
+++ b/src/stores/wallet.js
@@ -37,17 +37,6 @@ export const useWalletStore = defineStore('wallet', {
           decimals: 18
         }
       }
-      // const chainConfig = {
-      //   chainId: 137,
-      //   "name": "Polygon Matic",
-      //   rpcUrls: ['https://rpc-mainnet.maticvigil.com/'],
-      //   nativeCurrency: {
-      //     name: 'Polygon',
-      //     symbol: 'MATIC',
-      //     decimals: 18
-      //   },
-      //   blockExplorerUrls: ['https://polygonscan.com/']
-      // }
     }
   }),
 

From 3905b0f2d3fe5e00e91ea94960b669b41cf34374 Mon Sep 17 00:00:00 2001
From: achille <achillegley@gmail.com>
Date: Tue, 15 Oct 2024 23:52:31 +0700
Subject: [PATCH 08/26] fix:#637 - remove uncessaries comments in .env

---
 .env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env b/.env
index 56f1df58..5b537f4a 100644
--- a/.env
+++ b/.env
@@ -17,7 +17,7 @@ VITE_TEST_PASSWORD=12345678
 
 #BLOCKCHAIN
 VITE_WALLET_CONNECT_PROJECT_ID='9dcf39cb8034882a971d5086066c7f17'
-#VITE_WALLET_CONNECT_PROJECT_ID="b3d5d26d4242be7040324934e9d6a5f2"
+
 VITE_CURRENT_NETWORK_NAME="matic"
 
 #sepolia

From 9611c0d8998ce2f7d41c173f70c0bacbc3123ed7 Mon Sep 17 00:00:00 2001
From: achille <achillegley@gmail.com>
Date: Sat, 19 Oct 2024 05:04:16 +0700
Subject: [PATCH 09/26] fix:#637 -roll back table entry and merge develop

---
 src/components/Admin/TableEntry.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/Admin/TableEntry.vue b/src/components/Admin/TableEntry.vue
index a05d3c78..4c081765 100644
--- a/src/components/Admin/TableEntry.vue
+++ b/src/components/Admin/TableEntry.vue
@@ -66,20 +66,23 @@
               <q-tooltip class="positive" :offset="[10, 10]">Select winner</q-tooltip>
             </q-btn>
             <q-btn
-              v-if="props.row.isWinner == true && props.row.author.uid == userStore.getUserId"
+              v-if="
+                _currentPrompt?.isTreated ? props.row.isWinner && !_currentPrompt?.isTreated : props.row.isWinner && !props.row.isTreated
+              "
               color="green"
+              :disable="props.row.author.uid !== userStore.getUserId"
               icon="payment"
               unelevated
               size="sm"
-              flat
+              round
               label=""
               @click="onProceedPaymentDialog(props.row)"
             >
-              <q-tooltip class="positive" :offset="[10, 10]">claim or view payment</q-tooltip>
+              <q-tooltip class="positive" :offset="[10, 10]">Claim payment</q-tooltip>
             </q-btn>
             <q-btn
               class="payment-buttons"
-              v-if="_currentPrompt ? props.row.isWinner && _currentPrompt?.isTreated : false"
+              v-if="_currentPrompt?.isTreated ? props.row.isWinner && _currentPrompt?.isTreated : props.row.isWinner && props.row.isTreated"
               color="blue"
               flat
               icon="payment"

From de24ba4431ad028d45d2d196e1f09cff378e9589 Mon Sep 17 00:00:00 2001
From: achille <achillegley@gmail.com>
Date: Sat, 19 Oct 2024 05:06:03 +0700
Subject: [PATCH 10/26] fix:#637 -roll back table entry and merge develop

---
 src/components/Admin/EntryCard.vue      |  27 +++++
 src/components/Admin/PromptCard.vue     |  30 +++++-
 src/components/shared/CameraCapture.vue | 132 ++++++++++++++++++++++++
 src/utils/media.js                      |  21 ++++
 4 files changed, 209 insertions(+), 1 deletion(-)
 create mode 100644 src/components/shared/CameraCapture.vue
 create mode 100644 src/utils/media.js

diff --git a/src/components/Admin/EntryCard.vue b/src/components/Admin/EntryCard.vue
index 13c2150c..03eb0911 100644
--- a/src/components/Admin/EntryCard.vue
+++ b/src/components/Admin/EntryCard.vue
@@ -94,6 +94,10 @@
             <q-icon name="image" />
           </template>
         </q-file>
+        <div style="display: flex; flex-direction: column; justify-content: center; align-items: center">
+          <p>or</p>
+          <q-btn color="primary" icon="add_a_photo" class="self-center" label="Capture Image" @click="openCamera = true"></q-btn>
+        </div>
         <div class="text-center">
           <q-img v-if="entry.image" class="q-mt-md" :src="entry.image" fit="contain" style="max-height: 40vh; max-width: 80vw" />
         </div>
@@ -126,6 +130,19 @@
       </q-form>
     </q-card-section>
   </q-card>
+  <q-dialog v-model="openCamera" persistent>
+    <q-card>
+      <q-card-section class="row items-center">
+        <CaptureCamera @onCapture="captureCamera" />
+      </q-card-section>
+
+      <q-card-actions align="right">
+        <q-btn flat label="Cancel" color="primary" v-close-popup />
+        <q-btn flat label="Done" color="primary" v-close-popup />
+      </q-card-actions>
+    </q-card>
+  </q-dialog>
+  <q-dialog></q-dialog>
 </template>
 
 <script setup>
@@ -134,6 +151,7 @@ import { useEntryStore, useErrorStore, usePromptStore, useStorageStore, useUserS
 import { computed, onMounted, reactive, ref, watchEffect } from 'vue'
 import { uploadAndSetImage } from 'src/utils/imageConvertor'
 import { useRouter } from 'vue-router'
+import CaptureCamera from '../shared/CameraCapture.vue'
 
 const emit = defineEmits(['hideDialog'])
 const props = defineProps(['author', 'created', 'description', 'id', 'image', 'prompt', 'slug', 'title', 'selectedPromptDate'])
@@ -156,6 +174,8 @@ const entry = reactive({
   title: ''
 })
 const imageModel = ref([])
+const openCamera = ref(false)
+
 const promptOptions = computed(
   () =>
     promptStore.getPrompts
@@ -180,6 +200,9 @@ onMounted(() => {
 
 function uploadPhoto() {
   entry.image = ''
+  if (!imageModel.value) {
+    return
+  }
   const reader = new FileReader()
   reader.readAsDataURL(imageModel.value)
   reader.onload = () => (entry.image = reader.result)
@@ -269,4 +292,8 @@ async function onSubmit() {
   }
   emit('hideDialog', entry.slug)
 }
+function captureCamera(imageBlob) {
+  imageModel.value = imageBlob
+  uploadPhoto()
+}
 </script>
diff --git a/src/components/Admin/PromptCard.vue b/src/components/Admin/PromptCard.vue
index 82a78cf7..18981889 100644
--- a/src/components/Admin/PromptCard.vue
+++ b/src/components/Admin/PromptCard.vue
@@ -101,7 +101,7 @@
               counter
               data-test="file-image"
               :hint="!prompt.image ? '*Image is required. Max size is 2MB.' : ''"
-              label="Image"
+              label="Chose File"
               :max-total-size="2097152"
               :required="!id"
               use-chips
@@ -113,6 +113,11 @@
                 <q-icon name="image" />
               </template>
             </q-file>
+
+            <div style="display: flex; flex-direction: column; justify-content: center; align-items: center">
+              <p>or</p>
+              <q-btn color="primary" icon="add_a_photo" class="self-center" label="Capture Image" @click="openCamera = true"></q-btn>
+            </div>
             <q-select
               behavior="menu"
               counter
@@ -158,6 +163,19 @@
       </q-stepper>
     </q-form>
   </q-card>
+  <q-dialog v-model="openCamera" persistent>
+    <q-card>
+      <q-card-section class="row items-center">
+        <CaptureCamera @onCapture="captureCamera" />
+      </q-card-section>
+
+      <q-card-actions align="right">
+        <q-btn flat label="Cancel" color="primary" v-close-popup />
+        <q-btn flat label="Done" color="primary" v-close-popup />
+      </q-card-actions>
+    </q-card>
+  </q-dialog>
+  <q-dialog></q-dialog>
 </template>
 
 <script setup>
@@ -167,6 +185,7 @@ import { useErrorStore, usePromptStore, useStorageStore, useUserStore } from 'sr
 import { currentYearMonth } from 'src/utils/date'
 import { onMounted, reactive, ref, watchEffect } from 'vue'
 import { uploadAndSetImage } from 'src/utils/imageConvertor'
+import CaptureCamera from '../shared/CameraCapture.vue'
 
 const emit = defineEmits(['hideDialog'])
 const props = defineProps(['author', 'categories', 'created', 'date', 'description', 'id', 'image', 'showcase', 'slug', 'title'])
@@ -189,6 +208,7 @@ const step = ref(1)
 const imageModel = ref(null)
 const imagePreview = ref(null)
 const editorRef = ref(null)
+const openCamera = ref(false)
 
 watchEffect(() => {
   if (props.id) {
@@ -220,6 +240,9 @@ function onUpdateMonth() {
 
 function uploadPhoto() {
   prompt.image = ''
+  if (!imageModel.value) {
+    return
+  }
   const reader = new FileReader()
   reader.readAsDataURL(imageModel.value)
   reader.onload = () => (prompt.image = reader.result)
@@ -288,4 +311,9 @@ async function onSubmit() {
 function onRejected() {
   $q.notify({ type: 'negative', message: 'File size is too big. Max file size is 2MB.' })
 }
+
+function captureCamera(imageBlob) {
+  imageModel.value = imageBlob
+  uploadPhoto()
+}
 </script>
diff --git a/src/components/shared/CameraCapture.vue b/src/components/shared/CameraCapture.vue
new file mode 100644
index 00000000..e9ad53d6
--- /dev/null
+++ b/src/components/shared/CameraCapture.vue
@@ -0,0 +1,132 @@
+<template>
+  <div class="full-width column items-center justify-center">
+    <div class="web-cam-taker relative-position">
+      <video v-if="!is_taken" ref="camera" :width="width" :height="height" :style="{ borderRadius: '6px' }" autoplay />
+
+      <canvas v-show="is_taken" id="photoTaken" ref="taken_image" :width="width" :height="height"></canvas>
+
+      <div class="absolute-top" :class="{ 'bg-white': is_shooting }" />
+
+      <q-spinner v-if="is_loading" color="grey-lighten-4" />
+    </div>
+
+    <q-btn v-if="is_granted" variant="outlined" rounded class="q-px-lg mt-5" :style="{ fontWeight: 400 }" @click="takePhoto">
+      {{ is_taken ? 'RETAKE' : 'CAPTURE' }}
+    </q-btn>
+  </div>
+</template>
+
+<script setup>
+import { shallowRef, ref, onBeforeUnmount, nextTick, onMounted } from 'vue'
+import { requestAndGetUserMedia } from '../../utils/media'
+
+const emit = defineEmits(['onCapture', 'onErrorCaptured'])
+
+const props = defineProps({
+  height: {
+    type: Number,
+    default: 337
+  },
+  width: {
+    type: Number,
+    default: 450
+  },
+  externalStream: {
+    type: Object,
+    default: null
+  }
+})
+
+const is_taken = shallowRef(false)
+const is_shooting = shallowRef(false)
+const is_loading = shallowRef(false)
+const is_granted = shallowRef(false)
+
+const camera = ref(null)
+const taken_image = ref(null)
+
+onMounted(() => {
+  intiateCameraWithPermissions()
+})
+
+onBeforeUnmount(() => {
+  stopCameraStream()
+})
+
+async function intiateCameraWithPermissions() {
+  is_loading.value = true
+
+  if (props.externalStream) {
+    setCameraStream(props.externalStream)
+    is_granted.value = true
+  } else {
+    const { success, stream } = await requestAndGetUserMedia()
+    if (success) {
+      setCameraStream(stream)
+    } else {
+      emit('onErrorCaptured')
+    }
+    is_granted.value = success
+  }
+  is_loading.value = false
+}
+
+function setCameraStream(stream) {
+  nextTick(() => {
+    if (camera.value) {
+      camera.value.srcObject = stream
+    }
+  })
+}
+
+function stopCameraStream() {
+  const tracks = camera.value?.srcObject?.getTracks()
+
+  tracks?.forEach?.((track) => {
+    track.stop()
+  })
+}
+
+function takePhoto() {
+  if (!is_taken.value) {
+    is_shooting.value = true
+
+    const FLASH_TIMEOUT = 50
+
+    setTimeout(() => {
+      is_shooting.value = false
+    }, FLASH_TIMEOUT)
+    is_taken.value = true
+
+    const context = taken_image.value.getContext('2d')
+    context.drawImage(camera.value, 0, 0, 450, 337.5)
+
+    taken_image.value.toBlob((blob) => {
+      if (blob) {
+        const fileName = `photo_${new Date().toISOString()}.png`
+        const file = new File([blob], fileName, { type: blob.type })
+        emit('onCapture', file)
+      }
+    }, 'image/png')
+
+    stopCameraStream()
+  } else {
+    is_taken.value = false
+    intiateCameraWithPermissions()
+  }
+}
+</script>
+
+<style scoped>
+.web-cam-taker {
+  position: relative;
+}
+.absolute-top {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  height: 100%;
+  z-index: 10;
+}
+</style>
diff --git a/src/utils/media.js b/src/utils/media.js
new file mode 100644
index 00000000..3d07e5ae
--- /dev/null
+++ b/src/utils/media.js
@@ -0,0 +1,21 @@
+export async function requestAndGetUserMedia(
+  permissions = {
+    video: true
+  }
+) {
+  const result = {
+    success: false,
+    stream: null,
+    error: false
+  }
+
+  try {
+    const stream = await navigator.mediaDevices.getUserMedia(permissions)
+    result.success = true
+    result.stream = stream
+  } catch (err) {
+    result.error = err
+  } finally {
+    return result
+  }
+}

From ac7b556ab85aa2b5038ee1d1254a4f2a2c0a29eb Mon Sep 17 00:00:00 2001
From: Sana Yasmin <sanayasmin94@gmail.com>
Date: Wed, 25 Sep 2024 15:34:59 +0530
Subject: [PATCH 11/26] 557-feat-camera-update

---
 src/components/Admin/EntryCard.vue      | 64 +++++++++++++------------
 src/components/Admin/PromptCard.vue     | 52 +++++++++-----------
 src/components/shared/CameraCapture.vue | 39 +++++++++------
 3 files changed, 80 insertions(+), 75 deletions(-)

diff --git a/src/components/Admin/EntryCard.vue b/src/components/Admin/EntryCard.vue
index 03eb0911..ec47da56 100644
--- a/src/components/Admin/EntryCard.vue
+++ b/src/components/Admin/EntryCard.vue
@@ -76,27 +76,38 @@
             />
           </template>
         </q-field>
-        <q-file
-          accept=".jpg, image/*"
-          counter
-          data-test="file-image"
-          :disable="!entry.prompt"
-          :hint="!entry.prompt ? 'Select prompt first' : !entry.image ? '*Image is required. Max size is 2MB.' : ''"
-          label="Image"
-          :max-total-size="2097152"
-          :required="!id"
-          use-chips
-          v-model="imageModel"
-          @rejected="onRejected()"
-          @update:model-value="uploadPhoto()"
-        >
-          <template v-slot:append>
-            <q-icon name="image" />
-          </template>
-        </q-file>
-        <div style="display: flex; flex-direction: column; justify-content: center; align-items: center">
-          <p>or</p>
-          <q-btn color="primary" icon="add_a_photo" class="self-center" label="Capture Image" @click="openCamera = true"></q-btn>
+
+        <div class="row no-wrap">
+          <diV class="col-9">
+            <q-file
+              accept=".jpg, image/*"
+              counter
+              data-test="file-image"
+              :disable="!entry.prompt"
+              :hint="!entry.prompt ? 'Select prompt first' : !entry.image ? '*Image is required. Max size is 2MB.' : ''"
+              label="Image"
+              :max-total-size="2097152"
+              :required="!id"
+              use-chips
+              class="full-width"
+              v-model="imageModel"
+              @rejected="onRejected()"
+              @update:model-value="uploadPhoto()"
+            >
+              <template v-slot:append>
+                <q-icon name="image" />
+              </template>
+            </q-file>
+          </diV>
+          <div class="col-1 flex justify-center items-center"><p>OR</p></div>
+          <q-btn
+            :disable="!entry.prompt"
+            color="primary"
+            icon="add_a_photo"
+            class="self-center col"
+            label="Capture Image"
+            @click="openCamera = true"
+          ></q-btn>
         </div>
         <div class="text-center">
           <q-img v-if="entry.image" class="q-mt-md" :src="entry.image" fit="contain" style="max-height: 40vh; max-width: 80vw" />
@@ -131,16 +142,7 @@
     </q-card-section>
   </q-card>
   <q-dialog v-model="openCamera" persistent>
-    <q-card>
-      <q-card-section class="row items-center">
-        <CaptureCamera @onCapture="captureCamera" />
-      </q-card-section>
-
-      <q-card-actions align="right">
-        <q-btn flat label="Cancel" color="primary" v-close-popup />
-        <q-btn flat label="Done" color="primary" v-close-popup />
-      </q-card-actions>
-    </q-card>
+    <CaptureCamera @onCapture="captureCamera" />
   </q-dialog>
   <q-dialog></q-dialog>
 </template>
diff --git a/src/components/Admin/PromptCard.vue b/src/components/Admin/PromptCard.vue
index 18981889..28dd379e 100644
--- a/src/components/Admin/PromptCard.vue
+++ b/src/components/Admin/PromptCard.vue
@@ -96,28 +96,31 @@
                 />
               </template>
             </q-field>
-            <q-file
-              accept=".jpg, image/*"
-              counter
-              data-test="file-image"
-              :hint="!prompt.image ? '*Image is required. Max size is 2MB.' : ''"
-              label="Chose File"
-              :max-total-size="2097152"
-              :required="!id"
-              use-chips
-              v-model="imageModel"
-              @rejected="onRejected()"
-              @update:model-value="uploadPhoto()"
-            >
-              <template v-slot:append>
-                <q-icon name="image" />
-              </template>
-            </q-file>
 
-            <div style="display: flex; flex-direction: column; justify-content: center; align-items: center">
-              <p>or</p>
+            <div class="row">
+              <diV class="col-8">
+                <q-file
+                  accept=".jpg, image/*"
+                  counter
+                  data-test="file-image"
+                  :hint="!prompt.image ? '*Image is required. Max size is 2MB.' : ''"
+                  label="Chose File"
+                  :max-total-size="2097152"
+                  :required="!id"
+                  use-chips
+                  v-model="imageModel"
+                  @rejected="onRejected()"
+                  @update:model-value="uploadPhoto()"
+                >
+                  <template v-slot:append>
+                    <q-icon name="image" />
+                  </template>
+                </q-file>
+              </diV>
+              <div class="col-1 flex justify-center items-center"><p>or</p></div>
               <q-btn color="primary" icon="add_a_photo" class="self-center" label="Capture Image" @click="openCamera = true"></q-btn>
             </div>
+
             <q-select
               behavior="menu"
               counter
@@ -164,16 +167,7 @@
     </q-form>
   </q-card>
   <q-dialog v-model="openCamera" persistent>
-    <q-card>
-      <q-card-section class="row items-center">
-        <CaptureCamera @onCapture="captureCamera" />
-      </q-card-section>
-
-      <q-card-actions align="right">
-        <q-btn flat label="Cancel" color="primary" v-close-popup />
-        <q-btn flat label="Done" color="primary" v-close-popup />
-      </q-card-actions>
-    </q-card>
+    <CaptureCamera @onCapture="captureCamera" />
   </q-dialog>
   <q-dialog></q-dialog>
 </template>
diff --git a/src/components/shared/CameraCapture.vue b/src/components/shared/CameraCapture.vue
index e9ad53d6..f51bbb9c 100644
--- a/src/components/shared/CameraCapture.vue
+++ b/src/components/shared/CameraCapture.vue
@@ -1,19 +1,28 @@
 <template>
-  <div class="full-width column items-center justify-center">
-    <div class="web-cam-taker relative-position">
-      <video v-if="!is_taken" ref="camera" :width="width" :height="height" :style="{ borderRadius: '6px' }" autoplay />
-
-      <canvas v-show="is_taken" id="photoTaken" ref="taken_image" :width="width" :height="height"></canvas>
-
-      <div class="absolute-top" :class="{ 'bg-white': is_shooting }" />
-
-      <q-spinner v-if="is_loading" color="grey-lighten-4" />
-    </div>
-
-    <q-btn v-if="is_granted" variant="outlined" rounded class="q-px-lg mt-5" :style="{ fontWeight: 400 }" @click="takePhoto">
-      {{ is_taken ? 'RETAKE' : 'CAPTURE' }}
-    </q-btn>
-  </div>
+  <q-card>
+    <q-card-section class="row items-center">
+      <div class="full-width column items-center justify-center">
+        <div class="web-cam-taker relative-position">
+          <video v-if="!is_taken" ref="camera" :width="width" :height="height" :style="{ borderRadius: '6px' }" autoplay />
+
+          <canvas v-show="is_taken" id="photoTaken" ref="taken_image" :width="width" :height="height"></canvas>
+
+          <div class="absolute-top" :class="{ 'bg-white': is_shooting }" />
+
+          <q-spinner v-if="is_loading" color="grey-lighten-4" />
+        </div>
+
+        <q-btn v-if="is_granted" variant="outlined" rounded class="q-px-lg mt-5" color="primary" @click="takePhoto">
+          {{ is_taken ? 'RETAKE' : 'CAPTURE' }}
+        </q-btn>
+      </div>
+    </q-card-section>
+
+    <q-card-actions align="right">
+      <q-btn flat label="Cancel" color="primary" v-close-popup />
+      <q-btn :disable="!is_taken" flat label="Done" color="primary" v-close-popup />
+    </q-card-actions>
+  </q-card>
 </template>
 
 <script setup>

From fd2d80cbfb8cd00eb8cababf4308d87e8e8fafbf Mon Sep 17 00:00:00 2001
From: Sana Yasmin <sanayasmin94@gmail.com>
Date: Fri, 27 Sep 2024 11:03:51 +0530
Subject: [PATCH 12/26] entry-camera-fixed

---
 src/components/Admin/EntryCard.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Admin/EntryCard.vue b/src/components/Admin/EntryCard.vue
index ec47da56..45d7e449 100644
--- a/src/components/Admin/EntryCard.vue
+++ b/src/components/Admin/EntryCard.vue
@@ -259,7 +259,7 @@ async function onSubmit() {
   entry.slug = `/${entry.prompt.value.replace(/\-/g, '/')}/${entry.title.toLowerCase().replace(/[^0-9a-z]+/g, '-')}`
   entry.id = props.id || `${entry.prompt?.value}T${Date.now()}`
 
-  if (imageModel.value && Object.keys(imageModel.value).length !== 0) {
+  if (imageModel.value) {
     entry.image = await uploadAndSetImage(imageModel.value, `images/entry-${entry.id}`)
   } else {
     entry.image = props.image

From 432116920ef34190d16f042b4f0f16ec53156949 Mon Sep 17 00:00:00 2001
From: Sana Yasmin <sanayasmin94@gmail.com>
Date: Mon, 30 Sep 2024 10:38:15 +0530
Subject: [PATCH 13/26] camera-improve

---
 src/components/shared/CameraCapture.vue | 94 +++++++++++++++++--------
 1 file changed, 66 insertions(+), 28 deletions(-)

diff --git a/src/components/shared/CameraCapture.vue b/src/components/shared/CameraCapture.vue
index f51bbb9c..1e225dbb 100644
--- a/src/components/shared/CameraCapture.vue
+++ b/src/components/shared/CameraCapture.vue
@@ -3,9 +3,9 @@
     <q-card-section class="row items-center">
       <div class="full-width column items-center justify-center">
         <div class="web-cam-taker relative-position">
-          <video v-if="!is_taken" ref="camera" :width="width" :height="height" :style="{ borderRadius: '6px' }" autoplay />
+          <video v-if="!is_taken" ref="videoRef" width="100%" height="100%" :style="{ borderRadius: '6px' }" autoplay />
 
-          <canvas v-show="is_taken" id="photoTaken" ref="taken_image" :width="width" :height="height"></canvas>
+          <canvas v-show="is_taken" id="photoTaken" ref="canvasRef" :style="{ borderRadius: '6px' }"></canvas>
 
           <div class="absolute-top" :class="{ 'bg-white': is_shooting }" />
 
@@ -15,31 +15,33 @@
         <q-btn v-if="is_granted" variant="outlined" rounded class="q-px-lg mt-5" color="primary" @click="takePhoto">
           {{ is_taken ? 'RETAKE' : 'CAPTURE' }}
         </q-btn>
+
+        <q-select
+          outlined
+          v-model="selectedDevice"
+          :options="devices"
+          option-label="label"
+          option-value="deviceId"
+          class="q-mt-md"
+          dense
+          @update:modelValue="changeCameraStream"
+        />
       </div>
     </q-card-section>
-
     <q-card-actions align="right">
       <q-btn flat label="Cancel" color="primary" v-close-popup />
-      <q-btn :disable="!is_taken" flat label="Done" color="primary" v-close-popup />
+      <q-btn :disable="!is_taken" flat label="Done" color="primary" v-close-popup @click="submit" />
     </q-card-actions>
   </q-card>
 </template>
 
 <script setup>
-import { shallowRef, ref, onBeforeUnmount, nextTick, onMounted } from 'vue'
+import { shallowRef, ref, onBeforeUnmount, nextTick, onMounted, triggerRef } from 'vue'
 import { requestAndGetUserMedia } from '../../utils/media'
 
 const emit = defineEmits(['onCapture', 'onErrorCaptured'])
 
 const props = defineProps({
-  height: {
-    type: Number,
-    default: 337
-  },
-  width: {
-    type: Number,
-    default: 450
-  },
   externalStream: {
     type: Object,
     default: null
@@ -50,18 +52,27 @@ const is_taken = shallowRef(false)
 const is_shooting = shallowRef(false)
 const is_loading = shallowRef(false)
 const is_granted = shallowRef(false)
-
-const camera = ref(null)
-const taken_image = ref(null)
-
-onMounted(() => {
-  intiateCameraWithPermissions()
+const devices = shallowRef([])
+const selectedDevice = shallowRef()
+const videoRef = ref(null)
+const canvasRef = ref(null)
+let capturedFile = null
+
+onMounted(async () => {
+  await getDevices()
+  await intiateCameraWithPermissions()
 })
 
 onBeforeUnmount(() => {
   stopCameraStream()
 })
 
+async function getDevices() {
+  const allDevices = await navigator.mediaDevices.enumerateDevices()
+  devices.value = allDevices.filter((device) => device.kind === 'videoinput')
+  selectedDevice.value = devices.value[0]
+}
+
 async function intiateCameraWithPermissions() {
   is_loading.value = true
 
@@ -69,7 +80,11 @@ async function intiateCameraWithPermissions() {
     setCameraStream(props.externalStream)
     is_granted.value = true
   } else {
-    const { success, stream } = await requestAndGetUserMedia()
+    const { success, stream } = await requestAndGetUserMedia({
+      video: {
+        deviceId: selectedDevice.value.deviceId
+      }
+    })
     if (success) {
       setCameraStream(stream)
     } else {
@@ -80,16 +95,32 @@ async function intiateCameraWithPermissions() {
   is_loading.value = false
 }
 
+async function changeCameraStream(device) {
+  stopCameraStream()
+  const { success, stream } = await requestAndGetUserMedia({
+    video: {
+      deviceId: device.deviceId
+    }
+  })
+
+  if (success) {
+    setCameraStream(stream)
+  } else {
+    emit('onErrorCaptured')
+  }
+}
+
 function setCameraStream(stream) {
   nextTick(() => {
-    if (camera.value) {
-      camera.value.srcObject = stream
+    if (videoRef.value) {
+      videoRef.value.srcObject = stream
+      triggerRef(videoRef)
     }
   })
 }
 
 function stopCameraStream() {
-  const tracks = camera.value?.srcObject?.getTracks()
+  const tracks = videoRef.value?.srcObject?.getTracks()
 
   tracks?.forEach?.((track) => {
     track.stop()
@@ -98,6 +129,8 @@ function stopCameraStream() {
 
 function takePhoto() {
   if (!is_taken.value) {
+    canvasRef.value.width = videoRef.value.offsetWidth
+    canvasRef.value.height = videoRef.value.offsetHeight
     is_shooting.value = true
 
     const FLASH_TIMEOUT = 50
@@ -107,14 +140,13 @@ function takePhoto() {
     }, FLASH_TIMEOUT)
     is_taken.value = true
 
-    const context = taken_image.value.getContext('2d')
-    context.drawImage(camera.value, 0, 0, 450, 337.5)
+    const context = canvasRef.value.getContext('2d')
+    context.drawImage(videoRef.value, 0, 0, canvasRef.value.width, canvasRef.value.height)
 
-    taken_image.value.toBlob((blob) => {
+    canvasRef.value.toBlob((blob) => {
       if (blob) {
         const fileName = `photo_${new Date().toISOString()}.png`
-        const file = new File([blob], fileName, { type: blob.type })
-        emit('onCapture', file)
+        capturedFile = new File([blob], fileName, { type: blob.type })
       }
     }, 'image/png')
 
@@ -124,6 +156,12 @@ function takePhoto() {
     intiateCameraWithPermissions()
   }
 }
+
+function submit() {
+  if (capturedFile) {
+    emit('onCapture', capturedFile)
+  }
+}
 </script>
 
 <style scoped>

From 2536c6ab38475babdba7999423c68a1894f497ce Mon Sep 17 00:00:00 2001
From: Sana Yasmin <sanayasmin94@gmail.com>
Date: Mon, 30 Sep 2024 10:40:32 +0530
Subject: [PATCH 14/26] media.js-update

---
 src/utils/media.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/utils/media.js b/src/utils/media.js
index 3d07e5ae..9ab56736 100644
--- a/src/utils/media.js
+++ b/src/utils/media.js
@@ -1,3 +1,8 @@
+/**
+ *
+ * @param {Object} permissions
+ * @returns {Promise<{ success: boolean, error: boolean | Object | string, stream: MediaStream }>}
+ */
 export async function requestAndGetUserMedia(
   permissions = {
     video: true

From 202dbafcf89335f9ea5322da71a3d6c2d2c2d54f Mon Sep 17 00:00:00 2001
From: Sana Yasmin <sanayasmin94@gmail.com>
Date: Tue, 1 Oct 2024 14:59:57 +0530
Subject: [PATCH 15/26] minor-bugfix-camera

---
 src/components/shared/CameraCapture.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/shared/CameraCapture.vue b/src/components/shared/CameraCapture.vue
index 1e225dbb..35fb72b1 100644
--- a/src/components/shared/CameraCapture.vue
+++ b/src/components/shared/CameraCapture.vue
@@ -59,8 +59,8 @@ const canvasRef = ref(null)
 let capturedFile = null
 
 onMounted(async () => {
-  await getDevices()
   await intiateCameraWithPermissions()
+  await getDevices()
 })
 
 onBeforeUnmount(() => {
@@ -81,9 +81,11 @@ async function intiateCameraWithPermissions() {
     is_granted.value = true
   } else {
     const { success, stream } = await requestAndGetUserMedia({
-      video: {
-        deviceId: selectedDevice.value.deviceId
-      }
+      video: selectedDevice.value
+        ? {
+            deviceId: selectedDevice.value.deviceId
+          }
+        : true
     })
     if (success) {
       setCameraStream(stream)

From 1e84a923f30e684b056c92f505e1f6f952a550e1 Mon Sep 17 00:00:00 2001
From: Sana Yasmin <sanayasmin94@gmail.com>
Date: Sun, 13 Oct 2024 22:16:21 +0530
Subject: [PATCH 16/26] fix:#625 - implemented report tab loader

---
 src/components/Admin/ManageReports.vue |  6 +++---
 src/stores/reports.js                  | 23 ++++++++++++++---------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/components/Admin/ManageReports.vue b/src/components/Admin/ManageReports.vue
index 18e848bf..08dac6b2 100644
--- a/src/components/Admin/ManageReports.vue
+++ b/src/components/Admin/ManageReports.vue
@@ -1,15 +1,15 @@
 <template>
-  <h5 v-if="!reportStore.getReports" class="text-center">There are no reports yet.</h5>
+  <h5 v-if="!reportStore.getReports && reportStore.isLoaded" class="text-center">There are no reports yet.</h5>
   <q-table
     v-else
     :columns="columns"
     data-test="reports-table"
     grid
     hide-header
-    :loading="reportStore.isLoading"
+    :loading="!reportStore.isLoaded || reportStore.isLoading"
     :pagination="pagination"
     row-key="created"
-    :rows="reportStore.getReports"
+    :rows="reportStore.getReports ?? []"
     style="left: 0; right: 0"
     title="Manage Reports"
   >
diff --git a/src/stores/reports.js b/src/stores/reports.js
index 766edd6c..4d5737c9 100644
--- a/src/stores/reports.js
+++ b/src/stores/reports.js
@@ -19,7 +19,6 @@ export const useReportStore = defineStore('reports', {
 
   actions: {
     async fetchReports() {
-      this._isLoading = true
       const userStore = useUserStore()
       if (!userStore.getUsers) {
         await userStore.fetchUsers()
@@ -27,18 +26,24 @@ export const useReportStore = defineStore('reports', {
 
       if (!this._unSubscribe)
         this._unSubscribe = onSnapshot(collection(db, 'reports'), async (querySnapshot) => {
-          const reports = querySnapshot.docs.map((doc) => ({ id: doc.id, ...doc.data() }))
+          try {
+            this._isLoading = true
+            const reports = querySnapshot.docs.map((doc) => ({ id: doc.id, ...doc.data() }))
 
-          for (const report of reports) {
-            if (!report.isAnonymous) {
-              report.author = await getDoc(report.author).then((doc) => doc.data())
-            } else {
-              report.author = userStore.getUserById(report.author.id) || report.author.id
+            for (const report of reports) {
+              if (!report.isAnonymous) {
+                report.author = await getDoc(report.author).then((doc) => doc.data())
+              } else {
+                report.author = userStore.getUserById(report.author.id) || report.author.id
+              }
             }
+            this.$patch({ _reports: reports })
+          } catch (error) {
+            console.error('Error fetching reports:', error)
+          } finally {
+            this._isLoading = false
           }
-          this.$patch({ _reports: reports })
         })
-      this._isLoading = false
     },
 
     async addReports(payload) {

From 245db982070b55eb0e728f1340cbf1f854d49334 Mon Sep 17 00:00:00 2001
From: achille <achillegley@gmail.com>
Date: Sat, 19 Oct 2024 05:09:14 +0700
Subject: [PATCH 17/26] fix:#637 -roll back table entry and merge develop

---
 src/components/Admin/TableEntry.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Admin/TableEntry.vue b/src/components/Admin/TableEntry.vue
index 4c081765..6b9a2308 100644
--- a/src/components/Admin/TableEntry.vue
+++ b/src/components/Admin/TableEntry.vue
@@ -69,8 +69,8 @@
               v-if="
                 _currentPrompt?.isTreated ? props.row.isWinner && !_currentPrompt?.isTreated : props.row.isWinner && !props.row.isTreated
               "
-              color="green"
               :disable="props.row.author.uid !== userStore.getUserId"
+              color="green"
               icon="payment"
               unelevated
               size="sm"

From c94ee74034be5390bdae2dc11bac06a352143c5c Mon Sep 17 00:00:00 2001
From: achille <achillegley@gmail.com>
Date: Thu, 31 Oct 2024 16:27:42 +0700
Subject: [PATCH 18/26] update wallet.js

---
 src/stores/wallet.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stores/wallet.js b/src/stores/wallet.js
index 8017d8be..8ee2e35d 100644
--- a/src/stores/wallet.js
+++ b/src/stores/wallet.js
@@ -28,7 +28,7 @@ export const useWalletStore = defineStore('wallet', {
         name: import.meta.env.VITE_INFURA_POLYGON_MAINET_NETWORK_NAME,
         currency: import.meta.env.VITE_POLYGON_MAINET_CURRENCY,
         explorerUrl: import.meta.env.VITE_INFURA_POLYGON_MAINET_SCAN_URL,
-        rpcUrl: 'https://polygon-mainnet.infura.io',
+        rpcUrl: 'https://polygon-rpc.com',
         blockExplorerUrls: ['https://polygonscan.com/'],
 
         nativeCurrency: {

From 14d46370bb2d0cac1c33653bd083157b104581b8 Mon Sep 17 00:00:00 2001
From: achille <achillegley@gmail.com>
Date: Wed, 20 Nov 2024 18:23:22 +0700
Subject: [PATCH 19/26] update .gitignore

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index a9a847ec..b0ee1e46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,5 @@ package-lock.json
 
 .lighthousec/
 
+src/web3/alternatives
+src/components/Admin/updatedTableEntry.vue
\ No newline at end of file

From 8bb667bd9d4a28062adddda2020edb7c2bfe0b67 Mon Sep 17 00:00:00 2001
From: achille <achillegley@gmail.com>
Date: Wed, 27 Nov 2024 19:09:54 +0700
Subject: [PATCH 20/26] update gitignore

---
 .gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index b0ee1e46..40e34ac8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,4 +45,6 @@ package-lock.json
 .lighthousec/
 
 src/web3/alternatives
-src/components/Admin/updatedTableEntry.vue
\ No newline at end of file
+src/components/Admin/updatedTableEntry.vue
+
+src/web3/#walletConnect.js#
\ No newline at end of file

From fdfd4e25481972fc1a9ff97fd5b1c04c36159817 Mon Sep 17 00:00:00 2001
From: achille <achillegley@gmail.com>
Date: Sat, 30 Nov 2024 03:22:47 +0700
Subject: [PATCH 21/26] fix:#595 - Fixed auto detect wrong network

---
 .env                                          |  4 ++--
 functions/index.js                            | 10 +++++++++-
 src/components/Advertiser/AdvertiserTable.vue |  2 +-
 src/web3/adCampaignManager.js                 |  5 +----
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.env b/.env
index a5f0d2aa..f318926d 100644
--- a/.env
+++ b/.env
@@ -18,7 +18,7 @@ VITE_TEST_PASSWORD=12345678
 #BLOCKCHAIN
 VITE_WALLET_CONNECT_PROJECT_ID='9dcf39cb8034882a971d5086066c7f17'
 
-VITE_CURRENT_NETWORK_NAME="sepolia"
+VITE_CURRENT_NETWORK_NAME="MATIC"
 
 #sepolia
 VITE_ALCHEMY_SEPOLIA_PROVIDER_URL="https://eth-sepolia.g.alchemy.com/v2/F_3kP4qK3m83Mzp0ZsxoBSNwXn9AWZfy"
@@ -42,7 +42,7 @@ VITE_INFURA_POLYGON_MAINET_NETWORK_NAME="Polygon Matic"
 VITE_POLYGON_MAINET_CHAIN_ID=137
 VITE_POLYGON_MAINET_CURRENCY="MATIC"
 
-VITE_ADVERTISEMENT_CAMPAIGN_CONTRACT_ADDRESS="0x43cCa2E2F39b21379d2517eF8f21f6332fc88Fcb"
+VITE_ADVERTISEMENT_CAMPAIGN_CONTRACT_ADDRESS="0x96354a0D4746E4B87d7640B2891bdb313Ad6Ac66"
 VITE_ADVERTISEMENT_COMPAIGN_CONTRACT_OWNER= "0xdb0f8aACC19a779b9020a693c35014DaF9cF3796"
 
 VITE_ADVERTISE_CLICK_RATE='0.001'
diff --git a/functions/index.js b/functions/index.js
index 706aa612..05168040 100644
--- a/functions/index.js
+++ b/functions/index.js
@@ -46,6 +46,14 @@ async function calculateTotalVisits(advertiseDocRef) {
   return totalVisits
 }
 
+async function calculateAmountSpent(totalClicks, totalImpressions, totalVisits) {
+  return (
+    import.meta.env.VITE_ADVERTISE_CLICK_RATE * totalClicks +
+    import.meta.env.VITE_ADVERTISE_IMPRESSION_RATE * totalImpressions +
+    import.meta.env.VITE_ADVERTISE_VIEWS_RATE * totalVisits
+  )
+}
+
 async function updateAdvertiseStatus(docId) {
   const advertiseDocRef = db.collection('advertises').doc(docId)
 
@@ -56,7 +64,7 @@ async function updateAdvertiseStatus(docId) {
   const totalClicks = await calculateTotalClicks(advertiseDocRef)
   const totalVisits = await calculateTotalVisits(advertiseDocRef)
 
-  const totalCost = totalImpressions / 100 + totalClicks / 20 + totalVisits / 20
+  const totalCost = calculateAmountSpent(totalClicks, totalImpressions, totalVisits)
   const date1 = new Date()
   const date2 = new Date(docData.endDate)
   date1.setHours(0, 0, 0, 0)
diff --git a/src/components/Advertiser/AdvertiserTable.vue b/src/components/Advertiser/AdvertiserTable.vue
index 14d579b0..9417c660 100644
--- a/src/components/Advertiser/AdvertiserTable.vue
+++ b/src/components/Advertiser/AdvertiserTable.vue
@@ -676,7 +676,7 @@ function viewMatic(matic) {
 function showStatus(data) {
   const create = calculateStatus(data.publishDate)
   const ended = calculateStatus(data.endDate)
-  const budgetCrossed = computeAdvertisementMatic(data.impressions, data.clicks, data.visits) > Number(data.budget)
+  const budgetCrossed = computeAdvertisementMatic(data.totalImpressions, data.totalClicks, data.totalVisits) > Number(data.budget)
   if (!create) {
     return 'Publish date pending'
   } else if (budgetCrossed || data.status === 'Budget Crossed') {
diff --git a/src/web3/adCampaignManager.js b/src/web3/adCampaignManager.js
index a3025d97..c550a929 100644
--- a/src/web3/adCampaignManager.js
+++ b/src/web3/adCampaignManager.js
@@ -73,10 +73,7 @@ export const claimPayment = async (payload = { campaignCode: '', currentAmounSpe
   if (payload.campaignCode.length > 1 && payload.currentAmounSpentInMatic > 0) {
     try {
       const adCampaignManager = await getContractInstance()
-      if (
-        customWeb3modal.getAddress() &&
-        customWeb3modal.getAddress().toLowerCase() === import.meta.env.VITE_ADVERTISEMENT_COMPAIGN_CONTRACT_OWNER.toLowerCase()
-      ) {
+      if (customWeb3modal.getAddress()) {
         const tx = await adCampaignManager.claimPayment(
           payload.campaignCode,
           ethers.utils.parseEther(payload.currentAmounSpentInMatic.toString())

From a428e04603dc867c1ad97d18a48bbeb44c4a0fb9 Mon Sep 17 00:00:00 2001
From: achille <achillegley@gmail.com>
Date: Wed, 20 Nov 2024 18:23:22 +0700
Subject: [PATCH 22/26] update .gitignore

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index a9a847ec..b0ee1e46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,5 @@ package-lock.json
 
 .lighthousec/
 
+src/web3/alternatives
+src/components/Admin/updatedTableEntry.vue
\ No newline at end of file

From 65f42226680e1ef5b8f44cb54dc0784fad0c9015 Mon Sep 17 00:00:00 2001
From: achille <achillegley@gmail.com>
Date: Wed, 27 Nov 2024 19:09:54 +0700
Subject: [PATCH 23/26] update gitignore

---
 .gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index b0ee1e46..40e34ac8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,4 +45,6 @@ package-lock.json
 .lighthousec/
 
 src/web3/alternatives
-src/components/Admin/updatedTableEntry.vue
\ No newline at end of file
+src/components/Admin/updatedTableEntry.vue
+
+src/web3/#walletConnect.js#
\ No newline at end of file

From bfda130432e82c8022139e9358324ebb2428492d Mon Sep 17 00:00:00 2001
From: achille <achillegley@gmail.com>
Date: Sat, 30 Nov 2024 12:51:28 +0700
Subject: [PATCH 24/26] fix:#664 - correct comments

---
 src/components/Admin/ManagePromptsEntries.vue | 2 +-
 src/components/Admin/TableEntry.vue           | 2 +-
 src/components/Advertiser/AdvertiseCard.vue   | 2 +-
 src/components/Advertiser/AdvertiserTable.vue | 8 ++++----
 src/web3/adCampaignManager.js                 | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/Admin/ManagePromptsEntries.vue b/src/components/Admin/ManagePromptsEntries.vue
index 85784c64..90f0829a 100644
--- a/src/components/Admin/ManagePromptsEntries.vue
+++ b/src/components/Admin/ManagePromptsEntries.vue
@@ -346,7 +346,7 @@ function handleDeleteEntry(entryId, promptId) {
 async function onProceedDepositFundDialog(props) {
   //let's check if the entry already have valid payment..
   if (!customWeb3modal.getAddress()) {
-    $q.notify({ type: 'negative', message: ' please connect your wallet ' })
+    $q.notify({ type: 'negative', message: 'Please connect your wallet and try again' })
     customWeb3modal.open()
   } else {
     proceedDepositFundDialog.value.show = true
diff --git a/src/components/Admin/TableEntry.vue b/src/components/Admin/TableEntry.vue
index f1a902ed..b568e48d 100644
--- a/src/components/Admin/TableEntry.vue
+++ b/src/components/Admin/TableEntry.vue
@@ -302,7 +302,7 @@ async function onProceedPaymentDialog(props) {
   if (_currentPrompt.value) {
     $q.loading.show()
     if (!customWeb3modal.getAddress()) {
-      $q.notify({ type: 'negative', message: ' please connect your wallet ' })
+      $q.notify({ type: 'negative', message: 'Please connect your wallet and try again' })
       customWeb3modal.open()
       $q.loading.hide()
     } else {
diff --git a/src/components/Advertiser/AdvertiseCard.vue b/src/components/Advertiser/AdvertiseCard.vue
index 3cb3f1af..f733d12b 100644
--- a/src/components/Advertiser/AdvertiseCard.vue
+++ b/src/components/Advertiser/AdvertiseCard.vue
@@ -135,7 +135,7 @@
               mask="#.##"
               fill-mask="0"
               reverse-fill-mask
-              :rules="[() => (usdAmount < 0.01 ? 'Minimum allowed budget is 3 USD' : true)]"
+              :rules="[() => (usdAmount < 3 ? 'Minimum allowed budget is 3 USD' : true)]"
               @update:model-value="convertToMatic()"
             />
             <q-input
diff --git a/src/components/Advertiser/AdvertiserTable.vue b/src/components/Advertiser/AdvertiserTable.vue
index 9417c660..e0e678d4 100644
--- a/src/components/Advertiser/AdvertiserTable.vue
+++ b/src/components/Advertiser/AdvertiserTable.vue
@@ -311,7 +311,7 @@ async function _getEventsForCampaign(advertise) {
   if (advertise?.campaignCode) {
     $q.loading.show()
     if (!customWeb3modal.getAddress()) {
-      $q.notify({ type: 'negative', message: ' please connect your wallet ' })
+      $q.notify({ type: 'negative', message: 'Please connect your wallet and try again' })
       customWeb3modal.open()
       $q.loading.hide()
     } else {
@@ -407,7 +407,7 @@ async function onwithdrawAmountSpentDialog(advertise) {
 async function _claimPayment(advertise, currentAmountSpent) {
   $q.loading.show()
   if (!customWeb3modal.getAddress()) {
-    $q.notify({ type: 'negative', message: ' please connect your wallet ' })
+    $q.notify({ type: 'negative', message: 'Please connect your wallet and try again' })
     customWeb3modal.open()
     $q.loading.hide()
   } else {
@@ -438,13 +438,13 @@ async function _completeAdvertise(advertise) {
 async function _withdrawRemainingBudget(advertise, currentAmounSpent) {
   $q.loading.show()
   if (!customWeb3modal.getAddress()) {
-    $q.notify({ type: 'negative', message: ' please connect your wallet' })
+    $q.notify({ type: 'negative', message: 'Please connect your wallet and try again' })
     customWeb3modal.open()
     $q.loading.hide()
   } else {
     const result = await requestAndApproveWithdrawal({ campaignCode: advertise.campaignCode, currentAmounSpentInMatic: currentAmounSpent })
     if (result.status.includes('success')) {
-      $q.notify({ message: 'remaing budget withdrawn successfully ', type: 'positive' })
+      $q.notify({ message: 'Remaing budget withdrawn successfully ', type: 'positive' })
       //let's change the advertise status
       await _completeAdvertise(advertise)
     } else {
diff --git a/src/web3/adCampaignManager.js b/src/web3/adCampaignManager.js
index c550a929..480652e9 100644
--- a/src/web3/adCampaignManager.js
+++ b/src/web3/adCampaignManager.js
@@ -23,7 +23,7 @@ const getProvider = async () => {
     }
   } catch (error) {
     console.error('Error getting provider:', error)
-    error = 'please connect your wallet'
+    error = 'Please connect your wallet and  try again'
     // Rethrow the error to handle it where getProvider is called
     throw error
   }

From 53783a4450719b5ae9426aae072d1eb141c5e6f0 Mon Sep 17 00:00:00 2001
From: achille <achillegley@gmail.com>
Date: Wed, 4 Dec 2024 18:31:37 +0700
Subject: [PATCH 25/26] fix:#664 - correct comments

---
 src/components/Advertiser/AdvertiserTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Advertiser/AdvertiserTable.vue b/src/components/Advertiser/AdvertiserTable.vue
index e0e678d4..9ff571b8 100644
--- a/src/components/Advertiser/AdvertiserTable.vue
+++ b/src/components/Advertiser/AdvertiserTable.vue
@@ -413,7 +413,7 @@ async function _claimPayment(advertise, currentAmountSpent) {
   } else {
     const result = await claimPayment({ campaignCode: advertise.campaignCode, currentAmounSpentInMatic: currentAmountSpent.toString() })
     if (result.status.includes('success')) {
-      $q.notify({ message: 'campaign payment claimed successfully ', type: 'positive' })
+      $q.notify({ message: 'Campaign payment claimed successfully ', type: 'positive' })
       //let's change the advertise status.
       if (currentAmountSpent >= advertise.budget) {
         await _completeAdvertise(advertise)

From 6660ed653216d9d860c798c1dea62c3fea034268 Mon Sep 17 00:00:00 2001
From: achille <achillegley@gmail.com>
Date: Wed, 4 Dec 2024 18:35:19 +0700
Subject: [PATCH 26/26] fix:#664 - correct comments

---
 src/components/Advertiser/AdvertiserTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Advertiser/AdvertiserTable.vue b/src/components/Advertiser/AdvertiserTable.vue
index 9ff571b8..49c39cc0 100644
--- a/src/components/Advertiser/AdvertiserTable.vue
+++ b/src/components/Advertiser/AdvertiserTable.vue
@@ -318,7 +318,7 @@ async function _getEventsForCampaign(advertise) {
       const result = await getEventsForCampaign(advertise.campaignCode)
 
       if (result.status.includes('success')) {
-        $q.notify({ message: 'events retreived successfully ', type: 'positive' })
+        $q.notify({ message: 'Events retreived successfully ', type: 'positive' })
         // Combine events into a single array with eventType field
 
         const adCampaignCreatedEvents = result.events.adCampaignCreatedEvents.map((event) => ({