diff --git a/src/components/ContributionAssistantCropImageList.vue b/src/components/ContributionAssistantCropImageList.vue
deleted file mode 100644
index 3e43368404c..00000000000
--- a/src/components/ContributionAssistantCropImageList.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-  <v-row v-if="croppedImages.length">
-    <v-col
-      v-for="(imageSrc, index) in croppedImages"
-      :key="index"
-      cols="6"
-      md="4"
-    >
-      <v-card style="height: 200px;" class="pa-2">
-        <v-btn 
-          density="compact"
-          icon="mdi-delete"
-          style="left:calc(100% - 30px); z-index: 3;"
-          color="error"
-          @click="removeCrop(index)"
-        />
-        <v-img :src="imageSrc" class="cropped-image" />
-      </v-card>
-    </v-col>
-  </v-row>
-</template>
-
-<script>
-  export default {
-    props: {
-      croppedImages: {
-        type: Array,
-        default: () => []
-      }
-    },
-    emits: ['removeCrop'],
-    methods: {
-      removeCrop(index) {
-        this.$emit('removeCrop', index)
-      }
-    }
-  }
-</script>
diff --git a/src/components/ContributionAssistantDrawCanvas.vue b/src/components/ContributionAssistantDrawCanvas.vue
index 7e986e76b46..7459fe8de70 100644
--- a/src/components/ContributionAssistantDrawCanvas.vue
+++ b/src/components/ContributionAssistantDrawCanvas.vue
@@ -19,42 +19,42 @@
         type: Image,
         default: null
       },
-      seedCrops: {
+      boundingBoxesFromServer: {
         type: Array,
         default: null
       }
     },
-    emits: ['croppedImages', 'loaded'],
+    emits: ['extractedLabels', 'loaded'],
     data() {
       return {
         isDrawing: false,
         startX: 0,
         startY: 0,
         scale: 1,
-        rectangles: []
+        boundingBoxes: []
       }
     },
     watch: {
-      seedCrops() {
-        if (this.seedCrops) {
-          this.init(true)
+      boundingBoxesFromServer() {
+        if (this.boundingBoxesFromServer) {
+          this.initCanvas(true)
         }
       }
     },
     mounted() {
       if (this.image.complete) {
-        this.init()
+        this.initCanvas()
       } else {
-        this.image.onload = this.init
+        this.image.onload = this.initCanvas
       }
     },
     methods: {
-      init(keepRectangles=false) {
+      initCanvas(keepBoundingBoxes=false) {
         const canvas = this.$refs.canvas
         const ctx = canvas.getContext("2d")
         canvas.style.width = "100%"
         this.scale = canvas.offsetWidth / this.image.width
-        const preferedHeight = 400
+        const preferedHeight = window.innerHeight - 250
 
         if (preferedHeight < this.image.height * this.scale) {
           // Image will be too tall
@@ -70,21 +70,22 @@
         
         ctx.drawImage(this.image, 0, 0, newWidth, newHeight)
         
-        if (!keepRectangles) {
-          this.rectangles = [] // reset rectangles
+        if (!keepBoundingBoxes) {
+          this.boundingBoxes = [] // reset boundingBoxes
         }
-        if (this.seedCrops) {
-          this.rectangles = this.rectangles.concat(this.seedCrops.map(seedCrop => {
+        if (this.boundingBoxesFromServer) {
+          this.boundingBoxes = this.boundingBoxes.concat(this.boundingBoxesFromServer.map(boundingBox => {
             return {
-              startY: seedCrop[0] * this.image.height,
-              startX: seedCrop[1] * this.image.width,
-              endY: seedCrop[2] * this.image.height,
-              endX: seedCrop[3] * this.image.width
+              startY: boundingBox[0] * this.image.height,
+              startX: boundingBox[1] * this.image.width,
+              endY: boundingBox[2] * this.image.height,
+              endX: boundingBox[3] * this.image.width,
+              boundingSource: this.$t('ContributionAssistant.AutomaticBoundingBoxSource')
             }
           }))
-          this.cropImages()
+          this.extractLabels()
         }
-        this.drawRectangles(); // Draw previous rectangles after resizing
+        this.drawBoundingBoxes(); // Draw previous boundingBoxes after resizing
         this.$emit('loaded')
       },
       startDrawing(event) {
@@ -109,7 +110,7 @@
           const ctx = canvas.getContext("2d")
           
           ctx.drawImage(this.image, 0, 0, canvas.width, canvas.height); // Redraw image
-          this.drawRectangles(); // Redraw previous rectangles
+          this.drawBoundingBoxes(); // Redraw previous boundingBoxes
           
           const currentX = event.offsetX / this.scale
           const currentY = event.offsetY / this.scale
@@ -129,27 +130,26 @@
         }
         const endX = event.offsetX / this.scale
         const endY = event.offsetY / this.scale
-        this.rectangles.push({ startX: this.startX, startY: this.startY, endX, endY })
-        this.cropImages()
+        this.boundingBoxes.push({ startX: this.startX, startY: this.startY, endX, endY, boundingSource: this.$t('ContributionAssistant.ManualBoundingBoxSource') })
+        this.extractLabels()
       },
-      drawRectangles() {
+      drawBoundingBoxes() {
         const ctx = this.$refs.canvas.getContext("2d")
         ctx.strokeStyle = "red"
-        this.rectangles.forEach(rect => {
+        this.boundingBoxes.forEach(rect => {
           const { startX, startY, endX, endY } = rect
           const width = endX - startX
           const height = endY - startY
           ctx.strokeRect(startX * this.scale, startY * this.scale, width * this.scale, height * this.scale)
         });
       },
-      async cropImages() {
-        let croppedImages = []
-        let croppedBlobs = []
+      async extractLabels() {
+        let extractedLabels = []
         const originalCanvas = document.createElement("canvas")
         const ctx = originalCanvas.getContext("2d")
-        for (let i = 0; i < this.rectangles.length; i++) {
-          const rect = this.rectangles[i]
-          const { startX, startY, endX, endY } = rect
+        for (let i = 0; i < this.boundingBoxes.length; i++) {
+          const rect = this.boundingBoxes[i]
+          const { startX, startY, endX, endY, boundingSource } = rect
           const width = Math.abs(endX - startX)
           const height = Math.abs(endY - startY)
           
@@ -157,19 +157,22 @@
           originalCanvas.height = height
           ctx.drawImage(this.image, Math.min(startX, endX), Math.min(startY, endY), width, height, 0, 0, width, height)
           
-          croppedImages[i] = originalCanvas.toDataURL()
-          croppedBlobs[i] = await new Promise(resolve => originalCanvas.toBlob(resolve, 'image/webp'))
+          extractedLabels[i] = {
+            imageSrc: originalCanvas.toDataURL(),
+            blob: await new Promise(resolve => originalCanvas.toBlob(resolve, 'image/webp')),
+            boundingSource: boundingSource
+          }
         }
-        this.$emit('croppedImages', [croppedImages, croppedBlobs])
+        this.$emit('extractedLabels', extractedLabels)
       },
-      removeRectangle(index) {
-        this.rectangles.splice(index, 1)
+      removeBoundingBox(index) {
+        this.boundingBoxes.splice(index, 1)
           const canvas = this.$refs.canvas
           const ctx = canvas.getContext("2d")
           
           ctx.drawImage(this.image, 0, 0, canvas.width, canvas.height)
-          this.drawRectangles()
-          this.cropImages()
+          this.drawBoundingBoxes()
+          this.extractLabels()
       }
     }
   }
diff --git a/src/components/ContributionAssistantLabelList.vue b/src/components/ContributionAssistantLabelList.vue
new file mode 100644
index 00000000000..4523d9ec331
--- /dev/null
+++ b/src/components/ContributionAssistantLabelList.vue
@@ -0,0 +1,58 @@
+<template>
+  <v-row v-if="labels.length">
+    <v-col
+      v-for="(label, index) in labels"
+      :key="index"
+      cols="6"
+      md="6"
+      xl="4"
+    >
+      <v-card>
+        <v-card-text>
+          <v-img style="height:150px" :src="label.imageSrc" />
+        </v-card-text>
+        <v-divider />
+        <v-card-actions>
+          <v-list-item class="w-100">
+            <template #prepend>
+              <v-chip label size="small" density="comfortable">
+                <span>
+                  {{ $t('Common.Source') }} {{ label.boundingSource }}
+                </span>
+              </v-chip>
+            </template>
+            <template #append>
+              <div class="justify-self-end">
+                <v-btn
+                  color="error"
+                  variant="outlined"
+                  prepend-icon="mdi-delete"
+                  @click="removeLabel(index)"
+                >
+                  {{ $t('Common.Delete') }}
+                </v-btn>
+              </div>
+            </template>
+          </v-list-item>
+        </v-card-actions>
+      </v-card>
+    </v-col>
+  </v-row>
+</template>
+
+<script>
+  export default {
+    props: {
+      labels: {
+        type: Array,
+        default: () => []
+      }
+    },
+    emits: ['removeLabel'],
+    methods: {
+      removeLabel(index) {
+        this.$emit('removeLabel', index)
+      }
+    }
+  }
+</script>
diff --git a/src/components/ContributionAssistantPriceFormCard.vue b/src/components/ContributionAssistantPriceFormCard.vue
index 27df10600a8..71ff0bf0ca7 100644
--- a/src/components/ContributionAssistantPriceFormCard.vue
+++ b/src/components/ContributionAssistantPriceFormCard.vue
@@ -1,29 +1,25 @@
 <!-- eslint-disable vue/no-mutating-props -->
 <template>
   <v-card
-    class="border-transparent mb-4"
     height="100%"
     title="Label"
     prepend-icon="mdi-tag-outline"
   >
-    <template #append>
-      <v-icon icon="mdi-delete" color="error" @click="removePrice()" />
-    </template>
     <v-divider />
-    <v-img
-      height="200px"
-      :src="productPriceForm.proofImage"
-      contain
-    />
     <v-card-text>
-      <ProductInputRow :productForm="productPriceForm" :disableInitWhenSwitchingModes="true" @filled="productFormFilled = $event" />
+      <v-img
+        class="mb-4"
+        height="200px"
+        :src="productPriceForm.proofImage"
+        contain
+      />
+      <ProductInputRow :productForm="productPriceForm" :disableInitWhenSwitchingType="true" @filled="productFormFilled = $event" />
       <v-alert
         v-if="productPriceForm.type === 'PRODUCT'"
-        class="mb-2"
         type="info"
-        variant="plain"
+        variant="outlined"
       >
-        Detected barcode: {{ productPriceForm.detected_product_code }}
+        {{ $t('ContributionAssistant.DetectedBarcode', { barcode: productPriceForm.detected_product_code }) }}
       </v-alert>
       <v-row v-if="productPriceForm.type == 'CATEGORY'">
         <v-col>
@@ -39,6 +35,17 @@
       </v-row>
       <PriceInputRow class="mt-0" :priceForm="productPriceForm" :hideCurrencyChoice="true" @filled="pricePriceFormFilled = $event" />
     </v-card-text>
+    <v-divider />
+    <v-card-actions>
+      <v-btn
+        color="error"
+        variant="outlined"
+        prepend-icon="mdi-delete"
+        @click="removePrice"
+      >
+        {{ $t('Common.Delete') }}
+      </v-btn>
+    </v-card-actions>
   </v-card>
 </template>
 
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index 0759cdc0114..00dab126b30 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -288,6 +288,7 @@
 		"Type": "Type",
 		"Upload": "Upload",
 		"UploadMultipleImages": "Upload {count} image | Upload {count} images",
+		"UploadMultiplePrices": "Upload {count} price | Upload {count} prices",
 		"URL": "URL",
 		"URLInvalid": "Invalid URL",
 		"User": "User",
@@ -302,6 +303,33 @@
 		"PetFood": "Pet food",
 		"Beauty": "Beauty"
 	},
+	"ContributionAssistant": {
+		"Steps": {
+			"ProofSelect": "1. Proof selection",
+			"LabelsExtraction": "2. Labels extraction",
+			"Cleanup": "3. Cleanup",
+			"Summary": "4. Summary"
+		},
+		"BoundingBoxesFromServerWarning": "No labels could be automatically detected. Please manually draw squares around the labels or press the button below to try again.",
+		"FindBoundingBoxes": "Automatically find labels",
+		"FindBoundingBoxesRunning": "Automatic label detection is running. Please wait...",
+		"LabelsExtractionSteps": {
+			"DrawBoundingBoxes": "1. Draw squares around the labels",
+			"CheckLabels": "2. Check the readability of labels",
+			"SendLabels": "3. Send the labels for automatic processing",
+			"SendLabelsButton": "Send labels"
+		},
+		"PriceAddConfirmationMessage": "{numberOfPricesAdded} price(s) will be added to an existing proof on the {date} at {locationName}",
+		"PriceAddProgress": "{numberOfPricesAdded} / {totalNumberOfPrices} prices added",
+		"WaitForUpload": "Please wait for upload",
+		"GoToDashboard": "Go to your dashboard",
+		"GoToProof": "Go to proof",
+		"AddNewProof": "Add a new proof",
+		"AutomaticBoundingBoxSource": "automatic",
+		"ManualBoundingBoxSource": "manual",
+		"DetectedBarcode": "Detected barcode: {barcode}",
+		"LabelProcessingErrorMessage": "Error: label automatic processing failed"
+	},
 	"Community": {
 		"JoinUs": "Join us!",
 		"HowToUseTheData": "Use the data"
diff --git a/src/services/api.js b/src/services/api.js
index 43b0a8fc9ee..a6797ca6adc 100644
--- a/src/services/api.js
+++ b/src/services/api.js
@@ -336,13 +336,13 @@ export default {
       return this.openstreetmapNominatimSearch(q)
     }
   },
-  processWithGemini(croppedBlobs) {
+  processWithGemini(labels) {
     const store = useAppStore()
     const url = `${import.meta.env.VITE_OPEN_PRICES_API_URL}/proofs/process_with_gemini`
     const formData = new FormData()
 
-    croppedBlobs.forEach((blob) => {
-      formData.append('files', blob)
+    labels.forEach((label) => {
+      formData.append('files', label.blob)
     });
 
     return fetch(url, {
diff --git a/src/views/ContributionAssistant.vue b/src/views/ContributionAssistant.vue
index dfa9744eebd..6be6df91251 100644
--- a/src/views/ContributionAssistant.vue
+++ b/src/views/ContributionAssistant.vue
@@ -2,16 +2,16 @@
   <v-container>
     <v-tabs v-model="tab">
       <v-tab value="ProofSelect" :disabled="disableProofSelectTab">
-        1. Proof selection
+        {{ $t('ContributionAssistant.Steps.ProofSelect') }}
       </v-tab>
-      <v-tab value="Crop" :disabled="disableCropTab">
-        2. Image crop
+      <v-tab value="LabelsExtraction" :disabled="disableLabelsExtractionTab">
+        {{ $t('ContributionAssistant.Steps.LabelsExtraction') }}
       </v-tab>
       <v-tab value="Cleanup" :disabled="disableCleanupTab">
-        3. Cleanup
+        {{ $t('ContributionAssistant.Steps.Cleanup') }}
       </v-tab>
       <v-tab value="Summary" :disabled="disableSummaryTab">
-        4. Summary
+        {{ $t('ContributionAssistant.Steps.Summary') }}
       </v-tab>
     </v-tabs>
     <v-tabs-window v-model="tab">
@@ -24,41 +24,41 @@
           </v-row>
         </v-container>
       </v-tabs-window-item>
-      <v-tabs-window-item value="Crop">
+      <v-tabs-window-item value="LabelsExtraction">
         <v-container>
-          <v-alert v-if="drawCanvasLoaded && !seedCrops.length && !predictionLoading" type="info" variant="outlined" icon="mdi-alert">
-            No labels could be automatically detected. Please manually draw squares around the labels or press the button below to try again.
-            <br />
-            <v-btn @click="loadPredictions(proofForm.id)">
-              Automatically find labels
+          <v-alert v-if="drawCanvasLoaded && !boundingBoxesFromServer.length && !proofWithBoundingBoxesLoading" class="mb-2" type="info" variant="outlined" icon="mdi-alert">
+            {{ $t('ContributionAssistant.BoundingBoxesFromServerWarning') }}
+            <br>
+            <v-btn @click="loadProofWithBoundingBoxes(proofForm.id)">
+              {{ $t('ContributionAssistant.FindBoundingBoxes') }}
             </v-btn>
           </v-alert>
-          <v-alert v-if="drawCanvasLoaded && predictionLoading" type="info" variant="outlined" icon="mdi-magnify">
-            Automatic label detection is running. Please wait...
-              <v-progress-circular indeterminate />
+          <v-alert v-if="drawCanvasLoaded && proofWithBoundingBoxesLoading" class="mb-2" type="info" variant="outlined" icon="mdi-magnify">
+            {{ $t('ContributionAssistant.FindBoundingBoxesRunning') }}
+            <v-progress-circular indeterminate />
           </v-alert>
           <v-row>
             <v-col cols="12" lg="6">
               <h3 class="mb-4">
-                1. Draw squares around the labels
+                {{ $t('ContributionAssistant.LabelsExtractionSteps.DrawBoundingBoxes') }}
               </h3>
               <v-progress-circular v-if="!drawCanvasLoaded" indeterminate />
-              <ContributionAssistantDrawCanvas ref="ContributionAssistantdrawCanvas" :image="image" :seedCrops="seedCrops" @croppedImages="onCroppedImages($event)" @loaded="drawCanvasLoaded = true" />
+              <ContributionAssistantDrawCanvas ref="ContributionAssistantdrawCanvas" :image="image" :boundingBoxesFromServer="boundingBoxesFromServer" @extractedLabels="onExtractedLabels($event)" @loaded="drawCanvasLoaded = true" />
             </v-col>
             <v-col cols="12" lg="6">
               <h3 class="mb-4">
-                2. Check the readability of labels
+                {{ $t('ContributionAssistant.LabelsExtractionSteps.CheckLabels') }}
               </h3>
-              <ContributionAssistantCropImageList :croppedImages="croppedImages" @removeCrop="removeCrop($event)" />
+              <ContributionAssistantLabelList :labels="extractedLabels" @removeLabel="removeLabel($event)" />
             </v-col>
           </v-row>
           <v-row>
             <v-col cols="12">
               <h3 class="mb-4">
-                3. Send the cropped images for automatic processing
+                {{ $t('ContributionAssistant.LabelsExtractionSteps.SendLabels') }}
               </h3>
-              <v-btn color="success" :disabled="!croppedImages.length" :loading="processCroppedImagesLoading" @click="processCroppedImages">
-                Process Cropped Images
+              <v-btn color="success" :disabled="!extractedLabels.length" :loading="processLabelsLoading" @click="processLabels">
+                {{ $t('ContributionAssistant.LabelsExtractionSteps.SendLabelsButton') }}
               </v-btn>
             </v-col>
           </v-row>
@@ -85,11 +85,11 @@
                 variant="outlined"
               >
                 <p>
-                  {{ productPriceForms.length }} price{{ productPriceForms.length > 1 ? 's' : '' }} will be added to an existing proof on the {{ proofForm.date }} at {{ locationName }}.
+                  {{ $t('ContributionAssistant.PriceAddConfirmationMessage', { numberOfPricesAdded: productPriceForms.length, date: proofForm.date, locationName: locationName }) }}
                 </p>
               </v-alert>
-              <v-btn class="mt-4" color="success" :loading="addPricesLoading" @click="addPrices">
-                {{ $t('Common.Upload') }}
+              <v-btn class="float-right mt-4" color="success" :loading="addPricesLoading" @click="addPrices">
+                {{ $t('Common.UploadMultiplePrices', productPriceForms.length) }}
               </v-btn>
             </v-col>
           </v-row>
@@ -100,7 +100,7 @@
           <v-row>
             <v-col>
               <h3 class="mb-4">
-                Please wait for upload
+                {{ $t('ContributionAssistant.WaitForUpload') }}
               </h3>
               <v-progress-linear
                 v-model="numberOfPricesAdded"
@@ -109,16 +109,16 @@
                 height="25"
                 stripped
               >
-                <strong>{{ numberOfPricesAdded }} / {{ productPriceForms.length }} prices added</strong>
+                <strong>{{ $t('ContributionAssistant.PriceAddProgress', { numberOfPricesAdded: numberOfPricesAdded, totalNumberOfPrices: productPriceForms.length }) }}</strong>
               </v-progress-linear>
               <v-btn to="/dashboard" class="mt-4" :aria-label="$t('Common.Dashboard')" :disabled="!allDone">
-                Go to your dashboard
+                {{ $t('ContributionAssistant.GoToDashboard') }}
               </v-btn>
               <v-btn :to="'/proofs/' + proofForm.id" class="mt-4 ml-4" :disabled="!allDone">
-                Go to proof
+                {{ $t('ContributionAssistant.GoToProof') }}
               </v-btn>
               <v-btn class="mt-4 ml-4" :disabled="!allDone" @click="reloadPage">
-                Add a new proof
+                {{ $t('ContributionAssistant.AddNewProof') }}
               </v-btn>
             </v-col>
           </v-row>
@@ -126,6 +126,13 @@
       </v-tabs-window-item>
     </v-tabs-window>
   </v-container>
+  <v-snackbar
+    v-model="labelProcessingErrorMessage"
+    color="error"
+    :timeout="5000"
+  >
+    {{ $t('ContributionAssistant.LabelProcessingErrorMessage') }}
+  </v-snackbar>
 </template>
 
 <script>
@@ -140,7 +147,7 @@ export default {
   components: {
     ContributionAssistantPriceFormCard: defineAsyncComponent(() => import('../components/ContributionAssistantPriceFormCard.vue')),
     ContributionAssistantDrawCanvas: defineAsyncComponent(() => import('../components/ContributionAssistantDrawCanvas.vue')),
-    ContributionAssistantCropImageList: defineAsyncComponent(() => import('../components/ContributionAssistantCropImageList.vue')),
+    ContributionAssistantLabelList: defineAsyncComponent(() => import('../components/ContributionAssistantLabelList.vue')),
     ProofInputRow: defineAsyncComponent(() => import('../components/ProofInputRow.vue')),
   },
   data() {
@@ -148,9 +155,8 @@ export default {
       tab: 'ProofSelect',
       drawCanvasLoaded: false,
       image: new Image(),
-      seedCrops: [],
-      croppedImages: [],
-      croppedBlobs: [],
+      boundingBoxesFromServer: [],
+      extractedLabels: [],
       productPriceForms : [],
       proofForm: {
         type: constants.PROOF_TYPE_PRICE_TAG,
@@ -163,10 +169,12 @@ export default {
         receipt_price_count: null,
         receipt_price_total: null,
       },
-      processCroppedImagesLoading: false,
+      processLabelsLoading: false,
       addPricesLoading: false,
-      predictionLoading: false,
-      numberOfPricesAdded: 0
+      proofWithBoundingBoxesLoading: false,
+      proofSecondCallTimeout: null,
+      numberOfPricesAdded: 0,
+      labelProcessingErrorMessage: false
     }
   },
   computed: {
@@ -184,8 +192,8 @@ export default {
       // ProofSelect tab should disabled on summary step
       return this.tab == "Summary"
     },
-    disableCropTab() {
-      // Crop tab should only be enabled after the proof is selected
+    disableLabelsExtractionTab() {
+      // LabelsExtraction tab should only be enabled after the proof is selected
       // It should also be disabled on summary step
       return !this.proofForm.id || this.tab == "Summary"
     },
@@ -210,59 +218,68 @@ export default {
     reloadPage(){
       window.location.reload()
     },
-    async setProof(event) {
+    setProof(event) {
       const image = new Image()
+      // image.src = 'https://prices.openfoodfacts.org/img/0024/tM0NEloNU3.webp'
       image.src = `${import.meta.env.VITE_OPEN_PRICES_APP_URL}/img/${event.file_path}`
       image.crossOrigin = 'Anonymous'
       this.image = image
       this.proofForm = event
 
-      this.croppedImages = []
-      this.croppedBlobs = []
+      this.extractedLabels = []
       this.productPriceForms = []
-      this.tab = "Crop"
-      // Try to fetch proof right away (predections should be available for proofs previously uploaded)
-      await this.loadPredictions(event.id)
-      if (!this.seedCrops.length) {
-        this.predictionLoading = true
-        // If no predictions are found right away (new proof), try again after 5 seconds
-        setTimeout(() => this.loadPredictions(event.id), 5000)
-        // If that also fails, user will have to click the button to retry
-      }
+      this.tab = "LabelsExtraction"
+      // Try to fetch proof right away (bounding boxes should be available for proofs previously uploaded)
+      this.loadProofWithBoundingBoxes(event.id, true)
+      // If no bounding boxes are found right away (new proof), try again after 5 seconds
+      this.proofSecondCallTimeout = setTimeout(() => this.loadProofWithBoundingBoxes(event.id), 5000)
+      // If that also fails, user will have to click the button to retry
     },
-    async loadPredictions(proofId) {
-      this.predictionLoading = true
-      const proof = await api.getProofById(proofId)
-      if (proof.predictions && proof.predictions.length) {
-        for (let prediction of proof.predictions) {
-          if (prediction.type === "OBJECT_DETECTION") {
-            this.seedCrops = prediction.data.objects.map(predictionObject => {
-              return predictionObject.bounding_box
-            })
+    loadProofWithBoundingBoxes(proofId, firstCall=false) {
+      this.proofWithBoundingBoxesLoading = true
+      api.getProofById(proofId).then(proof => {
+        if (proof.predictions && proof.predictions.length) {
+          for (let prediction of proof.predictions) {
+            if (prediction.type === "OBJECT_DETECTION") {
+              this.boundingBoxesFromServer = prediction.data.objects.map(predictionObject => predictionObject.bounding_box)
+              if (this.boundingBoxesFromServer.length) {
+                clearTimeout(this.proofSecondCallTimeout)
+                this.proofWithBoundingBoxesLoading = false
+              }
+            }
           }
         }
-      }
-      this.predictionLoading = false
+        if (!firstCall) {
+          this.proofWithBoundingBoxesLoading = false
+        }
+      })
     },
-    onCroppedImages(eventData) {
-      this.croppedImages = eventData[0]
-      this.croppedBlobs = eventData[1]
+    onExtractedLabels(extractedLabels) {
+      this.extractedLabels = extractedLabels
     },
-    removeCrop(index) {
-      this.$refs.ContributionAssistantdrawCanvas.removeRectangle(index) // This will trigger onCroppedImages event to update the other lists
+    removeLabel(index) {
+      this.$refs.ContributionAssistantdrawCanvas.removeBoundingBox(index) // This will trigger onExtractedLabels event
     },
-    async processCroppedImages() {
-      this.processCroppedImagesLoading = true
-      const res = await api.processWithGemini(this.croppedBlobs)
-      if (res) {
-        this.handleGeminiResponse(res)
-      } else {
-        console.error("TODO: handle error in image processing")
-      }
-      this.processCroppedImagesLoading = false
+    processLabels() {
+      this.processLabelsLoading = true
+      this.labelProcessingErrorMessage = false
+      api.processWithGemini(this.extractedLabels).then(res => {
+        if (res) {
+          this.handleGeminiResponse(res)
+        } else {
+          console.error("Error in gemini response")
+          this.labelProcessingErrorMessage = true
+        }
+        this.processLabelsLoading = false
+      })
     },
     handleGeminiResponse(response) {
       console.log('handleGeminiResponse', response)
+      if (!response.labels) {
+        console.error("No labels found in gemini response")
+        this.labelProcessingErrorMessage = true
+        return
+      }
       this.productPriceForms = []
       for (let i = 0; i < response.labels.length; i++) {
         const label = response.labels[i]
@@ -277,7 +294,7 @@ export default {
           price_per: label.unit,
           price_is_discounted: false,
           currency: this.appStore.getUserLastCurrencyUsed || 'EUR',
-          proofImage: this.croppedImages[i],
+          proofImage: this.extractedLabels[i].imageSrc,
           product_code: barcodeString,
           detected_product_code: barcodeString
         }
@@ -288,7 +305,7 @@ export default {
     removePrice(index) {
       this.productPriceForms.splice(index, 1)
     },
-    async addPrices() {
+    addPrices() {
       this.addPricesLoading = true
       this.numberOfPricesAdded = 0
       this.tab = "Summary"
@@ -321,9 +338,11 @@ export default {
           delete priceData.product_code
           delete priceData.product
         }
-        await api.createPrice(priceData, this.$route.path) // TODO: error handling
-        this.productPriceForms[i].processed = true
-        this.numberOfPricesAdded += 1
+        api.createPrice(priceData, this.$route.path).then(() => {
+          // TODO: error handling
+          this.productPriceForms[i].processed = true
+          this.numberOfPricesAdded += 1
+        })
       }
       this.addPricesLoading = false
     }