Merge pull request #1194 from suppermancool/f2f-30069264-issue-894

fix issue #894

Author: ThomasKranitsas

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

@@ -18,7 +18,7 @@ export default class AddWebLink extends React.Component {
     this.onUpdateWebLink = this.onUpdateWebLink.bind(this);
     this.onAddWebLink = this.onAddWebLink.bind(this);
     this.isWebLinkValid = this.isWebLinkValid.bind(this);
-    this.isWebLinkExist = this.isWebLinkExist.bind(this);
+    this.webLinkExist = this.webLinkExist.bind(this);
   }
 
   componentWillReceiveProps(nextProps) {
@@ -45,30 +45,32 @@ export default class AddWebLink extends React.Component {
         tokenV3,
       } = this.props;
       const { webLink } = this.state;
-      if (webLink && this.isWebLinkValid() && !this.isWebLinkExist()) {
+      if (webLink && this.isWebLinkValid() && !this.webLinkExist()) {
         addWebLink(handle, tokenV3, webLink);
       }
     }
   }
 
   isWebLinkValid() {
     const { webLink } = this.state;
-    return !webLink || /^(http(s?):\/\/)?(www\.)?[a-zA-Z0-9\.\-\_]+(\.[a-zA-Z]{2,15})+(\/[a-zA-Z0-9\_\-\s\.\/\?\%\#\&\=]*)?$/.test(webLink); /* eslint-disable-line no-useless-escape */
+    return !webLink
+    || (webLink.includes('www') && /^(http(s?):\/\/)?(www\.)[a-zA-Z0-9\.\-\_]+(\.[a-zA-Z]{2,15})+$/.test(webLink)) /* eslint-disable-line no-useless-escape */
+    || (!webLink.includes('www') && /^(http(s?):\/\/)?[a-zA-Z0-9\.\-\_]+(\.[a-zA-Z]{2,15})+$/.test(webLink)); /* eslint-disable-line no-useless-escape */
   }
 
-  isWebLinkExist() {
+  webLinkExist() {
     const { webLink } = this.state;
     const {
       allLinks,
     } = this.props;
-    return _.some(allLinks, link => link.URL.toLowerCase() === webLink.toLowerCase());
+    return _.some(allLinks, link => link.URL && (link.URL.toLowerCase() === webLink.toLowerCase()));
   }
 
   render() {
     const { webLink } = this.state;
 
     const webLinkValid = this.isWebLinkValid();
-    const isWebLinkExist = this.isWebLinkExist();
+    const webLinkExist = this.webLinkExist();
 
     return (
       <div styleName="external-web-link">
@@ -94,7 +96,7 @@ export default class AddWebLink extends React.Component {
                 required
               />
               {
-                !webLinkValid && !isWebLinkExist
+                !webLinkValid && !webLinkExist
                 && (
                   <div styleName="form-input-error">
                     <p>
@@ -104,7 +106,7 @@ Please enter a valid URL
                 )
               }
               {
-                isWebLinkExist
+                webLinkExist
                 && (
                   <div styleName="form-input-error">
                     <p>

src/shared/components/Settings/Profile/ExternalLinks/AddWebLink.jsx

@@ -50,15 +50,17 @@ export default class AddWebLink extends React.Component {
 
   isWebLinkValid() {
     const { webLink } = this.state;
-    return !webLink || /^(http(s?):\/\/)?(www\.)?[a-zA-Z0-9\.\-\_]+(\.[a-zA-Z]{2,15})+(\/[a-zA-Z0-9\_\-\s\.\/\?\%\#\&\=]*)?$/.test(webLink); /* eslint-disable-line no-useless-escape */
+    return !webLink
+    || (webLink.includes('www') && /^(http(s?):\/\/)?(www\.)[a-zA-Z0-9\.\-\_]+(\.[a-zA-Z]{2,15})+$/.test(webLink)) /* eslint-disable-line no-useless-escape */
+    || (!webLink.includes('www') && /^(http(s?):\/\/)?[a-zA-Z0-9\.\-\_]+(\.[a-zA-Z]{2,15})+$/.test(webLink)); /* eslint-disable-line no-useless-escape */
   }
 
   webLinkExists() {
     const { webLink } = this.state;
     const {
       allLinks,
     } = this.props;
-    return _.some(allLinks, link => link.URL.toLowerCase() === webLink.toLowerCase());
+    return _.some(allLinks, link => link.URL && (link.URL.toLowerCase() === webLink.toLowerCase()));
   }
 
   render() {