Skip to content
Next
Projects
Groups
Snippets
Help
Sign in / Register
Toggle navigation
Minds Mobile
Project overview
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
233
Merge Requests
10
Security & Compliance
Packages
Wiki
Snippets
Members
Collapse sidebar
Close sidebar
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Minds
Minds Mobile
Compare Revisions
6aa3ace33400fa62060cd8a8b17e006bce8f0c9c...83cd63c2882dfc9889a01ff5f3d31efe1a787e49
Source
83cd63c2882dfc9889a01ff5f3d31efe1a787e49
...
Target
6aa3ace33400fa62060cd8a8b17e006bce8f0c9c
Compare
Commits (3)
(fix) blckedChannelsScreen should show the list now
· ea8f148b
Juan Manuel Solaro
authored
3 weeks ago
ea8f148b
Merge remote-tracking branch 'upstream/release/3.11.0' into fix/refactor-blocked-channel-list
· c2419214
Juan Manuel Solaro
authored
3 hours ago
c2419214
Merge branch 'fix/refactor-blocked-channel-list' into release/3.11.0
· 83cd63c2
Martin Santangelo
authored
2 hours ago
83cd63c2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
6 deletions
+10
-6
src/common/services/entities.service.js
View file @
83cd63c2
...
...
@@ -194,7 +194,7 @@ class EntitiesService {
this
.
addEntity
(
entity
);
}
return
response
;
return
response
.
entities
;
}
catch
(
err
)
{
console
.
log
(
err
)
throw
err
;
...
...
This diff is collapsed.
src/settings/screens/BlockedChannelsScreen.js
View file @
83cd63c2
...
...
@@ -20,6 +20,7 @@ import Image from "react-native-image-progress";
import
{
CommonStyle
}
from
"
../../styles/Common
"
;
import
Touchable
from
"
../../common/components/Touchable
"
;
import
Colors
from
"
../../styles/Colors
"
;
import
CenteredLoading
from
'
../../common/components/CenteredLoading
'
;
export
default
class
BlockedChannelsScreen
extends
Component
{
static
navigationOptions
=
{
...
...
@@ -31,6 +32,7 @@ export default class BlockedChannelsScreen extends Component {
this
.
state
=
{
channels
:
[],
loading
:
true
}
}
...
...
@@ -39,14 +41,12 @@ export default class BlockedChannelsScreen extends Component {
}
async
load
()
{
await
blockListService
.
doSync
();
const
guids
=
await
blockListService
.
getList
();
const
channels
=
(
await
entitiesService
.
fetch
(
guids
))
.
filter
(
channel
=>
Boolean
(
channel
));
const
channels
=
(
await
entitiesService
.
fetch
(
Array
.
from
(
guids
.
keys
())));
//.filter(channel => Boolean(channel));
this
.
setState
({
channels
,
loading
:
false
});
}
...
...
@@ -103,6 +103,10 @@ export default class BlockedChannelsScreen extends Component {
}
render
()
{
if
(
this
.
state
.
loading
)
{
return
<
CenteredLoading
/>
}
const
rows
=
[];
for
(
const
channel
of
this
.
state
.
channels
)
{
...
...
This diff is collapsed.