Skip to content

Commit

Permalink
Private groups, Mobile app - fixes (still WIP)
Browse files Browse the repository at this point in the history
  • Loading branch information
1aerostorm committed Dec 12, 2024
1 parent aef0353 commit 88359eb
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 7 deletions.
19 changes: 16 additions & 3 deletions src/app/default_cfg.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
module.exports = {
"app_version": "1.0.0",
"app_version": "1.0.1",
"nodes": [
{
"address": "wss://apibeta.golos.today/ws"
},
{
"address": "wss://api.golos.id/ws"
},
{
"address": "wss://api.aleksw.space/ws"
},
{
"address": "wss://api-golos.blckchnd.com/ws"
}
],
"images": {
Expand All @@ -16,12 +25,16 @@ module.exports = {
"custom_client": "blogs"
},
"notify_service": {
"host": "https://devnotify.golos.app"
"host": "https://devnotify.golos.app",
"host_ws": "wss://devnotify.golos.app/ws"
},
"blogs_service": {
"host": "https://beta.golos.today"
},
"wallet_service": {
"host": "https://devwallet.golos.today"
},
"app_updater": {
"host": "https://files.golos.app"
"host": "https://devfiles.golos.app"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
}

.conversation-info {
max-width: 98%;
width: calc(100% - 60px);
}

.conversation-snippet {
Expand Down
17 changes: 14 additions & 3 deletions src/components/elements/messages/Message/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React from 'react';
import {connect} from 'react-redux'
import { Fade } from 'react-foundation-components/lib/global/fade'
import { LinkWithDropdown } from 'react-foundation-components/lib/global/dropdown'
import { withRouter } from 'react-router'
import { Link } from 'react-router-dom'
import tt from 'counterpart';
import cn from 'classnames'
Expand Down Expand Up @@ -43,7 +44,17 @@ class Message extends React.Component {
if (!node) break
href = node.href
} while (!href)
window.open(href, '_blank')
try {
let url = new URL(href)
if (url.host === location.host) {
const { history } = this.props
history.push(url.pathname)
return
}
} catch (err) {
console.error(err)
}
window.open(href, '_system')
}
}

Expand Down Expand Up @@ -202,7 +213,7 @@ class Message extends React.Component {
}
}

export default connect(
export default withRouter(connect(
(state, ownProps) => {
const accounts = state.global.get('accounts')

Expand All @@ -215,4 +226,4 @@ export default connect(
},
dispatch => ({
}),
)(Message)
)(Message))
1 change: 1 addition & 0 deletions src/components/modules/groups/MyGroups.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
}
.button.force-white {
color: #fefefe !important;
fill: #fefefe !important;
}
.label {
padding: 0.5rem;
Expand Down

0 comments on commit 88359eb

Please sign in to comment.