Merge pull request #1 from topcoder-platform/bug-bash

latest pull

Author: rashmi73

src/shared/components/Settings/Account/LinkedAccount/AddWebLink.jsx

@@ -78,7 +78,7 @@ export default class AddWebLink extends React.Component {
     const {
       allLinks,
     } = this.props;
-    return _.some(allLinks, link => link.URL && (link.URL.toLowerCase() === webLink.toLowerCase()));
+    return _.some(allLinks, link => link.URL && (link.URL.toLowerCase().replace(/https?:\/\//, '') === webLink.toLowerCase().replace(/https?:\/\//, '')));
   }
 
   render() {

src/shared/components/Settings/Account/LinkedAccount/index.jsx

@@ -128,7 +128,7 @@ export default class LinkedAccount extends React.Component {
     const externalAccountsData = profileState.externalAccounts || {};
 
     if (!linkedAccounts.length) {
-      const providers = _.omit(externalAccountsData, ['userId', 'updatedAt', 'createdAt', 'createdBy', 'updatedBy', 'handle']);
+      const providers = _.omit(externalAccountsData, ['userId', 'updatedAt', 'createdAt', 'createdBy', 'updatedBy']);
 
       _.forEach(_.keys(providers), (p) => {
         if (providers[p]) {

src/shared/components/Settings/Account/LinkedAccount/modal.scss

@@ -47,6 +47,7 @@
   opacity: 1;
   border-radius: 4px;
   padding: 40px;
+  max-width: 100%;
 }
 
 @media (min-width: 768px) {

src/shared/components/Settings/Account/LinkedAccount/styles.scss

@@ -43,10 +43,12 @@
 
     i.fa-globe {
       color: #82a0aa;
+      cursor: pointer;
     }
 
     i.fa-weblinks {
       color: #82a0aa;
+      cursor: pointer;
     }
 
     i.fa-bitbucket {
@@ -111,6 +113,8 @@
 
         font-size: 18px;
         height: 20px;
+        overflow: hidden;
+        text-overflow: ellipsis;
       }
 
       .title {
@@ -496,6 +500,8 @@
         .handle {
           margin-top: 20px;
           margin-bottom: 20px;
+          overflow: hidden;
+          text-overflow: ellipsis;
         }
 
         .title {

src/shared/components/Settings/CofirmationModal/styles.scss

@@ -47,6 +47,7 @@
   opacity: 1;
   border-radius: 4px;
   padding: 40px;
+  max-width: 100%;
 }
 
 @media (min-width: 768px) {

src/shared/components/Settings/Profile/BasicInfo/index.jsx

@@ -212,6 +212,12 @@ export default class BasicInfo extends ConsentComponent {
       newBasicInfo.tshirtSize = null;
     }
 
+    _.forEach(newBasicInfo.addresses[0], (value, key) => {
+      newBasicInfo.addresses[0][key] = _.trim(value);
+    });
+    _.forEach(['currentLocation', 'primaryInterestInTopcoder', 'description'], (key) => {
+      newBasicInfo[key] = _.trim(newBasicInfo[key]);
+    });
     // This is a hack to check if the user has an existing basic_info trait object
     const exists = await this.onCheckUserTrait('basic_info');
     if (exists) {