Merge pull request #6777 from topcoder-platform/develop

Release v1.20.3
topcoder-platform · Jan 11, 2023 · f658311 · f658311
2 parents 9dd164e + 11a5aa6
commit f658311
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 13 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -349,8 +349,7 @@ workflows:
           filters:
             branches:
               only:
-                - develop
-                - latex_support
+                - free
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global
@@ -379,8 +378,6 @@ workflows:
             branches:
               only:
                 - develop
-                - old-mm-fix
-                - reskin-profile-settings
       # Production builds are exectuted
       # when PR is merged to the master
       # Don't change anything in this configuration

diff --git a/src/shared/containers/timeline-wall/index.jsx b/src/shared/containers/timeline-wall/index.jsx
@@ -24,6 +24,8 @@ import './styles.scss';
 const FETCHING_PENDING_APPROVAL_EVENTS_INTERVAL = _.get(config, 'TIMELINE.FETCHING_PENDING_APPROVAL_EVENTS_INTERVAL', 0);
 const FORUM_LINK = _.get(config, 'TIMELINE.FORUM_LINK', '');
 function TimelineWallContainer(props) {
+  const currentTime = new Date();
+  const thisYear = currentTime.getFullYear();
   const [tab, setTab] = useState(0);
   const fetchingApprovalsInterval = useRef(null);
   const [showRightFilterMobile, setShowRightFilterMobile] = useState(false);
@@ -223,7 +225,7 @@ function TimelineWallContainer(props) {
           type="button"
           styleName="filter-dropdown hide-desktop show-mobile"
         >
-          <span>{selectedFilterValue.year ? selectedFilterValue.year : ''}</span>
+          <span>{selectedFilterValue.year ? selectedFilterValue.year : thisYear}</span>
           <IconCheveronDownBlue />
         </button>
       </div>

diff --git a/src/shared/containers/timeline-wall/modal-event-add/index.jsx b/src/shared/containers/timeline-wall/modal-event-add/index.jsx
@@ -3,6 +3,7 @@ import PT from 'prop-types';
 import { Modal } from 'topcoder-react-ui-kit';
 import IconCloseGreen from 'assets/images/icon-close-green.svg';
 import LoadingIndicator from 'components/LoadingIndicator';
+import cn from 'classnames';
 
 import style from './styles.scss';
 
@@ -17,14 +18,17 @@ function ModalEventAdd({
       onCancel={onClose}
     >
       <div styleName="header">
-        <span styleName="text-title">Confirmation</span>
+        <span styleName="text-title">{uploadResult ? 'Error' : 'Confirmation'}</span>
         <button styleName="btn-close" onClick={onClose} type="button"><IconCloseGreen /></button>
       </div>
       {
         uploading ? (
           <LoadingIndicator />
         ) : (
-          <span styleName="text-description">
+          <span styleName={cn('text-description', {
+            error: !!uploadResult,
+          })}
+          >
             {
               uploadResult || successMessage
             }

diff --git a/src/shared/containers/timeline-wall/modal-event-add/styles.scss b/src/shared/containers/timeline-wall/modal-event-add/styles.scss
@@ -44,6 +44,10 @@
   strong {
     @include roboto-bold;
   }
+
+  &.error {
+    color: #ef476f;
+  }
 }
 
 .separator {

diff --git a/src/shared/containers/timeline-wall/styles.scss b/src/shared/containers/timeline-wall/styles.scss
@@ -86,6 +86,7 @@
   border: none;
   color: white;
 
+  &:visited,
   &:hover {
     color: white;
   }

diff --git a/src/shared/containers/timeline-wall/timeline-events/right-filter/styles.scss b/src/shared/containers/timeline-wall/timeline-events/right-filter/styles.scss
@@ -3,6 +3,7 @@
 .container {
   display: flex;
   flex-direction: column;
+  z-index: 1;
 
   @media (max-width: 768px) {
     position: fixed;
@@ -53,16 +54,16 @@
   border-top-left-radius: 8px;
   border-bottom-left-radius: 8px;
   padding: 10px 0;
-  position: fixed;
-  right: 0;
-  left: 1374px;
+  position: sticky;
+  margin-bottom: 80px;
+  top: 0;
   max-height: 70%;
   overflow: scroll;
-  -ms-overflow-style: none;  /* Internet Explorer 10+ */
-  scrollbar-width: none;  /* Firefox */
+  -ms-overflow-style: none; /* Internet Explorer 10+ */
+  scrollbar-width: none; /* Firefox */
 
   &::-webkit-scrollbar {
-    display: none;  /* Safari and Chrome */
+    display: none; /* Safari and Chrome */
   }
 
   @media (max-width: 1500px) {
@@ -72,6 +73,8 @@
   @media (max-width: 768px) {
     border-radius: 0;
     width: calc(100% - 10px);
+    position: relative;
+    margin-bottom: unset;
   }
 
   span {

diff --git a/src/shared/containers/timeline-wall/timeline-events/styles.scss b/src/shared/containers/timeline-wall/timeline-events/styles.scss
@@ -4,6 +4,7 @@
   display: flex;
   flex-direction: row;
   justify-content: space-between;
+  max-width: 1492px;
 }
 
 .left-content {