diff --git a/src/components/postCard/container/postCardContainer.js b/src/components/postCard/container/postCardContainer.js index 7b0f07a41..236074365 100644 --- a/src/components/postCard/container/postCardContainer.js +++ b/src/components/postCard/container/postCardContainer.js @@ -82,7 +82,7 @@ class PostCardContainer extends PureComponent { }; render() { - const { content, isHideImage, nsfw, hideReblogOption } = this.props; + const { content, isHideImage, nsfw, isHideReblogOption } = this.props; const { _content } = this.state; const isNsfwPost = nsfw === '1'; @@ -96,7 +96,7 @@ class PostCardContainer extends PureComponent { content={_content || content} isHideImage={isHideImage} isNsfwPost={isNsfwPost} - hideReblogOption={hideReblogOption} + isHideReblogOption={isHideReblogOption} /> ); } diff --git a/src/components/postCard/view/postCardView.js b/src/components/postCard/view/postCardView.js index 0a7b15a26..5d719cfba 100644 --- a/src/components/postCard/view/postCardView.js +++ b/src/components/postCard/view/postCardView.js @@ -68,7 +68,7 @@ class PostCardView extends Component { }; render() { - const { content, isHideImage, fetchPost, isNsfwPost, hideReblogOption } = this.props; + const { content, isHideImage, fetchPost, isNsfwPost, isHideReblogOption } = this.props; const _image = this._getPostImage(content, isNsfwPost); const reblogedBy = content.reblogged_by && content.reblogged_by[0]; @@ -89,7 +89,7 @@ class PostCardView extends Component { /> diff --git a/src/components/postDropdown/container/postDropdownContainer.js b/src/components/postDropdown/container/postDropdownContainer.js index f16e73c5a..45fdf0d4c 100644 --- a/src/components/postDropdown/container/postDropdownContainer.js +++ b/src/components/postDropdown/container/postDropdownContainer.js @@ -173,10 +173,10 @@ class PostDropdownContainer extends PureComponent { }; render() { - const { intl, currentAccount, content, hideReblogOption } = this.props; + const { intl, currentAccount, content, isHideReblogOption } = this.props; let _OPTIONS = OPTIONS; - if ((content && content.author === currentAccount.name) || hideReblogOption) { + if ((content && content.author === currentAccount.name) || isHideReblogOption) { _OPTIONS = OPTIONS.filter(item => item !== 'reblog'); } diff --git a/src/components/posts/view/postsView.js b/src/components/posts/view/postsView.js index aab1bb92a..ab4c38c0a 100644 --- a/src/components/posts/view/postsView.js +++ b/src/components/posts/view/postsView.js @@ -228,7 +228,7 @@ class PostsView extends Component { isLoginDone, tag, isDarkTheme, - hideReblogOption, + isHideReblogOption, } = this.props; return ( @@ -264,7 +264,7 @@ class PostsView extends Component { showsVerticalScrollIndicator={false} renderItem={({ item }) => ( this._handleOnScrollStart()} refreshControl={ + refreshing={refreshing} + onRefresh={this._handleOnRefreshPosts} + progressBackgroundColor="#357CE6" + tintColor={!isDarkTheme ? '#357ce6' : '#96c0ff'} + titleColor="#fff" + colors={['#fff']} + /> } ref={ref => { this.flatList = ref; diff --git a/src/screens/profile/screen/profileScreen.js b/src/screens/profile/screen/profileScreen.js index d6ffc0904..81115309f 100644 --- a/src/screens/profile/screen/profileScreen.js +++ b/src/screens/profile/screen/profileScreen.js @@ -206,7 +206,7 @@ class ProfileScreen extends PureComponent { tag={username} key={username} handleOnScroll={this._handleOnScroll} - hideReblogOption + isHideReblogOption />