From c024b43629a953e544b67cdc51484bf1b04c94b2 Mon Sep 17 00:00:00 2001
From: Alexandre Magno <alexanmtz@gmail.com>
Date: Mon, 25 Nov 2024 14:46:28 +0100
Subject: [PATCH] open existing offers

---
 frontend/src/components/profile/profile.js             |  5 +++++
 .../src/components/task/offers/task-offer-drawer.tsx   |  4 ++--
 frontend/src/components/task/task.js                   | 10 ++++++----
 frontend/src/main/routes.js                            |  2 +-
 locales/en.json                                        |  2 +-
 modules/mail/assign.js                                 |  6 +-----
 6 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/frontend/src/components/profile/profile.js b/frontend/src/components/profile/profile.js
index c5d474df..7d039f84 100644
--- a/frontend/src/components/profile/profile.js
+++ b/frontend/src/components/profile/profile.js
@@ -437,6 +437,11 @@ class Profile extends Component {
                       path='/profile/task/:id'
                       component={ (props) => <TaskContainer noTopBar noBottomBar { ...props } /> }
                     />
+                    <Route
+                      exact
+                      path='/profile/task/:id/offers'
+                      component={ (props) => <TaskContainer noTopBar noBottomBar { ...props } /> }
+                    />
                     <Route
                       exact
                       path='/profile/task/:id/:slug'
diff --git a/frontend/src/components/task/offers/task-offer-drawer.tsx b/frontend/src/components/task/offers/task-offer-drawer.tsx
index e320c871..4f999139 100644
--- a/frontend/src/components/task/offers/task-offer-drawer.tsx
+++ b/frontend/src/components/task/offers/task-offer-drawer.tsx
@@ -1,6 +1,6 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import { FormattedMessage } from 'react-intl';
-import OfferDrawer, { type OfferDrawerProps } from '../../design-library/templates/offer-drawer/offer-drawer';
+import OfferDrawer from '../../design-library/templates/offer-drawer/offer-drawer';
 import { makeStyles, Typography, } from '@material-ui/core';
 import TaskOrderInvoiceConfirm from '../task-order-invoice-confirm';
 import MessageAssignment from '../assignment/messageAssignment';
diff --git a/frontend/src/components/task/task.js b/frontend/src/components/task/task.js
index 97de15c8..33cca82d 100644
--- a/frontend/src/components/task/task.js
+++ b/frontend/src/components/task/task.js
@@ -36,14 +36,11 @@ import {
   Close as CloseIcon,
   ExpandLess,
   ExpandMore,
-  BugReport as BugReportIcon,
   AttachMoney as MoneyIcon,
   HowToReg as HowToRegIcon,
   CreditCard as BountyIcon,
   Gavel as OfferIcon,
   Redeem as RedeemIcon,
-  Delete as DeleteIcon,
-  AssignmentInd as AssignmentIcon,
   EmojiFoodBeverage as CoffeeIcon,
 } from '@material-ui/icons'
 
@@ -53,7 +50,6 @@ import TopBarContainer from '../../containers/topbar'
 import Bottom from '../bottom/bottom'
 import TaskPayment from './task-payment'
 import LoginButton from '../session/login-button'
-import TaskAssignment from './task-assignment'
 import TaskSolve from './task-solve'
 import TaskPaymentForm from './task-payment-form'
 import TaskPayments from './task-payments'
@@ -442,6 +438,12 @@ class Task extends Component {
     }
     const assign_id = this.props.match.params.interested_id
     const hash = this.props.location.hash
+    const isOfferPage = this.props.match.path === '/profile/task/:id/offers'
+    
+    if(isOfferPage) {
+      this.setState({ assignDialog: true })
+    }
+
     if(hash === '#task-solution-dialog') {
       this.setState({ taskSolveDialog: true })
 
diff --git a/frontend/src/main/routes.js b/frontend/src/main/routes.js
index 1094491f..46f3e33e 100644
--- a/frontend/src/main/routes.js
+++ b/frontend/src/main/routes.js
@@ -59,7 +59,7 @@ export default props => (
       <Route exact path='/task/:id/:slug/interested' component={ TaskContainer } />
       <Route exact path='/task/:id/interested/:interested_id' component={ TaskContainer } />
       <Route exact path='/task/:id/members' component={ TaskContainer } />
-      <Route exact path='/task/:id/offers' component={ TaskContainer } />
+      
       <Route exact path='/task/:id/history' component={ TaskContainer } />
       <Route exact path='/task/:id/claim' component={ TaskContainer } />
       <Route exact path='/stats' component={ Stats } />
diff --git a/locales/en.json b/locales/en.json
index 76db5eff..bf99c6d1 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -22,7 +22,7 @@
   "mail.assign.owner.main": "{{name}} is interested in working on the issue <a href=\"{{url}}\">{{title}}</a>.",
   "mail.assign.owner.suggest": "<p>Suggested bounty: <strong>${{value}}</strong></p> <p>Suggested date: <strong>{{suggestedDate}}</strong></p> <p>For learning purposes: <strong>{{learn}}</strong></p><p>Comment: {{comment}}</p>",
   "mail.assign.owner.sec": "You can accept or reject this proposal.",
-  "mail.assign.owner.button.primary": "Accept work and assign them to this issue",
+  "mail.assign.owner.button.primary": "Check offer",
   "mail.messageInterested.subject": "You received a message about an issue you're interested in on Gitpay",
   "mail.messageInterested.intro": "{{name}} wrote about the issue <a href=\"{{url}}\">{{title}}</a> you're interested in on Gitpay:",
   "mail.messageInterested.message": "{{message}}",
diff --git a/modules/mail/assign.js b/modules/mail/assign.js
index 008a67bf..11bfe9c2 100644
--- a/modules/mail/assign.js
+++ b/modules/mail/assign.js
@@ -48,13 +48,9 @@ if (constants.canSendEmail) {
           <p>${i18n.__('mail.assign.owner.sec')}</p>
 ${Signatures.buttons(language, {
               primary: {
-                label: 'mail.assign.owner.button.primary',
+                label: 'mail.assign.owner.button.offer',
                 title: task.title,
                 url: `${process.env.FRONTEND_HOST}/#/task/${task.id}/offers`
-              },
-              secondary: {
-                label: 'mail.assign.owner.button.secondary',
-                url: `${process.env.FRONTEND_HOST}/#/task/${task.id}/interested`
               }
             })}`)
         },