diff --git a/src/app/default_cfg.js b/src/app/default_cfg.js index 09a45400d..037c39fac 100644 --- a/src/app/default_cfg.js +++ b/src/app/default_cfg.js @@ -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": { @@ -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" } } \ No newline at end of file diff --git a/src/components/elements/MarkNotificationRead.jsx b/src/components/elements/MarkNotificationRead.jsx index 10a398c67..e75d64200 100644 --- a/src/components/elements/MarkNotificationRead.jsx +++ b/src/components/elements/MarkNotificationRead.jsx @@ -11,6 +11,7 @@ class MarkNotificationRead extends React.Component { account: PropTypes.string, update: PropTypes.func, interval: PropTypes.number, + delay: PropTypes.number, }; shouldComponentUpdate(nextProps) { @@ -37,12 +38,19 @@ class MarkNotificationRead extends React.Component { } componentDidMount() { - const { account, fields, update, interval } = this.props; + const { account, fields, update, interval, delay } = this.props; this.fields_array = fields.replace(/\s/g,'').split(','); - if (interval) + const firstMark = () => { + markNotificationRead(account, this.fields_array).then(nc => update(nc)) + } + if (delay) { + setTimeout(firstMark, delay) + } + if (interval) { this._activateInterval(interval); - else - markNotificationRead(account, this.fields_array).then(nc => update(nc)); + } else if (!delay) { + firstMark() + } } componentDidUpdate() { diff --git a/src/components/elements/messages/ConversationListItem/ConversationListItem.css b/src/components/elements/messages/ConversationListItem/ConversationListItem.css index acc73cebd..cd6555601 100644 --- a/src/components/elements/messages/ConversationListItem/ConversationListItem.css +++ b/src/components/elements/messages/ConversationListItem/ConversationListItem.css @@ -33,7 +33,7 @@ } .conversation-info { - max-width: 98%; + width: calc(100% - 60px); } .conversation-snippet { diff --git a/src/components/elements/messages/Message/Message.css b/src/components/elements/messages/Message/Message.css index c235da713..b9b92b7c0 100644 --- a/src/components/elements/messages/Message/Message.css +++ b/src/components/elements/messages/Message/Message.css @@ -179,3 +179,17 @@ .msgs-message.mine .bubble-container.selected .quote-from { color: white; } + +.msgs-adds { + display: flex; +} + +@media screen and (max-width: 39.9375em) { + .msgs-adds { + display: block; + + .msgs-donating { + margin-left: 3px; + } + } +} diff --git a/src/components/elements/messages/Message/index.jsx b/src/components/elements/messages/Message/index.jsx index a6031e9af..c02ad2fc4 100644 --- a/src/components/elements/messages/Message/index.jsx +++ b/src/components/elements/messages/Message/index.jsx @@ -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' @@ -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') } } @@ -195,14 +206,14 @@ class Message extends React.Component { { quoteHeader } { content } - {!isMine ? adds : null} + {!isMine ?
{adds}
: null} ); } } -export default connect( +export default withRouter(connect( (state, ownProps) => { const accounts = state.global.get('accounts') @@ -215,4 +226,4 @@ export default connect( }, dispatch => ({ }), -)(Message) +)(Message)) diff --git a/src/components/modules/Modals.jsx b/src/components/modules/Modals.jsx index f49b4611a..4243c734f 100644 --- a/src/components/modules/Modals.jsx +++ b/src/components/modules/Modals.jsx @@ -16,6 +16,7 @@ import LoginForm from 'app/components/modules/LoginForm'; import AppDownload from 'app/components/modules/app/AppDownload' import user from 'app/redux/UserReducer' //import tr from 'app/redux/Transaction'; +import isScreenSmall from 'app/utils/isScreenSmall' let keyIndex = 0; @@ -76,11 +77,16 @@ class Modals extends React.Component { return n; }) : []; - const modalStyle = { - borderRadius: '8px', - boxShadow: '0 0 19px 3px rgba(0,0,0, 0.2)', + let modalStyle = { overflowX: 'hidden', } + if (!isScreenSmall()) { + modalStyle = { + borderRadius: '8px', + boxShadow: '0 0 19px 3px rgba(0,0,0, 0.2)', + ...modalStyle, + } + } const doHideLogin = (e) => { const goBack = () => { diff --git a/src/components/modules/groups/MyGroups.jsx b/src/components/modules/groups/MyGroups.jsx index e09f4c013..6b69b1f0a 100644 --- a/src/components/modules/groups/MyGroups.jsx +++ b/src/components/modules/groups/MyGroups.jsx @@ -14,6 +14,7 @@ import DropdownMenu from 'app/components/elements/DropdownMenu' import Icon from 'app/components/elements/Icon' import LoadingIndicator from 'app/components/elements/LoadingIndicator' import MarkNotificationRead from 'app/components/elements/MarkNotificationRead' +import NotifiCounter from 'app/components/elements/NotifiCounter' import { showLoginDialog } from 'app/components/dialogs/LoginDialog' import { getGroupLogo, getGroupMeta, getRoleInGroup } from 'app/utils/groups' import isScreenSmall from 'app/utils/isScreenSmall' @@ -182,7 +183,7 @@ class MyGroups extends React.Component { {amPending ? tt('msgs_group_dropdown.cancel') : tt('msgs_group_dropdown.retire')} : null} - {(amModer && pendings) ?