ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-24 23:44:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'la-1692-fix' (#1693)

Browse Source 
* la-1692-fix:
  chat: potential fix for #1692

Signed-off-by: Jared Tobin <jared@tlon.io>
This commit is contained in:
Jared Tobin 2019-09-05 09:31:33 -02:30
commit bf1392de3d
No known key found for this signature in database
GPG Key ID: 0E4647D58F8A69E4
5 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/arvo/app/chat/js/index.js
View File

File diff suppressed because one or more lines are too long

2
pkg/arvo/app/chat/js/tile.js
View File

File diff suppressed because one or more lines are too long

2
pkg/interface/chat/src/js/components/chat.js
View File

@ -267,7 +267,7 @@ export class ChatScreen extends Component {
numMsgs={lastMsgNum}
station={state.station}
circle={state.circle}
security={config.con}
security={!!config ? config.con : {}}
placeholder='Message...' />
</div>
)

22
pkg/interface/chat/src/js/components/root.js
View File

@ -61,13 +61,23 @@ export class Root extends Component {
let internalStation = host + '/hall-internal-' + circle;
if (internalStation in state.configs) {
unreads[cir] =
state.configs[internalStation].red <=
messages[cir][messages[cir].length - 1].num;
if (!!state.configs[internalStation]) {
unreads[cir] =
state.configs[internalStation].red <=
messages[cir][messages[cir].length - 1].num;
} else {
unreads[cir] = false;
}
} else if (cir in state.configs) {
if (!!state.configs[cir]) {
unreads[cir] =
state.configs[cir].red <=
messages[cir][messages[cir].length - 1].num;
} else {
unreads[cir] = false;
}
} else {
unreads[cir] =
state.configs[cir].red <=
messages[cir][messages[cir].length - 1].num;
unreads[cir] = false;
}
}
} else {

1
pkg/interface/chat/src/js/components/sidebar.js
View File

@ -110,6 +110,7 @@ export class Sidebar extends Component {
const { props, state } = this;
let station = props.match.params.ship + '/' + props.match.params.station;
console.log(props.circles);
let sidebarItems = props.circles
.filter((cir) => {
return !cir.includes('hall-internal-');