just before rebase

client/src/modules/Teams/components/InviteForm.jsx

@@ -10,7 +10,7 @@ import image from '../../../../public/resources/images/copy.png';
 const AccountsForm = ({
   options, isDisabled, handleSelected, formTitle,
   ismultiSelectDisabled, inviteMember, buttonCaption,
-  hideLink, sharedLink, copyToClipboard
+  sharedLink, copyToClipboard, copyText
 }) => (
   <div id="invite_form">
     <div className="row account-row">
@@ -63,14 +63,13 @@ const AccountsForm = ({
                   onCopy={() => copyToClipboard(true)}>
                   <img
                     className="copy-icon" src={image} alt="Hello" srcSet=""
-
                     onClick={copyToClipboard}
                   />
                 </CopyToClipboard>
 
                 <input className="disabled-input-text" type="text" value={sharedLink} />
               </div>
-              <div className="copy-link-text">Copy shareable link above</div>
+              <div className="copy-link-text">{copyText}</div>
             </div>
 
           </form>
@@ -90,14 +89,14 @@ AccountsForm.propTypes = {
   ismultiSelectDisabled: PropTypes.bool.isRequired,
   inviteMember: PropTypes.func.isRequired,
   buttonCaption: PropTypes.string.isRequired,
-  hideLink: PropTypes.bool,
   sharedLink: PropTypes.string,
-  copyToClipboard: PropTypes.func.isRequired
+  copyToClipboard: PropTypes.func.isRequired,
+  copyText: PropTypes.string
 
 };
 
 AccountsForm.defaultProps = {
-  hideLink: false,
-  sharedLink: ''
+  sharedLink: '',
+  copyText: 'Copy shareable link above'
 };
 export default AccountsForm;

client/src/modules/Teams/components/Member.jsx

@@ -109,13 +109,6 @@ export class Member extends Component {
                   </li>
                 )
                 }
-                  <li
-                    className="nav-link "
-                    onClick={event => chooseContent(event, 'see members')}
-                  >
-                    <i className="material-icons left nav-icons">group</i>
-                    <span className="nav-icons">See members</span>
-                  </li>
                   <li
                     className="nav-link "
                     onClick={event => chooseContent(event, 'share link')}

client/src/modules/Teams/components/ShareLink.jsx

@@ -27,22 +27,24 @@ export class ShareLink extends Component {
 
   handleSelected(selectedOption) {
     this.setState({ accounts: selectedOption });
-    console.log(selectedOption);
   }
 
   submitForm(e) {
     e.preventDefault();
 
     const { accounts } = this.state;
+    const token = jwt.sign({
+      accounts,
+      userId: localStorage.getItem('userId'),
+      role: localStorage.getItem('role')
+    }, process.env.JSON_SECRET, { expiresIn: '1week' });
 
-    console.log(accounts);
-    const token = jwt.sign({ accounts }, process.env.JSON_SECRET, { expiresIn: '1week' });
     this.setState({
       sharedLink: `${window.location.host}/join/${token}`
     });
   }
   copyText() {
-    console.log('Copied');
+    this.setState({ copyPrompt: 'Copied to clipboard' });
   }
 
 
@@ -59,7 +61,7 @@ export class ShareLink extends Component {
 
 
   render() {
-    const { sharedLink } = this.state;
+    const { sharedLink, copyPrompt } = this.state;
 
     return (
       <React.Fragment>
@@ -74,6 +76,7 @@ export class ShareLink extends Component {
           buttonCaption={sharedLink ? "Regenerate Link" : "Generate Link"}
           sharedLink={sharedLink}
           copyToClipboard={this.copyText}
+          copyText={copyPrompt}
         />
       </React.Fragment>
     );

client/src/redux/actions/requests/index.js

@@ -42,7 +42,6 @@ export const loadRequests = (requestType = '', limit = '', offset = 0) => dispat
           data.errors[0]
         ));
       }
-      console.log(data, 'the data response');
       const payload = {
         requests: data.data.requests,
         meta: data.meta

client/src/routes/index.jsx

@@ -12,10 +12,7 @@ import Teams from '../modules/Teams/container';
 import RequireAuth from './RequireAuth';
 import AuthRoute from './AuthRoute';
 import ErrorPage from '../modules/common/404';
-import store from "../store";
-import { loadRequests } from "../redux/actions/requests/index";
 
-store.dispatch(loadRequests('member_requests'));
 export default class Routes extends Component {
   componentDidMount() {
     M.AutoInit();

client/src/tests/redux/actions/requests/index.test.js

@@ -118,7 +118,6 @@ describe('Request Actions', () => {
       return store.dispatch(loadRequests('admin_request', 10, 10))
         .then(() => {
           const actions = store.getActions();
-          console.log(actions);
 
           expect(actions[0].type).toEqual(IS_LOGGED_IN);
           expect(actions[0].payload).toEqual(false);