Merge pull request #5525 from topcoder-platform/develop

Release v1.9.3
topcoder-platform · May 21, 2021 · a663404 · a663404
2 parents 9e78fad + fa8c07b
commit a663404
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/src/shared/components/Contentful/Tabs/Tabs.jsx b/src/shared/components/Contentful/Tabs/Tabs.jsx
@@ -52,10 +52,8 @@ export default class TabsItemsLoader extends Component {
     const q = getQuery();
     const { tabId } = this.props;
     const { tabIndex } = this.state;
-    if (q.tabs && q.tabs[tabId] && Number(q.tabs[tabId]) !== tabIndex) {
-      this.setState({ tabIndex: Number(q.tabs[tabId]) });
-    } else {
-      this.updatePageUrl();
+    if (q.tracks && q.tracks[tabId] && Number(q.tracks[tabId]) !== tabIndex) {
+      this.setState({ tabIndex: Number(q.tracks[tabId]) });
     }
   }
 
@@ -64,14 +62,16 @@ export default class TabsItemsLoader extends Component {
   }
 
   updatePageUrl() {
-    const q = getQuery();
-    const { tabId } = this.props;
-    const { tabIndex } = this.state;
-    updateQuery({
-      tabs: {
-        ...q.tabs,
-        [tabId]: tabIndex || 0,
-      },
+    this.setState((state) => {
+      const q = getQuery();
+      const { tabId } = this.props;
+      const { tabIndex } = state;
+      updateQuery({
+        tabs: {
+          ...q.tracks,
+          [tabId]: tabIndex || 0,
+        },
+      });
     });
   }
 

diff --git a/src/shared/components/Gigs/GigDetails/style.scss b/src/shared/components/Gigs/GigDetails/style.scss
@@ -21,6 +21,7 @@
 
   @include xs-to-sm {
     margin-bottom: 20px;
+    margin-right: 0;
   }
 }
 
@@ -128,6 +129,7 @@
 
         @include xs-to-md {
           margin-top: 47px;
+          min-width: auto;
         }
 
         .shareButtons {
@@ -350,7 +352,7 @@
       font-weight: bolder;
       text-decoration: none;
       text-transform: uppercase;
-      line-height: 40px;
+      line-height: 38px;
       padding: 0 20px;
 
       &:hover {