ecency/ecency-mobile
1
1
Fork 0
mirror of https://github.com/ecency/ecency-mobile.git synced 2024-12-18 19:01:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'development' into bugfix/navbar

Browse Source
This commit is contained in:
Feruz M 2019-12-05 12:53:21 +02:00 committed by GitHub
commit 36cd8887a6
79 changed files with 478 additions and 420 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.eslintrc.js
View File

@ -1,4 +0,0 @@
module.exports = {
root: true,
extends: '@react-native-community',
};

18
.eslintrc.json
View File

@ -5,14 +5,18 @@
"prettier",
"plugin:prettier/recommended",
"plugin:eslint-comments/recommended",
"eslint:recommended",
"plugin:import/errors",
"plugin:import/warnings",
"plugin:jest/recommended"
"plugin:jest/recommended",
"@react-native-community",
"plugin:import/typescript"
],
"env": {
"browser": true,
"jest": true,
"react-native/react-native": true
"react-native/react-native": true,
"node": true
},
"plugins": [
"react",
@ -31,7 +35,7 @@
"extensions": [".js", ".jsx"]
}
],
"max-len": ["error", 100],
"max-len": ["warn", 100],
"react/forbid-prop-types": [0],
"no-underscore-dangle": 0,
"react/require-default-props": [0],
@ -44,14 +48,16 @@
"import/no-named-default": "off",
"no-param-reassign": "off",
"no-case-declarations": "off",
"no-cycle": "off",
"import/no-cycle": "off",
"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "warn",
"react-hooks/exhaustive-deps": "off",
"react/destructuring-assignment": [1, "always"],
"import/no-extraneous-dependencies": [
"error",
{
"devDependencies": true
}
]
],
"import/no-unresolved": "off"
}
}

BIN
ios/eSteem.xcworkspace/xcuserdata/f.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

4
package.json
View File

@ -66,7 +66,7 @@
"react-native-navigation-bar-color": "^0.1.0",
"react-native-reanimated": "^1.3.0",
"react-native-render-html": "^4.1.2",
"react-native-screens": "^2.0.0-alpha.15",
"react-native-screens": "^2.0.0-alpha.16",
"react-native-scrollable-tab-view": "esteemapp/react-native-scrollable-tab-view",
"react-native-slider": "^0.11.0",
"react-native-snap-carousel": "^3.8.0",
@ -80,7 +80,7 @@
"react-navigation-drawer": "^2.2.2",
"react-navigation-redux-helpers": "^2.0.8",
"react-navigation-stack": "^1.9.3",
"react-navigation-tabs": "^2.5.5",
"react-navigation-tabs": "^2.6.2",
"react-redux": "^7.1.1",
"redux": "^4.0.4",
"redux-persist": "^6.0.0",

1
src/_EXAMPLES FOR DEVELOPERS/components/statefull/view/exampleView.js
View File

@ -32,3 +32,4 @@ class ExampleView extends Component {
}
export default ExampleView;
/* eslint-enable */

5
src/components/animations/pulse/pulseAnimation.js
View File

@ -15,6 +15,8 @@ const styles = StyleSheet.create({
});
class PulseAnimation extends Component {
mounted = true;
static defaultProps = {
color: 'blue',
diameter: 400,
@ -33,8 +35,6 @@ class PulseAnimation extends Component {
},
};
mounted = true;
constructor(props) {
super(props);
@ -97,6 +97,7 @@ class PulseAnimation extends Component {
updatePulse = () => {
if (this.mounted) {
// eslint-disable-next-line react/no-access-state-in-setstate
const pulses = this.state.pulses.map((p, i) => {
const { maxDiameter } = this.state;
const newDiameter = p.diameter > maxDiameter ? 0 : p.diameter + 2;

1
src/components/basicUIElements/view/placeHolder/boostPlaceHolderView.js
View File

@ -51,3 +51,4 @@ const BoostPlaceHolder = () => {
};
export default BoostPlaceHolder;
/* eslint-enable */

1
src/components/basicUIElements/view/placeHolder/listPlaceHolderView.js
View File

@ -18,3 +18,4 @@ const ListPlaceHolderView = () => {
return <Fragment>{listElements}</Fragment>;
};
export default ListPlaceHolderView;
/* eslint-enable */

1
src/components/basicUIElements/view/placeHolder/walletDetailsPlaceHolder.js
View File

@ -43,3 +43,4 @@ const WalletDetailsPlaceHolder = () => (
);
export default WalletDetailsPlaceHolder;
/* eslint-enable */

5
src/components/basicUIElements/view/tag/tagStyles.js
View File

@ -17,6 +17,7 @@ export default EStyleSheet.create({
paddingHorizontal: Platform.OS === 'android' ? 20 : 10,
justifyContent: 'center',
marginRight: 8,
marginLeft: 8,
height: 22,
backgroundColor: '$iconColor',
borderRadius: 50,
@ -26,9 +27,9 @@ export default EStyleSheet.create({
},
isFilterTextUnPin: {
color: '$primaryDarkGray',
fontSize: 14,
fontSize: 12,
},
isFilterTextPin: {
fontSize: 14,
fontSize: 12,
},
});

17
src/components/bottomTabBar/view/tabbar.js
View File

@ -3,12 +3,12 @@ import { View, TouchableHighlight, Animated } from 'react-native';
import Svg, { Circle, Path } from 'react-native-svg';
import scalePx from '../../../utils/scalePx';
import styles from './bottomTabBarStyles';
const AnimatedCircle = Animated.createAnimatedComponent(Circle);
const AnimatedPath = Animated.createAnimatedComponent(Path);
import styles from './bottomTabBarStyles';
export default class TabBar extends Component {
constructor(props) {
super(props);
@ -34,7 +34,7 @@ export default class TabBar extends Component {
}
this.state = {
selectedIndex: selectedIndex,
selectedIndex,
circleRadius: new Animated.Value(91 + selectedIndex * value),
pathD: new Animated.Value(selectedIndex * value),
pathX: selectedIndex * value,
@ -99,6 +99,7 @@ export default class TabBar extends Component {
return React.cloneElement(route, {
selected: selectedIndex === i,
onPress: this._onPress,
// eslint-disable-next-line react/no-array-index-key
key: i,
index: i,
showIcon: true,
@ -128,6 +129,7 @@ export default class TabBar extends Component {
pathX}.941653,71.4462087 ${31 + pathX}.454074,80.6628108 Z`}
/>
<AnimatedCircle
// eslint-disable-next-line no-return-assign
ref={ref => (this._myCircle = ref)}
fill={circleBackgroundColor}
cx={circleRadius}
@ -144,7 +146,12 @@ const TabBarItem = ({ icon, selectedIcon, index, selected, onPress, showIcon, di
if (selected) {
if (showIcon) {
return (
<TouchableHighlight underlayColor={'transparent'} style={styles.navItem}>
<TouchableHighlight
underlayColor="transparent"
style={[
styles.navItem
]}
>
<View style={styles.circle}>{selectedIcon || icon}</View>
</TouchableHighlight>
);
@ -155,7 +162,7 @@ const TabBarItem = ({ icon, selectedIcon, index, selected, onPress, showIcon, di
return (
<TouchableHighlight
underlayColor={'transparent'}
underlayColor="transparent"
style={styles.navItem}
onPress={() => onPress(index, disabled)}
>

34
src/components/collapsibleCard/view/collapsibleCardView.js
View File

@ -32,23 +32,6 @@ class CollapsibleCardView extends PureComponent {
};
}
UNSAFE_componentWillReceiveProps(nextProps) {
const { isExpanded, moreHeight, locked } = this.props;
const { expanded } = this.state;
if (
(locked || !nextProps.isExpanded) &&
isExpanded !== nextProps.isExpanded &&
expanded !== nextProps.isExpanded
) {
this._toggleOnPress();
}
if (moreHeight !== nextProps.moreHeight) {
this.anime.height.setValue(this._getMaxValue() + nextProps.moreHeight);
}
}
// Component Functions
_initContentHeight = event => {
if (this.anime.contentHeight > 0) {
@ -79,6 +62,23 @@ class CollapsibleCardView extends PureComponent {
}
};
UNSAFE_componentWillReceiveProps(nextProps) {
const { isExpanded, moreHeight, locked } = this.props;
const { expanded } = this.state;
if (
(locked || !nextProps.isExpanded) &&
isExpanded !== nextProps.isExpanded &&
expanded !== nextProps.isExpanded
) {
this._toggleOnPress();
}
if (moreHeight !== nextProps.moreHeight) {
this.anime.height.setValue(this._getMaxValue() + nextProps.moreHeight);
}
}
render() {
const {
title,

26
src/components/comments/container/commentsContainer.js
View File

@ -36,19 +36,6 @@ class CommentsContainer extends Component {
this._getComments();
}
UNSAFE_componentWillReceiveProps(nextProps) {
const { commentCount, selectedFilter } = this.props;
if (nextProps.commentCount > commentCount) {
this._getComments();
}
if (selectedFilter !== get(nextProps, 'selectedFilter') && get(nextProps, 'selectedFilter')) {
const shortedComments = this._shortComments(get(nextProps, 'selectedFilter'));
this.setState({ comments: shortedComments });
}
}
// Component Functions
_shortComments = (sortOrder, comments) => {
@ -244,6 +231,19 @@ class CommentsContainer extends Component {
}
};
UNSAFE_componentWillReceiveProps(nextProps) {
const { commentCount, selectedFilter } = this.props;
if (nextProps.commentCount > commentCount) {
this._getComments();
}
if (selectedFilter !== get(nextProps, 'selectedFilter') && get(nextProps, 'selectedFilter')) {
const shortedComments = this._shortComments(get(nextProps, 'selectedFilter'));
this.setState({ comments: shortedComments });
}
}
render() {
const { comments: _comments, selectedPermlink } = this.state;
const {

1
src/components/dateTimePicker/view/dateTimePickerView.js
View File

@ -105,3 +105,4 @@ DateTimePickerView.defaultProps = {
};
export default injectIntl(DateTimePickerView);
/* eslint-enable */

33
src/components/editorElements/tagArea/view/tagAreaView.js
View File

@ -24,22 +24,6 @@ export default class TagAreaView extends Component {
};
}
// Component Life Cycles
UNSAFE_componentWillReceiveProps(nextProps) {
const { draftChips, isRemoveTag } = this.props;
if (nextProps.draftChips && nextProps.draftChips !== draftChips) {
const _chips = [...nextProps.draftChips, ' '];
this.setState({
chips: _chips,
});
}
if (isRemoveTag !== nextProps.isRemoveTag && nextProps.isRemoveTag) {
this.setState({ chips: [' '], currentText: '' });
}
}
// Component Functions
_handleOnChange = (text, i) => {
this.setState({ currentText: text.replace(/\s/g, '').replace(/,/g, '') });
@ -96,6 +80,22 @@ export default class TagAreaView extends Component {
}
};
// Component Life Cycles
UNSAFE_componentWillReceiveProps(nextProps) {
const { draftChips, isRemoveTag } = this.props;
if (nextProps.draftChips && nextProps.draftChips !== draftChips) {
const _chips = [...nextProps.draftChips, ' '];
this.setState({
chips: _chips,
});
}
if (isRemoveTag !== nextProps.isRemoveTag && nextProps.isRemoveTag) {
this.setState({ chips: [' '], currentText: '' });
}
}
render() {
const { isPreviewActive } = this.props;
const { chips, activeChip, currentText } = this.state;
@ -107,6 +107,7 @@ export default class TagAreaView extends Component {
(chip, i) =>
i < 7 && (
<Chip
// eslint-disable-next-line react/no-array-index-key
key={i}
refs={input => {
this.inputs[i] = input;

11
src/components/filterBar/view/filterBarStyles.js
View File

@ -1,4 +1,7 @@
import EStyleSheet from 'react-native-extended-stylesheet';
import { Dimensions } from 'react-native';
const deviceWidth = Dimensions.get('window').width;
export default EStyleSheet.create({
container: {
@ -14,9 +17,10 @@ export default EStyleSheet.create({
},
dropdownWrapper: {
flexDirection: 'row',
justifyContent: 'center',
justifyContent: 'space-around',
alignItems: 'center',
left: 15,
left: 5,
flex: 6,
},
filterBarWrapper: {
flexDirection: 'row',
@ -24,7 +28,8 @@ export default EStyleSheet.create({
justifyContent: 'space-between',
},
rightIconWrapper: {
marginRight: 16,
flex: 1,
marginRight: 5,
alignSelf: 'center',
},
rightIcon: {

18
src/components/formInput/view/formInputView.js
View File

@ -33,15 +33,6 @@ class FormInputView extends Component {
};
}
// Component Life Cycles
UNSAFE_componentWillReceiveProps(nextProps) {
const { isValid } = this.props;
if (nextProps.isValid !== isValid) {
this.setState({ isValid: nextProps.isValid });
}
}
// Component Functions
_handleOnChange = value => {
const { onChange } = this.props;
@ -56,6 +47,15 @@ class FormInputView extends Component {
this.setState({ inputBorderColor: '#357ce6' });
};
// Component Life Cycles
UNSAFE_componentWillReceiveProps(nextProps) {
const { isValid } = this.props;
if (nextProps.isValid !== isValid) {
this.setState({ isValid: nextProps.isValid });
}
}
render() {
const { inputBorderColor, isValid, value } = this.state;
const {

6
src/components/formatedElements/formattedCurrency/formattedCurrencyView.js
View File

@ -7,9 +7,9 @@ const FormattedCurrency = ({ value, fixAt = 3, currency, isApproximate = false }
const toFixedValue = valueInCurrency.toFixed(fixAt);
return (
<Fragment key={toFixedValue.toString()}>{`${
isApproximate ? '~' : ''
}${currencySymbol} ${toFixedValue}`}</Fragment>
<Fragment key={toFixedValue.toString()}>
{`${isApproximate ? '~' : ''}${currencySymbol} ${toFixedValue}`}
</Fragment>
);
};

3
src/components/icon/view/iconStyles.js
View File

@ -12,8 +12,7 @@ export default EStyleSheet.create({
right: 10,
top: 13,
backgroundColor: '$primaryRed',
borderColor: '$white',
borderWidth: 2,
borderWidth: 0,
justifyContent: 'center',
alignItems: 'center',
zIndex: 99,

9
src/components/index.js
View File

@ -1,6 +1,6 @@
import { AvatarHeader } from './avatarHeader';
import { BasicHeader } from './basicHeader';
import { BoostIndicatorAnimation } from './animations';
import { BoostIndicatorAnimation, PulseAnimation, SpinIndicator } from './animations';
import { BottomTabBar } from './bottomTabBar';
import { CheckBox } from './checkbox';
import { CircularButton, TextButton, SquareButton } from './buttons';
@ -32,13 +32,13 @@ import { PostForm } from './postForm';
import { PostHeaderDescription, PostBody, Tags } from './postElements';
import { PostListItem } from './postListItem';
import { ProfileSummary } from './profileSummary';
import { PulseAnimation } from './animations';
import { SearchInput } from './searchInput';
import { SearchModal } from './searchModal';
import { SettingsItem } from './settingsItem';
import { SideMenu } from './sideMenu';
import { SpinIndicator } from './animations';
import { SummaryArea, TagArea, TextArea, TitleArea } from './editorElements';
import { SummaryArea, TagArea, TitleArea } from './editorElements';
import { TabBar } from './tabBar';
import { TextInput } from './textInput';
import { ToastNotification } from './toastNotification';
@ -171,7 +171,6 @@ export {
Tag,
TagArea,
Tags,
TextArea,
TextButton,
TextInput,
TextWithIcon,

20
src/components/mainButton/view/mainButtonView.js
View File

@ -27,16 +27,6 @@ class MainButton extends Component {
};
}
// Component Life Cycles
UNSAFE_componentWillReceiveProps(nextProps) {
const { isLoading, isDisable } = this.props;
if (nextProps.isLoading !== isLoading || nextProps.isDisable !== isDisable) {
this.setState({
isDisable: !nextProps.isLoading && nextProps.isDisable,
});
}
}
// Component Functions
_handleOnPress = () => {
const { onPress } = this.props;
@ -88,6 +78,16 @@ class MainButton extends Component {
_getIndicator = () => <ActivityIndicator color="white" style={styles.activityIndicator} />;
// Component Life Cycles
UNSAFE_componentWillReceiveProps(nextProps) {
const { isLoading, isDisable } = this.props;
if (nextProps.isLoading !== isLoading || nextProps.isDisable !== isDisable) {
this.setState({
isDisable: !nextProps.isLoading && nextProps.isDisable,
});
}
}
render() {
const { wrapperStyle, children, height, style, isLoading } = this.props;
const { isDisable } = this.state;

10
src/components/markdownEditor/view/markdownEditorView.js
View File

@ -45,13 +45,13 @@ const MarkdownEditorView = ({
if (!isPreviewActive) {
_setTextAndSelection({ selection: { start: 0, end: 0 }, text });
}
}, [_setTextAndSelection, isPreviewActive, text]);
}, [isPreviewActive]);
useEffect(() => {
if (text === '' && draftBody !== '') {
_setTextAndSelection({ selection: { start: 0, end: 0 }, text: draftBody });
}
}, [_setTextAndSelection, draftBody, text]);
}, [draftBody]);
useEffect(() => {
if (editable === null) {
@ -63,7 +63,7 @@ const MarkdownEditorView = ({
} else {
setEditable(!isLoading);
}
}, [editable, isLoading]);
}, [isLoading]);
useEffect(() => {
if (uploadedImage && uploadedImage.url) {
@ -75,7 +75,7 @@ const MarkdownEditorView = ({
isImage: !!uploadedImage,
});
}
}, [_setTextAndSelection, selection, text, uploadedImage]);
}, [uploadedImage]);
useEffect(() => {
setText(draftBody);
@ -91,7 +91,7 @@ const MarkdownEditorView = ({
handleIsFormValid(text);
}
}
}, [_changeText, handleIsFormValid, text]);
}, [text]);
// eslint-disable-next-line react-hooks/exhaustive-deps
const _changeText = useCallback(input => {

3
src/components/notification/view/notificationView.js
View File

@ -169,7 +169,7 @@ class NotificationView extends PureComponent {
options={filters.map(item => item.value)}
defaultText="ALL"
onDropdownSelect={this._handleOnDropdownSelect}
rightIconName="check"
rightIconName="playlist-add-check"
rightIconType="MaterialIcons"
selectedOptionIndex={selectedIndex}
onRightIconPress={readAllNotification}
@ -214,3 +214,4 @@ class NotificationView extends PureComponent {
}
export default injectIntl(NotificationView);
/* eslint-enable */

2
src/components/notificationLine/view/notificationLineView.js
View File

@ -1,3 +1,4 @@
/* eslint-disable react/jsx-one-expression-per-line */
import React, { useState, useEffect } from 'react';
import { View, Text, Image, TouchableHighlight } from 'react-native';
import { useIntl } from 'react-intl';
@ -75,3 +76,4 @@ const NotificationLineView = ({ notification, handleOnPressNotification }) => {
};
export default NotificationLineView;
/* eslint-enable */

24
src/components/pinAnimatedInput/views/pinAnimatedInputView.js
View File

@ -1,3 +1,4 @@
/* eslint-disable react/no-array-index-key */
import React, { Component } from 'react';
import { Animated, Easing, View } from 'react-native';
@ -22,17 +23,6 @@ class PinAnimatedInput extends Component {
this.dots[3] = new Animated.Value(0);
}
UNSAFE_componentWillReceiveProps(nextProps) {
const { loading } = this.props;
if (loading !== nextProps.loading) {
if (nextProps.loading) {
this._startLoadingAnimation();
} else {
this._stopLoadingAnimation();
}
}
}
_startLoadingAnimation = () => {
[...Array(4)].map((item, index) => {
this.dots[index].setValue(0);
@ -58,6 +48,17 @@ class PinAnimatedInput extends Component {
});
};
UNSAFE_componentWillReceiveProps(nextProps) {
const { loading } = this.props;
if (loading !== nextProps.loading) {
if (nextProps.loading) {
this._startLoadingAnimation();
} else {
this._stopLoadingAnimation();
}
}
}
render() {
const { pin } = this.props;
const marginBottom = [];
@ -88,3 +89,4 @@ class PinAnimatedInput extends Component {
}
export default PinAnimatedInput;
/* eslint-enable */

8
src/components/postBoost/postBoostView.js
View File

@ -145,11 +145,9 @@ class BoostPostScreen extends PureComponent {
<Text style={styles.balanceText}>{`${balance || _balance} ESTM`}</Text>
<View style={styles.autocompleteLineContainer}>
<View style={styles.autocompleteLabelContainer}>
{
<Text style={styles.autocompleteLabelText}>
{intl.formatMessage({ id: 'promote.permlink' })}
</Text>
}
<Text style={styles.autocompleteLabelText}>
{intl.formatMessage({ id: 'promote.permlink' })}
</Text>
</View>
<Autocomplete

12
src/components/postCard/container/postCardContainer.js
View File

@ -24,12 +24,6 @@ class PostCardContainer extends PureComponent {
};
}
UNSAFE_componentWillReceiveProps(nextProps) {
if (get(nextProps, 'isRefresh')) {
this._fetchPost();
}
}
_handleOnUserPress = () => {
const { navigation, currentAccount, content } = this.props;
if (content && get(currentAccount, 'name') !== get(content, 'author')) {
@ -94,6 +88,12 @@ class PostCardContainer extends PureComponent {
.catch(() => {});
};
UNSAFE_componentWillReceiveProps(nextProps) {
if (get(nextProps, 'isRefresh')) {
this._fetchPost();
}
}
render() {
const { content, isHideImage, nsfw } = this.props;
const { _content } = this.state;

22
src/components/postCard/view/postCardView.js
View File

@ -36,17 +36,6 @@ class PostCardView extends Component {
};
}
// Component Lifecycle Functions
UNSAFE_componentWillReceiveProps(nextProps) {
const { content } = this.props;
const rebloggedBy = get(content, 'reblogged_by[0]', null);
const _rebloggedBy = get(nextProps.content, 'reblogged_by[0]', null);
if (rebloggedBy !== _rebloggedBy && !_rebloggedBy) {
this.setState({ rebloggedBy });
}
}
// Component Functions
_handleOnUserPress = () => {
@ -87,6 +76,17 @@ class PostCardView extends Component {
return DEFAULT_IMAGE;
};
// Component Lifecycle Functions
UNSAFE_componentWillReceiveProps(nextProps) {
const { content } = this.props;
const rebloggedBy = get(content, 'reblogged_by[0]', null);
const _rebloggedBy = get(nextProps.content, 'reblogged_by[0]', null);
if (rebloggedBy !== _rebloggedBy && !_rebloggedBy) {
this.setState({ rebloggedBy });
}
}
render() {
const { content, isHideImage, fetchPost, isNsfwPost, intl } = this.props;
const { rebloggedBy } = this.state;

2
src/components/postElements/body/view/postBodyView.js
View File

@ -6,7 +6,7 @@ import AutoHeightWebView from 'react-native-autoheight-webview';
import EStyleSheet from 'react-native-extended-stylesheet';
import get from 'lodash/get';
import script from './config.js';
import script from './config';
import { PostPlaceHolder, CommentPlaceHolder } from '../../../basicUIElements';
// Constants

16
src/components/postView/container/postDisplayContainer.js
View File

@ -29,14 +29,6 @@ class PostDisplayContainer extends Component {
this.state = {};
}
// Component Life Cycle Functions
UNSAFE_componentWillReceiveProps(nextProps) {
const { isFetchPost } = this.props;
if (isFetchPost !== nextProps.isFetchPost && nextProps.isFetchPost) {
this._fetchPost();
}
}
// Component Functions
_handleOnVotersPress = activeVotes => {
const { navigation, post } = this.props;
@ -119,6 +111,14 @@ class PostDisplayContainer extends Component {
}
};
// Component Life Cycle Functions
UNSAFE_componentWillReceiveProps(nextProps) {
const { isFetchPost } = this.props;
if (isFetchPost !== nextProps.isFetchPost && nextProps.isFetchPost) {
this._fetchPost();
}
}
render() {
const {
currentAccount,

2
src/components/posts/container/postsContainer.js
View File

@ -25,6 +25,7 @@ const PostsContainer = ({
tag,
nsfw,
filterOptionsValue,
feedUsername,
}) => {
const dispatch = useDispatch();
@ -59,6 +60,7 @@ const PostsContainer = ({
setFeedPosts={_setFeedPosts}
tag={tag}
filterOptionsValue={filterOptionsValue}
feedUsername={feedUsername}
/>
)}
</AccountContainer>

5
src/components/posts/view/postsView.js
View File

@ -39,6 +39,7 @@ const PostsView = ({
changeForceLoadPostState,
forceLoadPost,
filterOptionsValue,
feedUsername,
}) => {
const [posts, setPosts] = useState(isConnected ? [] : feedPosts);
const [startAuthor, setStartAuthor] = useState('');
@ -167,11 +168,12 @@ const PostsView = ({
if (filter === 'feed' || filter === 'blog' || getFor === 'blog' || filter === 'reblogs') {
options = {
tag,
tag: feedUsername,
limit,
};
} else {
options = {
tag,
limit,
};
}
@ -395,3 +397,4 @@ const PostsView = ({
};
export default withNavigation(PostsView);
/* eslint-enable */

2
src/components/profile/profileView.js
View File

@ -177,7 +177,7 @@ class ProfileView extends PureComponent {
selectedOptionIndex={0}
pageType="profiles"
getFor="blog"
tag={username}
feedUsername={username}
key={username}
handleOnScroll={isSummaryOpen ? this._handleOnScroll : null}
forceLoadPost={forceLoadPost}

8
src/components/promote/promoteView.js
View File

@ -143,11 +143,9 @@ class PromoteView extends PureComponent {
<Fragment>
<View style={styles.autocomplateLineContainer}>
<View style={styles.autocomplateLabelContainer}>
{
<Text style={styles.autocomplateLabelText}>
{intl.formatMessage({ id: 'promote.permlink' })}
</Text>
}
<Text style={styles.autocomplateLabelText}>
{intl.formatMessage({ id: 'promote.permlink' })}
</Text>
</View>
<Autocomplete

2
src/components/scaleSlider/scaleSliderView.js
View File

@ -1,3 +1,4 @@
/* eslint-disable react/no-unused-state */
import React, { Component } from 'react';
import { View, Dimensions, Text } from 'react-native';
import MultiSlider from '@ptomasroos/react-native-multi-slider';
@ -82,3 +83,4 @@ export default class ScaleSliderView extends Component {
);
}
}
/* eslint-enable */

2
src/components/searchModal/container/searchModalContainer.js
View File

@ -76,7 +76,7 @@ const SearchModalContainer = ({
const result = {};
const metadata = JSON.parse(get(post, 'json_metadata', ''));
if (get(metadata, 'image', false) && metadata.image.length > 0) {
result.image = metadata.image[0];
[result.image] = metadata.image;
} else {
result.image = getResizedAvatar(author);
}

16
src/components/sideMenu/container/sideMenuContainer.js
View File

@ -30,14 +30,6 @@ class SideMenuContainer extends Component {
// Component Life Cycle Functions
UNSAFE_componentWillReceiveProps(nextProps) {
const { isLoggedIn } = this.props;
if (isLoggedIn) {
this._createUserList(nextProps.otherAccounts);
}
}
_createUserList = otherAccounts => {
const { currentAccount } = this.props;
@ -92,6 +84,14 @@ class SideMenuContainer extends Component {
dispatch(logout());
};
UNSAFE_componentWillReceiveProps(nextProps) {
const { isLoggedIn } = this.props;
if (isLoggedIn) {
this._createUserList(nextProps.otherAccounts);
}
}
render() {
const { currentAccount, isLoggedIn } = this.props;
const { accounts } = this.state;

26
src/components/sideMenu/view/sideMenuView.js
View File

@ -42,19 +42,6 @@ class SideMenuView extends Component {
});
}
UNSAFE_componentWillReceiveProps(nextProps) {
const { isLoggedIn, accounts } = this.props;
const { isAddAccountIconActive } = this.state;
if (isLoggedIn !== nextProps.isLoggedIn) {
this._setMenuItems(nextProps.isLoggedIn);
}
if (accounts !== nextProps.accounts && isAddAccountIconActive) {
this.setState({ menuItems: nextProps.accounts });
}
}
// Component Functions
_handleOnPressAddAccountIcon = () => {
@ -91,6 +78,19 @@ class SideMenuView extends Component {
}
};
UNSAFE_componentWillReceiveProps(nextProps) {
const { isLoggedIn, accounts } = this.props;
const { isAddAccountIconActive } = this.state;
if (isLoggedIn !== nextProps.isLoggedIn) {
this._setMenuItems(nextProps.isLoggedIn);
}
if (accounts !== nextProps.accounts && isAddAccountIconActive) {
this.setState({ menuItems: nextProps.accounts });
}
}
render() {
const { currentAccount, isLoggedIn, intl, handleLogout } = this.props;
const { menuItems, isAddAccountIconActive, storageT } = this.state;

10
src/components/spinGame/spinGameView.js
View File

@ -1,3 +1,4 @@
/* eslint-disable react/no-this-in-sfc */
import React, { useState, Fragment } from 'react';
import { Image, Text, View } from 'react-native';
import moment from 'moment';
@ -82,9 +83,11 @@ const SpinGameView = ({
handleOnButtonPress={id => buyItem(id)}
/>
))}
<Text style={styles.nextDate}>{`${intl.formatMessage({
id: 'free_estm.timer_text',
})} ${moment.utc(moment(nextDate).diff(new Date())).format('H:m')}`}</Text>
<Text style={styles.nextDate}>
{`${intl.formatMessage({
id: 'free_estm.timer_text',
})} ${moment.utc(moment(nextDate).diff(new Date())).format('H:m')}`}
</Text>
</Fragment>
)}
</Fragment>
@ -96,3 +99,4 @@ const SpinGameView = ({
};
export { SpinGameView as SpinGame };
/* eslint-enable */

10
src/components/toastNotification/view/toastNotificaitonView.js
View File

@ -17,11 +17,6 @@ class ToastNotification extends Component {
};
}
// Component Life Cycles
componentWillMount() {
this._showToast();
}
// Component Functions
_showToast() {
const { duration } = this.props;
@ -53,6 +48,11 @@ class ToastNotification extends Component {
}
}
// Component Life Cycles
UNSAFE_componentWillMount() {
this._showToast();
}
render() {
const { text, textStyle, style, onPress, isTop } = this.props;
const { animatedValue } = this.state;

7
src/components/toggleSwitch/view/toggleSwitchView.js
View File

@ -28,9 +28,6 @@ class ToggleSwitchView extends PureComponent {
}
// Component Life Cycles
componentWillMount() {
this.setState({ duration: 0 });
}
componentDidMount() {
this.setState({ duration: 300 });
@ -96,6 +93,10 @@ class ToggleSwitchView extends PureComponent {
}).start();
};
UNSAFE_componentWillMount() {
this.setState({ duration: 0 });
}
render() {
this._triggerAnimation();

1
src/components/transaction/transactionView.js
View File

@ -94,3 +94,4 @@ const TransactionView = ({ transactions, type, refreshing, setRefreshing, isLoad
};
export default TransactionView;
/* eslint-enable */

38
src/components/upvote/view/upvoteView.js
View File

@ -48,24 +48,6 @@ class UpvoteView extends Component {
this._calculateEstimatedAmount();
}
UNSAFE_componentWillReceiveProps(nextProps) {
const { isVoted, upvotePercent } = this.props;
const { isVoted: localIsVoted } = this.state;
if (isVoted !== get(nextProps, 'isVoted') && localIsVoted !== get(nextProps, 'isVoted')) {
this.setState({ isVoted: get(nextProps, 'isVoted') });
}
if (upvotePercent !== get(nextProps, 'upvotePercent')) {
this.setState({
sliderValue:
get(nextProps, 'isVoted', false) ||
get(nextProps, 'isDownVoted', 1) ||
get(nextProps, 'upvotePercent', 1),
});
}
}
// Component Functions
_calculateEstimatedAmount = async () => {
const { currentAccount, globalProps } = this.props;
@ -187,6 +169,24 @@ class UpvoteView extends Component {
}, 300);
};
UNSAFE_componentWillReceiveProps(nextProps) {
const { isVoted, upvotePercent } = this.props;
const { isVoted: localIsVoted } = this.state;
if (isVoted !== get(nextProps, 'isVoted') && localIsVoted !== get(nextProps, 'isVoted')) {
this.setState({ isVoted: get(nextProps, 'isVoted') });
}
if (upvotePercent !== get(nextProps, 'upvotePercent')) {
this.setState({
sliderValue:
get(nextProps, 'isVoted', false) ||
get(nextProps, 'isDownVoted', 1) ||
get(nextProps, 'upvotePercent', 1),
});
}
}
render() {
const {
isDecinedPayout,
@ -204,7 +204,7 @@ class UpvoteView extends Component {
const { isVoting, amount, sliderValue, isVoted, isShowDetails, downvote } = this.state;
let iconName = 'upcircleo';
let iconType = 'AntDesign';
const iconType = 'AntDesign';
let downVoteIconName = 'downcircleo';
if (isVoted) {

2
src/components/userAvatar/view/userAvatarView.js
View File

@ -36,7 +36,7 @@ class UserAvatarView extends Component {
const routeName = name === username ? ROUTES.TABBAR.PROFILE : ROUTES.SCREENS.PROFILE;
navigate({
routeName: routeName,
routeName,
params: {
username,
},

1
src/components/wallet/view/walletView.js
View File

@ -131,3 +131,4 @@ const WalletView = ({ setEstimatedWalletValue, selectedUser, handleOnScroll }) =
};
export default WalletView;
/* eslint-enable */

5
src/components/walletHeader/view/walletHeaderView.js
View File

@ -81,9 +81,7 @@ const WalletHeaderView = ({
>
<View style={styles.mainButtonWrapper}>
<Text style={styles.unclaimedText}>
{unclaimedBalance
? unclaimedBalance
: intl.formatMessage({ id: `wallet.${type}.buy` })}
{unclaimedBalance || intl.formatMessage({ id: `wallet.${type}.buy` })}
</Text>
<View style={styles.mainIconWrapper}>
<Icon name="add" iconType="MaterialIcons" color="#357ce6" size={23} />
@ -115,3 +113,4 @@ const WalletHeaderView = ({
};
export default withNavigation(WalletHeaderView);
/* eslint-enable */

3
src/constants/options/filters.js
View File

@ -1,6 +1,9 @@
export const POPULAR_FILTERS = ['FEED', 'TOP', 'HOT', 'NEW'];
export const POPULAR_FILTERS_VALUE = ['feed', 'trending', 'hot', 'created'];
export const GLOBAL_POST_FILTERS = ['TOP', 'HOT', 'NEW'];
export const GLOBAL_POST_FILTERS_VALUE = ['trending', 'hot', 'created'];
export const PROFILE_FILTERS = ['BLOG', 'FEED'];
export const PROFILE_FILTERS_VALUE = ['blog', 'feed'];

1
src/containers/accountContainer.js
View File

@ -31,3 +31,4 @@ const mapStateToProps = state => ({
});
export default connect(mapStateToProps)(AccountContainer);
/* eslint-enable */

13
src/containers/accountListContainer.js
View File

@ -15,7 +15,7 @@ class AccountListContainer extends Component {
this.state = {
data: props.data,
filterResult: null,
filterIndex: '0',
filterIndex: 0,
};
}
@ -33,7 +33,7 @@ class AccountListContainer extends Component {
return itemName.indexOf(_text) > -1;
});
if (filterIndex !== '0') {
if (filterIndex !== 0) {
this._handleOnVotersDropdownSelect(filterIndex, '', newData);
} else {
this.setState({ filterResult: newData });
@ -45,13 +45,13 @@ class AccountListContainer extends Component {
const _data = Object.assign([], oldData || data);
switch (index) {
case '0':
case 0:
_data.sort((a, b) => Number(b.value) - Number(a.value));
break;
case '1':
case 1:
_data.sort((a, b) => b.percent - a.percent);
break;
case '2':
case 2:
_data.sort((a, b) => (isBefore(a.time, b.time) ? 1 : -1));
break;
default:
@ -74,7 +74,7 @@ class AccountListContainer extends Component {
};
render() {
const { data, filterResult } = this.state;
const { data, filterResult, filterIndex } = this.state;
const { children } = this.props;
return (
@ -82,6 +82,7 @@ class AccountListContainer extends Component {
children({
data,
filterResult,
filterIndex,
handleOnVotersDropdownSelect: this._handleOnVotersDropdownSelect,
handleSearch: this._handleSearch,
handleOnUserPress: this._handleOnUserPress,

1
src/containers/inAppPurchaseContainer.js
View File

@ -173,3 +173,4 @@ const mapStateToProps = state => ({
});
export default withNavigation(injectIntl(connect(mapStateToProps)(InAppPurchaseContainer)));
/* eslint-enable */

1
src/containers/loggedInContainer.js
View File

@ -38,3 +38,4 @@ const mapStateToProps = state => ({
});
export default connect(mapStateToProps)(LoggedInContainer);
/* eslint-enable */

61
src/containers/profileContainer.js
View File

@ -76,36 +76,6 @@ class ProfileContainer extends Component {
this._loadProfile(targetUsername);
}
UNSAFE_componentWillReceiveProps(nextProps) {
if (!nextProps.isConnected) {
return;
}
const { isLoggedIn, navigation } = this.props;
const { isOwnProfile } = this.state;
if (isLoggedIn && !nextProps.isLoggedIn) {
navigation.navigate(ROUTES.SCREENS.LOGIN);
return;
}
if (isOwnProfile) {
const { user } = this.state;
const { activeBottomTab, currentAccount } = this.props;
const currentUsername =
get(currentAccount, 'name') !== get(nextProps, 'currentAccount.name') &&
get(nextProps, 'currentAccount.name');
const isActiveTabChanged =
activeBottomTab !== get(nextProps, 'activeBottomTab') &&
get(nextProps, 'activeBottomTab') === ROUTES.TABBAR.PROFILE;
if ((isActiveTabChanged && user) || currentUsername) {
this._loadProfile(get(nextProps, 'currentAccount.name'));
}
}
}
_getReplies = async user => {
const { isOwnProfile } = this.state;
let repliesAction;
@ -318,6 +288,36 @@ class ProfileContainer extends Component {
});
};
UNSAFE_componentWillReceiveProps(nextProps) {
if (!nextProps.isConnected) {
return;
}
const { isLoggedIn, navigation } = this.props;
const { isOwnProfile } = this.state;
if (isLoggedIn && !nextProps.isLoggedIn) {
navigation.navigate(ROUTES.SCREENS.LOGIN);
return;
}
if (isOwnProfile) {
const { user } = this.state;
const { activeBottomTab, currentAccount } = this.props;
const currentUsername =
get(currentAccount, 'name') !== get(nextProps, 'currentAccount.name') &&
get(nextProps, 'currentAccount.name');
const isActiveTabChanged =
activeBottomTab !== get(nextProps, 'activeBottomTab') &&
get(nextProps, 'activeBottomTab') === ROUTES.TABBAR.PROFILE;
if ((isActiveTabChanged && user) || currentUsername) {
this._loadProfile(get(nextProps, 'currentAccount.name'));
}
}
}
render() {
const {
avatar,
@ -399,3 +399,4 @@ const mapStateToProps = state => ({
});
export default connect(mapStateToProps)(withNavigation(ProfileContainer));
/* eslint-enable */

8
src/containers/steemWalletContainer.js
View File

@ -1,7 +1,7 @@
import React, { useState, useEffect, useCallback } from 'react';
import { connect } from 'react-redux';
import { connect, useDispatch } from 'react-redux';
import { useIntl } from 'react-intl';
import { useDispatch } from 'react-redux';
import get from 'lodash/get';
import { toastNotification } from '../redux/actions/uiAction';
@ -239,8 +239,8 @@ const WalletContainer = ({
claimRewardBalance: _claimRewardBalance,
currentAccountUsername: currentAccount.name,
handleOnWalletRefresh: _handleOnWalletRefresh,
isClaiming: isClaiming,
refreshing: refreshing,
isClaiming,
refreshing,
selectedUsername: get(selectedUser, 'name', ''),
isLoading,
walletData,

1
src/containers/themeContainer.js
View File

@ -16,3 +16,4 @@ const mapStateToProps = state => ({
});
export default connect(mapStateToProps)(ThemeContainer);
/* eslint-enable */

4
src/providers/esteem/esteem.js
View File

@ -4,7 +4,7 @@ import imageApi from '../../config/imageApi';
import serverList from '../../config/serverListApi';
import { jsonStringify } from '../../utils/jsonUtils';
import bugsnag from '../../config/bugsnag';
//market-data/currency-rate/USD/estm
// market-data/currency-rate/USD/estm
export const getCurrencyRate = currency =>
api
.get(`/market-data/currency-rate/${currency.toUpperCase()}/steem`)
@ -347,8 +347,6 @@ export const getNodes = () =>
'https://rpc.buildteam.io',
'https://rpc.steemviz.com',
'https://api.steem.house',
'https://steemd.pevo.science',
'https://steemd.minnowsupportproject.org',
],
);

1
src/providers/steem/dsteem.js
View File

@ -1249,3 +1249,4 @@ const getActiveKey = (local, pin) => {
return false;
};
/* eslint-enable */

77
src/screens/application/container/applicationContainer.js
View File

@ -96,11 +96,6 @@ class ApplicationContainer extends Component {
};
}
componentWillMount() {
const { isDarkTheme: _isDarkTheme } = this.props;
EStyleSheet.build(_isDarkTheme ? darkTheme : lightTheme);
}
componentDidMount = () => {
const { isIos } = this.state;
this._setNetworkListener();
@ -127,38 +122,6 @@ class ApplicationContainer extends Component {
}
};
UNSAFE_componentWillReceiveProps(nextProps) {
const {
isDarkTheme: _isDarkTheme,
selectedLanguage,
isLogingOut,
isConnected,
api,
} = this.props;
if (
_isDarkTheme !== nextProps.isDarkTheme ||
selectedLanguage !== nextProps.selectedLanguage ||
(api !== nextProps.api && nextProps.api)
) {
this.setState({ isRenderRequire: false }, () => this.setState({ isRenderRequire: true }));
if (nextProps.isDarkTheme) {
changeNavigationBarColor('#1e2835');
} else {
changeNavigationBarColor('#FFFFFF', true);
}
}
if (isLogingOut !== nextProps.isLogingOut && nextProps.isLogingOut) {
this._logout();
}
if (isConnected !== null && isConnected !== nextProps.isConnected && nextProps.isConnected) {
this._fetchApp();
this.globalInterval = setInterval(this._refreshGlobalProps, 180000);
}
}
componentWillUnmount() {
const { isIos } = this.state;
const { isPinCodeOpen: _isPinCodeOpen } = this.props;
@ -531,7 +494,7 @@ class ApplicationContainer extends Component {
};
_connectNotificationServer = username => {
/*eslint no-undef: "warn"*/
/* eslint no-undef: "warn" */
const ws = new WebSocket(`${Config.ACTIVITY_WEBSOCKET_URL}?user=${username}`);
ws.onmessage = () => {
@ -613,6 +576,43 @@ class ApplicationContainer extends Component {
dispatch(updateCurrentAccount(_currentAccount));
};
UNSAFE_componentWillReceiveProps(nextProps) {
const {
isDarkTheme: _isDarkTheme,
selectedLanguage,
isLogingOut,
isConnected,
api,
} = this.props;
if (
_isDarkTheme !== nextProps.isDarkTheme ||
selectedLanguage !== nextProps.selectedLanguage ||
(api !== nextProps.api && nextProps.api)
) {
this.setState({ isRenderRequire: false }, () => this.setState({ isRenderRequire: true }));
if (nextProps.isDarkTheme) {
changeNavigationBarColor('#1e2835');
} else {
changeNavigationBarColor('#FFFFFF', true);
}
}
if (isLogingOut !== nextProps.isLogingOut && nextProps.isLogingOut) {
this._logout();
}
if (isConnected !== null && isConnected !== nextProps.isConnected && nextProps.isConnected) {
this._fetchApp();
this.globalInterval = setInterval(this._refreshGlobalProps, 180000);
}
}
UNSAFE_componentWillMount() {
const { isDarkTheme: _isDarkTheme } = this.props;
EStyleSheet.build(_isDarkTheme ? darkTheme : lightTheme);
}
render() {
const {
selectedLanguage,
@ -672,3 +672,4 @@ export default connect(
},
}),
)(injectIntl(ApplicationContainer));
/* eslint-enable */

14
src/screens/application/screen/applicationScreen.js
View File

@ -27,7 +27,13 @@ class ApplicationScreen extends Component {
};
}
componentWillMount() {
_handleOnHideToastNotification = () => {
const { dispatch } = this.props;
dispatch(toastNotificationAction(''));
this.setState({ isShowToastNotification: false });
};
UNSAFE_componentWillMount() {
const { isDarkTheme } = this.props;
EStyleSheet.build(isDarkTheme ? darkTheme : lightTheme);
}
@ -39,12 +45,6 @@ class ApplicationScreen extends Component {
}
}
_handleOnHideToastNotification = () => {
const { dispatch } = this.props;
dispatch(toastNotificationAction(''));
this.setState({ isShowToastNotification: false });
};
render() {
const { isConnected, isDarkTheme, toastNotification, isReady } = this.props;
const { isShowToastNotification } = this.state;

1
src/screens/drafts/screen/draftsScreen.js
View File

@ -161,3 +161,4 @@ class DraftsScreen extends Component {
}
export default injectIntl(DraftsScreen);
/* eslint-enable */

123
src/screens/editor/container/editorContainer.js
View File

@ -54,67 +54,6 @@ class EditorContainer extends Component {
};
}
// Component Life Cycle Functions
componentWillMount() {
const { currentAccount, navigation } = this.props;
const username = currentAccount && currentAccount.name ? currentAccount.name : '';
let isReply;
let isEdit;
let post;
let _draft;
if (navigation.state && navigation.state.params) {
const navigationParams = navigation.state.params;
if (navigationParams.draft) {
_draft = navigationParams.draft;
this.setState({
draftPost: {
title: _draft.title,
body: _draft.body,
tags: _draft.tags.includes(' ') ? _draft.tags.split(' ') : _draft.tags.split(','),
},
draftId: _draft._id,
isDraft: true,
});
}
if (navigationParams.post) {
({ post } = navigationParams);
this.setState({ post });
}
if (navigationParams.isReply) {
({ isReply } = navigationParams);
this.setState({ isReply });
}
if (navigationParams.isEdit) {
({ isEdit } = navigationParams);
this.setState({
isEdit,
draftPost: {
title: get(post, 'title', ''),
body: get(post, 'markdownBody', ''),
tags: get(post, 'json_metadata.tags', []),
},
});
}
if (navigationParams.action) {
this._handleRoutingAction(navigationParams.action);
}
} else {
this.setState({ autoFocusText: true });
}
if (!isEdit && !_draft) {
this._getDraft(username, isReply);
}
}
_getDraft = async (username, isReply) => {
if (isReply) {
const draftReply = await AsyncStorage.getItem('temp-reply');
@ -311,7 +250,7 @@ class EditorContainer extends Component {
const author = currentAccount.name;
const options = makeOptions(author, permlink);
const parentPermlink = fields.tags[0];
const parentPermlink = fields.tags[0] || 'hive-125125';
if (scheduleDate) {
await this._setScheduledPost({
@ -553,6 +492,66 @@ class EditorContainer extends Component {
this.setState({ uploadedImage: null });
};
// Component Life Cycle Functions
UNSAFE_componentWillMount() {
const { currentAccount, navigation } = this.props;
const username = currentAccount && currentAccount.name ? currentAccount.name : '';
let isReply;
let isEdit;
let post;
let _draft;
if (navigation.state && navigation.state.params) {
const navigationParams = navigation.state.params;
if (navigationParams.draft) {
_draft = navigationParams.draft;
this.setState({
draftPost: {
title: _draft.title,
body: _draft.body,
tags: _draft.tags.includes(' ') ? _draft.tags.split(' ') : _draft.tags.split(','),
},
draftId: _draft._id,
isDraft: true,
});
}
if (navigationParams.post) {
({ post } = navigationParams);
this.setState({ post });
}
if (navigationParams.isReply) {
({ isReply } = navigationParams);
this.setState({ isReply });
}
if (navigationParams.isEdit) {
({ isEdit } = navigationParams);
this.setState({
isEdit,
draftPost: {
title: get(post, 'title', ''),
body: get(post, 'markdownBody', ''),
tags: get(post, 'json_metadata.tags', []),
},
});
}
if (navigationParams.action) {
this._handleRoutingAction(navigationParams.action);
}
} else {
this.setState({ autoFocusText: true });
}
if (!isEdit && !_draft) {
this._getDraft(username, isReply);
}
}
render() {
const { isLoggedIn, isDarkTheme } = this.props;
const {

3
src/screens/editor/screen/editorScreen.js
View File

@ -166,8 +166,9 @@ class EditorScreen extends Component {
_handleOnTagAdded = async tags => {
const { fields: _fields } = this.state;
const _tags = tags.filter(tag => tag && tag !== ' ');
const __tags = _tags.map(t => t.toLowerCase());
const fields = { ..._fields, tags: [..._tags] };
const fields = { ..._fields, tags: [...__tags] };
await this.setState({ fields, isRemoveTag: false });
this._handleFormUpdate();

2
src/screens/feed/screen/feedScreen.js
View File

@ -25,7 +25,7 @@ const FeedScreen = () => {
filterOptionsValue={[...POPULAR_FILTERS_VALUE]}
getFor={isLoggedIn ? 'feed' : 'trending'}
selectedOptionIndex={isLoggedIn ? 0 : 2}
tag={get(currentAccount, 'name')}
feedUsername={get(currentAccount, 'name')}
/>
</SafeAreaView>
</Fragment>

1
src/screens/follows/screen/followsScreen.js
View File

@ -67,3 +67,4 @@ class FollowsScreen extends PureComponent {
}
export default injectIntl(FollowsScreen);
/* eslint-enable */

30
src/screens/notification/container/notificationContainer.js
View File

@ -1,3 +1,4 @@
/* eslint-disable react/no-unused-state */
import React, { Component } from 'react';
import { Alert } from 'react-native';
import { connect } from 'react-redux';
@ -35,20 +36,6 @@ class NotificationContainer extends Component {
}
}
UNSAFE_componentWillReceiveProps(nextProps) {
const { selectedFilter } = this.state;
const { username } = this.props;
if (
(nextProps.activeBottomTab === ROUTES.TABBAR.NOTIFICATION && nextProps.username) ||
(nextProps.username !== username && nextProps.username)
) {
this.setState({ endOfNotification: false }, () =>
this._getAvtivities(nextProps.username, selectedFilter),
);
}
}
_getAvtivities = (user, type = null, loadMore = false) => {
const { lastNotificationId, notifications, endOfNotification } = this.state;
const since = loadMore ? lastNotificationId : null;
@ -150,6 +137,20 @@ class NotificationContainer extends Component {
await this.setState({ selectedFilter: value, endOfNotification: false, selectedIndex: ind });
};
UNSAFE_componentWillReceiveProps(nextProps) {
const { selectedFilter } = this.state;
const { username } = this.props;
if (
(nextProps.activeBottomTab === ROUTES.TABBAR.NOTIFICATION && nextProps.username) ||
(nextProps.username !== username && nextProps.username)
) {
this.setState({ endOfNotification: false }, () =>
this._getAvtivities(nextProps.username, selectedFilter),
);
}
}
render() {
const { isLoggedIn } = this.props;
const { notifications, isNotificationRefreshing } = this.state;
@ -178,3 +179,4 @@ const mapStateToProps = state => ({
});
export default injectIntl(connect(mapStateToProps)(NotificationContainer));
/* eslint-enable */

3
src/screens/pinCode/screen/pinCodeScreen.js
View File

@ -3,8 +3,7 @@ import { useIntl } from 'react-intl';
import { Text, TouchableOpacity, View } from 'react-native';
import { NumericKeyboard, PinAnimatedInput } from '../../../components';
import { UserAvatar } from '../../../components';
import { NumericKeyboard, PinAnimatedInput, UserAvatar } from '../../../components';
import styles from './pinCodeStyles';

22
src/screens/post/container/postContainer.js
View File

@ -44,17 +44,6 @@ class PostContainer extends Component {
}
}
UNSAFE_componentWillReceiveProps(nextProps) {
const { navigation } = this.props;
const { isFetch: nextIsFetch } = get(nextProps, 'navigation.state.params');
if (nextIsFetch) {
const { author, permlink } = get(navigation, 'state.params');
this._loadPost(author, permlink);
}
}
// Component Functions
_loadPost = async (author = null, permlink = null, isParentPost = false) => {
@ -81,6 +70,17 @@ class PostContainer extends Component {
});
};
UNSAFE_componentWillReceiveProps(nextProps) {
const { navigation } = this.props;
const { isFetch: nextIsFetch } = get(nextProps, 'navigation.state.params');
if (nextIsFetch) {
const { author, permlink } = get(navigation, 'state.params');
this._loadPost(author, permlink);
}
}
render() {
const { currentAccount, isLoggedIn } = this.props;
const { error, isNewPost, parentPost, post, isPostUnavailable, author } = this.state;

8
src/screens/searchResult/screen/searchResultScreen.js
View File

@ -10,7 +10,7 @@ import { SearchInput, Posts, TabBar } from '../../../components';
import styles from './searchResultStyles';
import globalStyles from '../../../globalStyles';
import { POPULAR_FILTERS, POPULAR_FILTERS_VALUE } from '../../../constants/options/filters';
import { GLOBAL_POST_FILTERS, GLOBAL_POST_FILTERS_VALUE } from '../../../constants/options/filters';
const SearchResultScreen = ({ navigation }) => {
const tag = navigation.getParam('tag', '');
@ -33,7 +33,7 @@ const SearchResultScreen = ({ navigation }) => {
const _getSelectedIndex = () => {
if (filter) {
const selectedIndex = POPULAR_FILTERS_VALUE.indexOf(filter);
const selectedIndex = GLOBAL_POST_FILTERS_VALUE.indexOf(filter);
if (selectedIndex > 0) {
return selectedIndex;
}
@ -54,8 +54,8 @@ const SearchResultScreen = ({ navigation }) => {
<View tabLabel={intl.formatMessage({ id: 'search.posts' })} style={styles.tabbarItem}>
<Posts
key={tag}
filterOptions={POPULAR_FILTERS}
filterOptionsValue={POPULAR_FILTERS_VALUE}
filterOptions={GLOBAL_POST_FILTERS}
filterOptionsValue={GLOBAL_POST_FILTERS_VALUE}
selectedOptionIndex={_getSelectedIndex()}
tag={tag}
/>

1
src/screens/settings/screen/settingsScreen.js
View File

@ -258,3 +258,4 @@ const SettingsScreen = ({
);
};
export default injectIntl(SettingsScreen);
/* eslint-enable */

1
src/screens/transfer/screen/delegateScreen.js
View File

@ -149,6 +149,7 @@ class DelegateScreen extends Component {
parseToken(get(selectedAccount, 'delegated_vesting_shares'));
}
const fixedAmount = `${amount.toFixed(6)} VESTS`;
// eslint-disable-next-line max-len
const path = `sign/delegate-vesting-shares?delegator=${from}&delegatee=${destination}&vesting_shares=${encodeURIComponent(
fixedAmount,
)}`;

16
src/screens/transfer/screen/powerDownScreen.js
View File

@ -1,3 +1,4 @@
/* eslint-disable react/no-unused-state */
import React, { Fragment, Component } from 'react';
import { Text, View, ScrollView, Alert } from 'react-native';
import ActionSheet from 'react-native-actionsheet';
@ -48,13 +49,6 @@ class PowerDownView extends Component {
this.stopActionSheet = React.createRef();
}
// Component Life Cycles
componentWillMount() {
const { currentAccountName } = this.props;
this._fetchRoutes(currentAccountName);
}
// Component Functions
_fetchRoutes = username => {
@ -189,6 +183,13 @@ class PowerDownView extends Component {
}
};
// Component Life Cycles
UNSAFE_componentWillMount() {
const { currentAccountName } = this.props;
this._fetchRoutes(currentAccountName);
}
render() {
const {
accounts,
@ -366,3 +367,4 @@ class PowerDownView extends Component {
}
export default injectIntl(PowerDownView);
/* eslint-enable */

2
src/screens/transfer/screen/transferScreen.js
View File

@ -34,7 +34,7 @@ class TransferView extends Component {
destination: props.transferType === 'powerUp' ? props.currentAccountName : '',
amount: '',
memo: '',
isUsernameValid: props.transferType === 'powerUp' && props.currentAccountName ? true : false,
isUsernameValid: !!(props.transferType === 'powerUp' && props.currentAccountName),
steemConnectTransfer: false,
isTransfering: false,
};

7
src/screens/voters/screen/votersScreen.js
View File

@ -23,7 +23,7 @@ const VotersScreen = ({ navigation }) => {
return (
<AccountListContainer data={activeVotes}>
{({ data, filterResult, handleOnVotersDropdownSelect, handleSearch }) => (
{({ data, filterResult, filterIndex, handleOnVotersDropdownSelect, handleSearch }) => (
<SafeAreaView style={globalStyles.container}>
<BasicHeader
title={`${headerTitle} (${data && data.length})`}
@ -37,7 +37,10 @@ const VotersScreen = ({ navigation }) => {
id: `voters_dropdown.${item}`,
}),
)}
defaultText={intl.formatMessage({ id: `voters_dropdown.${filterOptions[0]}` })}
defaultText={intl.formatMessage({
id: `voters_dropdown.${filterOptions[filterIndex]}`,
})}
selectedOptionIndex={filterIndex}
onDropdownSelect={handleOnVotersDropdownSelect}
/>
<VotersDisplay votes={filterResult || data} />

3
src/utils/dsteemUtils.js
View File

@ -1,8 +1,9 @@
import createIntl from './createIntl';
export const getDsteemDateErrorMessage = error => {
const intl = createIntl();
const trxTime = error.jse_info.stack[0].data['trx.expiration'];
const now = error.jse_info.stack[0].data.now;
const { now } = error.jse_info.stack[0].data;
return `${intl.formatMessage({
id: 'dsteem.date_error.device_time',

2
src/utils/filterNsfwPost.js
View File

@ -1,3 +1,4 @@
/* eslint-disable array-callback-return */
export default (posts, option) => {
const updatedPosts = [];
if (option === '1') {
@ -18,3 +19,4 @@ export default (posts, option) => {
return updatedPosts;
}
};
/* eslint-enable */

1
src/utils/postParser.js
View File

@ -5,6 +5,7 @@ import get from 'lodash/get';
import { postBodySummary, renderPostBody } from '@esteemapp/esteem-render-helpers';
// Dsteem
// eslint-disable-next-line import/no-cycle
import { getActiveVotes } from '../providers/steem/dsteem';
import { getPostReblogs } from '../providers/esteem/esteem';

1
src/utils/postUrlParser.js
View File

@ -46,6 +46,7 @@ export default url => {
url = url.replace('esteem://', 'https://esteem.app/');
}
// eslint-disable-next-line no-useless-escape
const feedMatch = url.match(/^https:\/\/([\w-\.]*)\/([\w-]*)\/?([\w-]*)\/?$/);
if (feedMatch) {

2
src/utils/vote.js
View File

@ -1,5 +1,5 @@
import parseToken from './parseToken';
import get from 'lodash/get';
import parseToken from './parseToken';
import { vestsToRshares } from './conversions';
export const getEstimatedAmount = (account, globalProps, value = 100) => {

4
src/utils/wallet.js
View File

@ -9,7 +9,7 @@ export const groomingTransactionData = (transaction, steemPerMVests, formatNumbe
return [];
}
let result = { iconType: 'MaterialIcons' };
const result = { iconType: 'MaterialIcons' };
[result.textKey] = transaction[1].op;
const opData = transaction[1].op[1];
@ -172,7 +172,7 @@ export const groomingPointsTransactionData = transaction => {
if (!transaction) {
return null;
}
let result = { ...transaction };
const result = { ...transaction };
result.details = get(transaction, 'sender')
? `from @${get(transaction, 'sender')}`

26
yarn.lock
View File

@ -7670,10 +7670,10 @@ react-native-safe-modules@^1.0.0:
dependencies:
debounce "^1.2.0"
react-native-screens@^2.0.0-alpha.15:
version "2.0.0-alpha.15"
resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-2.0.0-alpha.15.tgz#40ee432d5f9b6169494a8fd6997add1a8c4b41b3"
integrity sha512-Nn4PRFSKLkP0MTXwqOIhMypJ7GMhcU+AZgFJd0DFQhNyU5sLNlKGEzQS6jRY+4MtHJnDXoMOr/o2l9WrI/O3Mg==
react-native-screens@^2.0.0-alpha.16:
version "2.0.0-alpha.16"
resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-2.0.0-alpha.16.tgz#4675c0e9b8cbd6b9321bfd3881b5939d61aba72b"
integrity sha512-CGa0LT+AksCgttrVfM3cp8VWxUz6xcInj+qCUY1Nvd2HQh4gP3WQtH3SDWvMC3pFy3CbK0CbXZz7UcZsG3pzwQ==
dependencies:
debounce "^1.2.0"
@ -7713,10 +7713,10 @@ react-native-swiper@^1.6.0-rc.3:
dependencies:
prop-types "^15.5.10"
react-native-tab-view@^2.9.0:
version "2.10.0"
resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-2.10.0.tgz#5e249e5650502010013449ffd4e5edc18a95364b"
integrity sha512-qgexVz5eO4yaFjdkmn/sURXgVvaBo6pZD/q1eoca96SbPVbaH3WzVhF3bRUfeTHwZkXwznFTpS3JURqIFU8vQA==
react-native-tab-view@^2.11.0:
version "2.11.0"
resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-2.11.0.tgz#2e57d1f617ccc88c7f452708804f3409f880b700"
integrity sha512-vqetlxGO7A8bnqvXcB50MWpRZAImXFrDGz1WCQKdCqe03Ey3ZzENe7yLuWrtBJYlepGfOLAsmCXv+wW82Yfm1w==
react-native-vector-icons@^6.6.0:
version "6.6.0"
@ -7813,15 +7813,15 @@ react-navigation-stack@^1.9.3:
dependencies:
prop-types "^15.7.2"
react-navigation-tabs@^2.5.5:
version "2.5.5"
resolved "https://registry.yarnpkg.com/react-navigation-tabs/-/react-navigation-tabs-2.5.5.tgz#f651355b140b35ef5753aac434da5e1943abdd26"
integrity sha512-oIL5V4agCxcqbWNZzF1h/cm1bxKXNUeGrWaRQEEnuN3TXTEj1SVRz33CnKYg30pVvgF5L2p28sOk15Z4Ao01NQ==
react-navigation-tabs@^2.6.2:
version "2.6.2"
resolved "https://registry.yarnpkg.com/react-navigation-tabs/-/react-navigation-tabs-2.6.2.tgz#6611f3bbc5fcbc004a96a457e1dbe8d957d09ef5"
integrity sha512-b7Bwio3pOyb2dJOsfICm1eXUCekULO63VitLlkslsuwB5v5qXD9u+TkuSGADPiAybRH3Fts4cQX/xA5WGsIsfg==
dependencies:
hoist-non-react-statics "^3.3.0"
react-lifecycles-compat "^3.0.4"
react-native-safe-area-view "^0.14.6"
react-native-tab-view "^2.9.0"
react-native-tab-view "^2.11.0"
react-navigation@^4.0.10:
version "4.0.10"