Private groups, Mobile app - fixes (WIP, do not merge)

golos-blockchain · Dec 8, 2024 · 2b4fcab · 2b4fcab
1 parent eac7c51
commit 2b4fcab
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/src/components/elements/messages/Message/index.jsx b/src/components/elements/messages/Message/index.jsx
@@ -130,12 +130,14 @@ class Message extends React.Component {
             if (startsSequence) {
                 author = <div className={cn('author', {
                     banned: isBanned
-                })} onClick={(e) => {
-                    e.preventDefault()
-                    e.stopPropagation()
-                    this.dropdown.current.click()
-                }}>
-                    {from}
+                })}>
+                    <span onClick={(e) => {
+                        e.preventDefault()
+                        e.stopPropagation()
+                        this.dropdown.current.click()
+                    }}>
+                        {from}
+                    </span>
                 </div>
 
                 avatar = <LinkWithDropdown

diff --git a/src/components/modules/groups/GroupMembers.jsx b/src/components/modules/groups/GroupMembers.jsx
@@ -11,7 +11,6 @@ import AccountName from 'app/components/elements/common/AccountName'
 import Input from 'app/components/elements/common/Input';
 import GroupMember from 'app/components/elements/groups/GroupMember'
 import LoadingIndicator from 'app/components/elements/LoadingIndicator'
-import MarkNotificationRead from 'app/components/elements/MarkNotificationRead'
 import { getRoleInGroup, getGroupMeta, getGroupTitle } from 'app/utils/groups'
 
 export async function validateMembersStep(values, errors) {
@@ -254,8 +253,6 @@ class GroupMembers extends React.Component {
                         {this._renderMemberTypeSwitch()}
                     </div>
                 </div>}
-                {(username && showPendings) ? <MarkNotificationRead fields='join_request' account={username}
-                /> : null}
             </div>
         }
 

diff --git a/src/components/modules/groups/MyGroups.jsx b/src/components/modules/groups/MyGroups.jsx
@@ -265,7 +265,7 @@ class MyGroups extends React.Component {
                {button}
                {groups}
                {hasGroups ? <div style={{ height: '50px' }}></div> : null}
-                {username ? <MarkNotificationRead fields='group_member' account={username}
+                {username ? <MarkNotificationRead fields='group_member,join_request' account={username}
                 /> : null}
         </div>
     }

diff --git a/src/utils/ServerApiClient.js b/src/utils/ServerApiClient.js
@@ -3,7 +3,7 @@ import { fetchEx } from 'golos-lib-js/lib/utils'
 export function getHost() {
     const { location, } = window;
     if (process.env.NODE_ENV === 'development') {
-        return location.protocol + '//'+ location.hostname + ':8080';
+        return location.protocol + '//'+ location.hostname + ':8088';
     }
     return location.origin;
 }