Merge branch 'develop' of github.com:objectcomputing/check-ins into develop

Author: thelenw

web-ui/src/components/reviews/TeamReviews.jsx

@@ -68,10 +68,11 @@ import {
 
 import MemberSelector from '../member_selector/MemberSelector';
 import MemberSelectorDialog from '../member_selector/member_selector_dialog/MemberSelectorDialog';
-
 import DatePickerField from '../date-picker-field/DatePickerField.jsx';
 import '../date-picker-field/DatePickerField.css';
 import './TeamReviews.css';
+import ReviewPeriodStepper from "./periods/ReviewPeriodStepper.jsx";
+
 
 const propTypes = {
   onBack: PropTypes.func,
@@ -1009,6 +1010,12 @@ const TeamReviews = ({ onBack, periodId }) => {
           </div>
         )}
       </div>
+
+      <ReviewPeriodStepper
+          reviewPeriod={period}
+      />
+
+
       {period && (
         <div className="date-pickers-row">
           <div className="date-pickers-container">

web-ui/src/components/reviews/periods/ReviewPeriods.jsx

@@ -37,7 +37,6 @@ import {
 } from '../../../context/selectors';
 
 import ReviewPeriodCard from './ReviewPeriodCard.jsx';
-import ReviewPeriodStepper from './ReviewPeriodStepper.jsx';
 
 const propTypes = {
   message: PropTypes.string,
@@ -378,9 +377,6 @@ const ReviewPeriods = ({ onPeriodSelected, mode }) => {
             })
             .map((period) => (
               <div>
-                <ReviewPeriodStepper
-                  reviewPeriod={period}
-                />
                 <ReviewPeriodCard
                   key={`review-period-card-${period.id}`}
                   mode={mode}