Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TM-1438 add back button to bid tracker #599

Merged
merged 8 commits into from
Dec 16, 2019
Merged

TM-1438 add back button to bid tracker #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8ae788e
TM-1438 add back button to bid tracker
BaldwinJordan Dec 12, 2019
ca28e6b
Merge branch 'dev' into feature/add_back_button
BaldwinJordan Dec 12, 2019
d42131e
update tests
BaldwinJordan Dec 12, 2019
992dfea
Merge branch 'feature/add_back_button' of https://github.com/MetaPhas…
BaldwinJordan Dec 12, 2019
0ab79b2
Merge branch 'dev' into feature/add_back_button
mjoyce91 Dec 12, 2019
9a16c36
Merge branch 'dev' into feature/add_back_button
BaldwinJordan Dec 13, 2019
a774475
Merge branch 'dev' into feature/add_back_button
rtirserio Dec 16, 2019
f82cea9
Merge branch 'dev' into feature/add_back_button
rtirserio Dec 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Components/BidTracker/BidTracker.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import ProfileSectionTitle from '../ProfileSectionTitle';
import Spinner from '../Spinner';
import NotificationsSection from './NotificationsSection';
import ContactCDOButton from './ContactCDOButton';
import BackButton from '../BackButton';

const BidTracker = ({ bidList, bidListIsLoading, acceptBid, declineBid, submitBid, deleteBid,
notifications, notificationsIsLoading, markBidTrackerNotification, userProfile,
Expand All @@ -16,6 +17,7 @@ userProfileIsLoading, isPublic, useCDOView }) => {
`${userProfile.name}'s Bid Tracker` : 'Bid Tracker';
return (
<div className="usa-grid-full profile-content-inner-container bid-tracker-page">
<BackButton />
{
!isPublic &&
<NotificationsSection
Expand Down
2 changes: 2 additions & 0 deletions src/Components/BidTracker/__snapshots__/BidTracker.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ exports[`BidTrackerComponent matches snapshot 1`] = `
<div
className="usa-grid-full profile-content-inner-container bid-tracker-page"
>
<Connect(withRouter()) />
<NotificationsSection
markBidTrackerNotification={[Function]}
notifications={
Expand Down Expand Up @@ -326,6 +327,7 @@ exports[`BidTrackerComponent matches snapshot when bidListIsLoading is true 1`]
<div
className="usa-grid-full profile-content-inner-container bid-tracker-page"
>
<Connect(withRouter()) />
<NotificationsSection
markBidTrackerNotification={[Function]}
notifications={
Expand Down