From 7fdc5b5c27b313a9cac35f87f80b3970722a9786 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Wed, 6 Jan 2021 01:52:41 +0300 Subject: [PATCH 001/362] Refactor bestResults, peopleResults, topicsResuls, communities --- src/containers/communitiesContainer.js | 107 +++++++++++++++++ src/containers/index.js | 2 + .../communities/CommunitiesListItem.js | 80 +++++++++++++ src/screens/communities/communities.js | 108 ++++++++++++++++++ src/screens/communities/communitiesList.js | 69 +++++++++++ .../communities/communitiesListItemStyles.js | 62 ++++++++++ .../communities/communitiesListStyles.js | 16 +++ .../communitiesStyles.js} | 0 .../container/communitiesContainer.js | 68 +++-------- .../container/otherResultContainer.js | 84 -------------- .../container/peopleResultsContainer.js | 56 +++++++++ ...tContainer.js => postsResultsContainer.js} | 12 +- .../container/topicsResultsContainer.js | 48 ++++++++ .../searchResult/screen/searchResultScreen.js | 11 +- .../best/{postResult.js => postsResults.js} | 27 ++--- ...tResultStyles.js => postsResultsStyles.js} | 0 .../screen/tabs/communities/communities.js | 77 ++----------- .../screen/tabs/people/peopleResults.js | 52 +++++++++ .../screen/tabs/people/peopleResultsStyles.js | 48 ++++++++ .../screen/tabs/topics/otherResults.js | 100 ---------------- .../screen/tabs/topics/topicsResults.js | 59 ++++++++++ .../screen/tabs/topics/topicsResultsStyles.js | 48 ++++++++ 22 files changed, 797 insertions(+), 337 deletions(-) create mode 100644 src/containers/communitiesContainer.js create mode 100644 src/screens/communities/CommunitiesListItem.js create mode 100644 src/screens/communities/communities.js create mode 100644 src/screens/communities/communitiesList.js create mode 100644 src/screens/communities/communitiesListItemStyles.js create mode 100644 src/screens/communities/communitiesListStyles.js rename src/screens/{searchResult/screen/tabs/topics/otherResultsStyles.js => communities/communitiesStyles.js} (100%) delete mode 100644 src/screens/searchResult/container/otherResultContainer.js create mode 100644 src/screens/searchResult/container/peopleResultsContainer.js rename src/screens/searchResult/container/{postResultContainer.js => postsResultsContainer.js} (83%) create mode 100644 src/screens/searchResult/container/topicsResultsContainer.js rename src/screens/searchResult/screen/tabs/best/{postResult.js => postsResults.js} (77%) rename src/screens/searchResult/screen/tabs/best/{postResultStyles.js => postsResultsStyles.js} (100%) create mode 100644 src/screens/searchResult/screen/tabs/people/peopleResults.js create mode 100644 src/screens/searchResult/screen/tabs/people/peopleResultsStyles.js delete mode 100644 src/screens/searchResult/screen/tabs/topics/otherResults.js create mode 100644 src/screens/searchResult/screen/tabs/topics/topicsResults.js create mode 100644 src/screens/searchResult/screen/tabs/topics/topicsResultsStyles.js diff --git a/src/containers/communitiesContainer.js b/src/containers/communitiesContainer.js new file mode 100644 index 000000000..9d40d7939 --- /dev/null +++ b/src/containers/communitiesContainer.js @@ -0,0 +1,107 @@ +import { useState, useEffect } from 'react'; +import { withNavigation } from 'react-navigation'; +import { connect } from 'react-redux'; +import isEmpty from 'lodash/isEmpty'; + +import ROUTES from '../constants/routeNames'; + +import { getCommunities, getSubscriptions, subscribeCommunity } from '../providers/hive/dhive'; + +const CommunitiesContainer = ({ + children, + navigation, + searchValue, + currentAccount, + pinCode, + isLoggedIn, +}) => { + const [data, setData] = useState(); + const [filterIndex, setFilterIndex] = useState(1); + const [query, setQuery] = useState(''); + const [sort, setSort] = useState('rank'); + const [allSubscriptions, setAllSubscriptions] = useState([]); + const [noResult, setNoResult] = useState(false); + + useEffect(() => { + let isCancelled = false; + setData([]); + if (sort === 'my') { + setNoResult(true); + } else { + getCommunities('', 100, query, sort).then((res) => { + if (!isCancelled) { + if (!isEmpty(res)) { + setData(res); + setNoResult(false); + } else { + setNoResult(true); + } + } + }); + } + return () => { + isCancelled = true; + }; + }, [query, sort]); + + useEffect(() => { + setData([]); + setQuery(searchValue); + setNoResult(false); + }, [searchValue]); + + useEffect(() => { + let isCancelled = false; + if (data && !isCancelled) { + getSubscriptions(currentAccount.username).then((result) => { + if (result) { + setAllSubscriptions(result); + } + }); + } + return () => { + isCancelled = true; + }; + }, [data]); + + // Component Functions + const _handleOnVotersDropdownSelect = (index, value) => { + setFilterIndex(index); + setSort(value); + }; + + const _handleOnPress = (name) => { + navigation.navigate({ + routeName: ROUTES.SCREENS.COMMUNITY, + params: { + tag: name, + }, + }); + }; + + const _handleSubscribeButtonPress = (_data) => { + return subscribeCommunity(currentAccount, pinCode, _data); + }; + + return ( + children && + children({ + data, + filterIndex, + allSubscriptions, + handleOnVotersDropdownSelect: _handleOnVotersDropdownSelect, + handleOnPress: _handleOnPress, + handleSubscribeButtonPress: _handleSubscribeButtonPress, + isLoggedIn, + noResult, + }) + ); +}; + +const mapStateToProps = (state) => ({ + currentAccount: state.account.currentAccount, + pinCode: state.application.pin, + isLoggedIn: state.application.isLoggedIn, +}); + +export default connect(mapStateToProps)(withNavigation(CommunitiesContainer)); diff --git a/src/containers/index.js b/src/containers/index.js index abe7bdab2..b62c9d272 100644 --- a/src/containers/index.js +++ b/src/containers/index.js @@ -1,4 +1,5 @@ import AccountContainer from './accountContainer'; +import CommunitiesContainer from './communitiesContainer'; import InAppPurchaseContainer from './inAppPurchaseContainer'; import LoggedInContainer from './loggedInContainer'; import PointsContainer from './pointsContainer'; @@ -12,6 +13,7 @@ import TransferContainer from './transferContainer'; export { AccountContainer, + CommunitiesContainer, InAppPurchaseContainer, LoggedInContainer, PointsContainer, diff --git a/src/screens/communities/CommunitiesListItem.js b/src/screens/communities/CommunitiesListItem.js new file mode 100644 index 000000000..842b18092 --- /dev/null +++ b/src/screens/communities/CommunitiesListItem.js @@ -0,0 +1,80 @@ +import React, { useState } from 'react'; +import { View, Text, TouchableOpacity } from 'react-native'; +import { useIntl } from 'react-intl'; + +import styles from './communitiesListItemStyles'; + +import { Tag } from '../../components/basicUIElements'; + +const UserListItem = ({ + index, + handleOnPress, + handleOnLongPress, + title, + about, + admins, + id, + authors, + posts, + subscribers, + isNsfw, + name, + handleSubscribeButtonPress, + isSubscribed, + isLoggedIn, +}) => { + const [subscribed, setSubscribed] = useState(isSubscribed); + const intl = useIntl(); + + const _handleSubscribeButtonPress = () => { + handleSubscribeButtonPress({ subscribed: !subscribed, communityId: name }).then(() => { + setSubscribed(!subscribed); + }); + }; + + return ( + handleOnLongPress && handleOnLongPress()} + onPress={() => handleOnPress && handleOnPress(name)} + > + + + + {title} + {isLoggedIn && ( + + )} + + {!!about && {about}} + + + {`${subscribers.toString()} ${intl.formatMessage({ + id: 'search_result.communities.subscribers', + })} • ${authors.toString()} ${intl.formatMessage({ + id: 'search_result.communities.posters', + })} • ${posts} ${intl.formatMessage({ + id: 'search_result.communities.posts', + })}`} + + + + + ); +}; + +export default UserListItem; diff --git a/src/screens/communities/communities.js b/src/screens/communities/communities.js new file mode 100644 index 000000000..ae4881c0e --- /dev/null +++ b/src/screens/communities/communities.js @@ -0,0 +1,108 @@ +import React from 'react'; +import { useIntl } from 'react-intl'; +import { FlatList, View, Text, TouchableOpacity } from 'react-native'; +import get from 'lodash/get'; + +// Components +import { FilterBar, UserAvatar } from '../../components'; +import CommunitiesList from './communitiesList'; +import { CommunitiesPlaceHolder } from '../../components/basicUIElements'; + +import { CommunitiesContainer } from '../../containers'; +import styles from './communitiesStyles'; +import DEFAULT_IMAGE from '../../assets/no_image.png'; +import Tag from '../../components/basicUIElements/view/tag/tagView'; + +const filterOptions = ['my', 'rank', 'subs', 'new']; + +const CommunitiesScreen = ({ navigation, searchValue }) => { + const intl = useIntl(); + + const activeVotes = get(navigation, 'state.params.activeVotes'); + + const _renderEmptyContent = () => { + return ( + <> + + + + + ); + }; + + return ( + + {({ + data, + filterIndex, + allSubscriptions, + handleOnVotersDropdownSelect, + handleOnPress, + handleSubscribeButtonPress, + isLoggedIn, + noResult, + }) => ( + <> + + intl.formatMessage({ + id: `search_result.communities_filter.${item}`, + }), + )} + defaultText={intl.formatMessage({ + id: `search_result.communities_filter.${filterOptions[filterIndex]}`, + })} + selectedOptionIndex={filterIndex} + onDropdownSelect={(index) => handleOnVotersDropdownSelect(index, filterOptions[index])} + /> + {filterIndex !== 0 && ( + + )} + {filterIndex === 0 && allSubscriptions && allSubscriptions.length > 0 && ( + `${item}-${ind}`} + renderItem={({ item, index }) => ( + + + handleOnPress(item[0])}> + + + handleOnPress(item[0])}> + {item[1]} + + + + + handleSubscribeButtonPress({ isSubscribed: true, communityId: item[0] }) + } + /> + + + )} + ListEmptyComponent={_renderEmptyContent} + /> + )} + + )} + + ); +}; + +export default CommunitiesScreen; diff --git a/src/screens/communities/communitiesList.js b/src/screens/communities/communitiesList.js new file mode 100644 index 000000000..8d4ce7461 --- /dev/null +++ b/src/screens/communities/communitiesList.js @@ -0,0 +1,69 @@ +import React from 'react'; +import { SafeAreaView, FlatList } from 'react-native'; + +// Components +import { CommunityListItem, CommunitiesPlaceHolder } from '../../components/basicUIElements'; + +// Styles +import styles from './communitiesListStyles'; + +const CommunitiesList = ({ + votes, + handleOnPress, + handleSubscribeButtonPress, + allSubscriptions, + isLoggedIn, + noResult, +}) => { + const _renderItem = ({ item, index }) => { + const isSubscribed = allSubscriptions.some((sub) => sub[0] === item.name); + + return ( + + ); + }; + + const _renderEmptyContent = () => { + return ( + <> + + + + + + + + + ); + }; + + return ( + + {!noResult && ( + item.id && item.id.toString()} + renderItem={_renderItem} + ListEmptyComponent={_renderEmptyContent} + /> + )} + + ); +}; + +export default CommunitiesList; diff --git a/src/screens/communities/communitiesListItemStyles.js b/src/screens/communities/communitiesListItemStyles.js new file mode 100644 index 000000000..19880705c --- /dev/null +++ b/src/screens/communities/communitiesListItemStyles.js @@ -0,0 +1,62 @@ +import EStyleSheet from 'react-native-extended-stylesheet'; + +export default EStyleSheet.create({ + container: { + padding: 8, + flexDirection: 'row', + }, + content: { + flexDirection: 'column', + marginLeft: 8, + width: '100%', + }, + itemWrapper: { + alignItems: 'center', + padding: 16, + borderRadius: 8, + flexDirection: 'row', + backgroundColor: '$primaryBackgroundColor', + }, + itemWrapperGray: { + backgroundColor: '$primaryLightBackground', + }, + title: { + color: '$primaryBlue', + fontSize: 17, + fontWeight: 'bold', + fontFamily: '$primaryFont', + }, + about: { + fontSize: 14, + fontFamily: '$primaryFont', + marginTop: 5, + paddingTop: 10, + color: '$primaryBlack', + }, + separator: { + width: 100, + alignSelf: 'center', + backgroundColor: '$primaryDarkGray', + height: 1, + marginVertical: 10, + }, + stats: { + fontSize: 14, + fontFamily: '$primaryFont', + color: '$primaryDarkGray', + paddingBottom: 10, + }, + subscribeButton: { + borderWidth: 1, + maxWidth: 75, + borderColor: '$primaryBlue', + }, + subscribeButtonText: { + textAlign: 'center', + color: '$primaryBlue', + }, + header: { + flexDirection: 'row', + justifyContent: 'space-between', + }, +}); diff --git a/src/screens/communities/communitiesListStyles.js b/src/screens/communities/communitiesListStyles.js new file mode 100644 index 000000000..8423a2e5e --- /dev/null +++ b/src/screens/communities/communitiesListStyles.js @@ -0,0 +1,16 @@ +import EStyleSheet from 'react-native-extended-stylesheet'; + +export default EStyleSheet.create({ + container: { + flex: 1, + padding: 8, + marginBottom: 40, + flexDirection: 'row', + backgroundColor: '$primaryBackgroundColor', + }, + text: { + color: '$iconColor', + fontSize: 12, + fontFamily: '$primaryFont', + }, +}); diff --git a/src/screens/searchResult/screen/tabs/topics/otherResultsStyles.js b/src/screens/communities/communitiesStyles.js similarity index 100% rename from src/screens/searchResult/screen/tabs/topics/otherResultsStyles.js rename to src/screens/communities/communitiesStyles.js diff --git a/src/screens/searchResult/container/communitiesContainer.js b/src/screens/searchResult/container/communitiesContainer.js index bfbd4d952..91afb9ba4 100644 --- a/src/screens/searchResult/container/communitiesContainer.js +++ b/src/screens/searchResult/container/communitiesContainer.js @@ -11,6 +11,20 @@ import { subscribeCommunity, } from '../../../providers/hive/dhive'; +const DEFAULT_COMMUNITIES = [ + 'hive-125125', + 'hive-174301', + 'hive-140217', + 'hive-179017', + 'hive-160545', + 'hive-194913', + 'hive-166847', + 'hive-176853', + 'hive-183196', + 'hive-163772', + 'hive-106444', +]; + const CommunitiesContainer = ({ children, navigation, @@ -19,61 +33,16 @@ const CommunitiesContainer = ({ pinCode, isLoggedIn, }) => { - const [data, setData] = useState(); - const [filterIndex, setFilterIndex] = useState(1); - const [query, setQuery] = useState(''); - const [sort, setSort] = useState('rank'); + const [data, setData] = useState(DEFAULT_COMMUNITIES); const [allSubscriptions, setAllSubscriptions] = useState([]); - const [noResult, setNoResult] = useState(false); useEffect(() => { - let isCancelled = false; - setData([]); - if (sort === 'my') { - setNoResult(true); - } else { - getCommunities('', 100, query, sort).then((res) => { - if (!isCancelled) { - if (!isEmpty(res)) { - setData(res); - setNoResult(false); - } else { - setNoResult(true); - } - } - }); + if (searchValue !== '') { + getCommunities('', 100, searchValue, 'rank').then(setData); } - return () => { - isCancelled = true; - }; - }, [query, sort]); - - useEffect(() => { - setData([]); - setQuery(searchValue); - setNoResult(false); }, [searchValue]); - useEffect(() => { - let isCancelled = false; - if (data && !isCancelled) { - getSubscriptions(currentAccount.username).then((result) => { - if (result) { - setAllSubscriptions(result); - } - }); - } - return () => { - isCancelled = true; - }; - }, [data]); - // Component Functions - const _handleOnVotersDropdownSelect = (index, value) => { - setFilterIndex(index); - setSort(value); - }; - const _handleOnPress = (name) => { navigation.navigate({ routeName: ROUTES.SCREENS.COMMUNITY, @@ -91,13 +60,10 @@ const CommunitiesContainer = ({ children && children({ data, - filterIndex, allSubscriptions, - handleOnVotersDropdownSelect: _handleOnVotersDropdownSelect, handleOnPress: _handleOnPress, handleSubscribeButtonPress: _handleSubscribeButtonPress, isLoggedIn, - noResult, }) ); }; diff --git a/src/screens/searchResult/container/otherResultContainer.js b/src/screens/searchResult/container/otherResultContainer.js deleted file mode 100644 index 3c62bdff7..000000000 --- a/src/screens/searchResult/container/otherResultContainer.js +++ /dev/null @@ -1,84 +0,0 @@ -import { useState, useEffect } from 'react'; -import get from 'lodash/get'; -import { withNavigation } from 'react-navigation'; -import { connect } from 'react-redux'; - -import ROUTES from '../../../constants/routeNames'; - -import { lookupAccounts, getTrendingTags } from '../../../providers/hive/dhive'; -import { getLeaderboard } from '../../../providers/ecency/ecency'; - -const OtherResultContainer = (props) => { - const [users, setUsers] = useState([]); - const [tags, setTags] = useState([]); - const [filterIndex, setFilterIndex] = useState(0); - - const { children, navigation, searchValue, username } = props; - - useEffect(() => { - setUsers([]); - setTags([]); - - if (searchValue) { - lookupAccounts(searchValue).then((res) => { - setUsers(res); - }); - getTrendingTags(searchValue).then((res) => { - setTags(res); - }); - } else { - getLeaderboard().then((result) => { - const sos = result.map((item) => item._id); - setUsers(sos); - }); - } - }, [searchValue]); - - // Component Functions - - const _handleOnPress = (item) => { - switch (filterIndex) { - case 0: - navigation.navigate({ - routeName: item === username ? ROUTES.TABBAR.PROFILE : ROUTES.SCREENS.PROFILE, - params: { - username: item, - }, - key: item.text, - }); - break; - case 1: - navigation.navigate({ - routeName: ROUTES.SCREENS.TAG_RESULT, - params: { - tag: get(item, 'name', ''), - }, - }); - break; - - default: - break; - } - }; - - const _handleFilterChanged = (index, value) => { - setFilterIndex(index); - }; - - return ( - children && - children({ - users, - tags, - filterIndex, - handleOnPress: _handleOnPress, - handleFilterChanged: _handleFilterChanged, - }) - ); -}; - -const mapStateToProps = (state) => ({ - username: state.account.currentAccount.name, -}); - -export default connect(mapStateToProps)(withNavigation(OtherResultContainer)); diff --git a/src/screens/searchResult/container/peopleResultsContainer.js b/src/screens/searchResult/container/peopleResultsContainer.js new file mode 100644 index 000000000..9960fb5ea --- /dev/null +++ b/src/screens/searchResult/container/peopleResultsContainer.js @@ -0,0 +1,56 @@ +import { useState, useEffect } from 'react'; +import get from 'lodash/get'; +import { withNavigation } from 'react-navigation'; +import { connect } from 'react-redux'; + +import ROUTES from '../../../constants/routeNames'; + +import { lookupAccounts } from '../../../providers/hive/dhive'; +import { getLeaderboard } from '../../../providers/ecency/ecency'; + +const PeopleResultsContainer = (props) => { + const [users, setUsers] = useState([]); + + const { children, navigation, searchValue, username } = props; + + useEffect(() => { + setUsers([]); + + if (searchValue) { + lookupAccounts(searchValue).then((res) => { + setUsers(res); + }); + } else { + getLeaderboard().then((result) => { + const sos = result.map((item) => item._id); + setUsers(sos); + }); + } + }, [searchValue]); + + // Component Functions + + const _handleOnPress = (item) => { + navigation.navigate({ + routeName: item === username ? ROUTES.TABBAR.PROFILE : ROUTES.SCREENS.PROFILE, + params: { + username: item, + }, + key: item.text, + }); + }; + + return ( + children && + children({ + users, + handleOnPress: _handleOnPress, + }) + ); +}; + +const mapStateToProps = (state) => ({ + username: state.account.currentAccount.name, +}); + +export default connect(mapStateToProps)(withNavigation(PeopleResultsContainer)); diff --git a/src/screens/searchResult/container/postResultContainer.js b/src/screens/searchResult/container/postsResultsContainer.js similarity index 83% rename from src/screens/searchResult/container/postResultContainer.js rename to src/screens/searchResult/container/postsResultsContainer.js index 064251b81..dfe9b4b05 100644 --- a/src/screens/searchResult/container/postResultContainer.js +++ b/src/screens/searchResult/container/postsResultsContainer.js @@ -8,9 +8,8 @@ import ROUTES from '../../../constants/routeNames'; import { search, getPromotePosts } from '../../../providers/ecency/ecency'; import { getPost } from '../../../providers/hive/dhive'; -const PostResultContainer = ({ children, navigation, searchValue, currentAccountUsername }) => { +const PostsResultsContainer = ({ children, navigation, searchValue, currentAccountUsername }) => { const [data, setData] = useState([]); - const [filterIndex, setFilterIndex] = useState(0); const [sort, setSort] = useState('relevance'); const [scrollId, setScrollId] = useState(''); @@ -59,11 +58,6 @@ const PostResultContainer = ({ children, navigation, searchValue, currentAccount }); }; - const _handleFilterChanged = (index, value) => { - setFilterIndex(index); - setSort(value); - }; - const _loadMore = (index, value) => { if (scrollId) { search({ q: searchValue, sort, scroll_id: scrollId }).then((res) => { @@ -76,9 +70,7 @@ const PostResultContainer = ({ children, navigation, searchValue, currentAccount children && children({ data, - filterIndex, handleOnPress: _handleOnPress, - handleFilterChanged: _handleFilterChanged, loadMore: _loadMore, }) ); @@ -88,4 +80,4 @@ const mapStateToProps = (state) => ({ currentAccountUsername: state.account.currentAccount.username, }); -export default connect(mapStateToProps)(withNavigation(PostResultContainer)); +export default connect(mapStateToProps)(withNavigation(PostsResultsContainer)); diff --git a/src/screens/searchResult/container/topicsResultsContainer.js b/src/screens/searchResult/container/topicsResultsContainer.js new file mode 100644 index 000000000..190cdbafd --- /dev/null +++ b/src/screens/searchResult/container/topicsResultsContainer.js @@ -0,0 +1,48 @@ +import { useState, useEffect } from 'react'; +import get from 'lodash/get'; +import { withNavigation } from 'react-navigation'; +import { connect } from 'react-redux'; + +import ROUTES from '../../../constants/routeNames'; + +import { getTrendingTags } from '../../../providers/hive/dhive'; +import { getLeaderboard } from '../../../providers/ecency/ecency'; + +const OtherResultContainer = (props) => { + const [tags, setTags] = useState([]); + + const { children, navigation, searchValue, username } = props; + + useEffect(() => { + setTags([]); + + getTrendingTags(searchValue).then((res) => { + setTags(res); + }); + }, [searchValue]); + + // Component Functions + + const _handleOnPress = (item) => { + navigation.navigate({ + routeName: ROUTES.SCREENS.TAG_RESULT, + params: { + tag: get(item, 'name', ''), + }, + }); + }; + + return ( + children && + children({ + tags, + handleOnPress: _handleOnPress, + }) + ); +}; + +const mapStateToProps = (state) => ({ + username: state.account.currentAccount.name, +}); + +export default connect(mapStateToProps)(withNavigation(OtherResultContainer)); diff --git a/src/screens/searchResult/screen/searchResultScreen.js b/src/screens/searchResult/screen/searchResultScreen.js index 99f28f321..6a5552c45 100644 --- a/src/screens/searchResult/screen/searchResultScreen.js +++ b/src/screens/searchResult/screen/searchResultScreen.js @@ -6,8 +6,9 @@ import { useIntl } from 'react-intl'; // Components import { SearchInput, TabBar } from '../../../components'; import Communities from './tabs/communities/communities'; -import PostResult from './tabs/best/postResult'; -import OtherResult from './tabs/topics/otherResults'; +import PostsResults from './tabs/best/postsResults'; +import TopicsResults from './tabs/topics/topicsResults'; +import PeopleResults from './tabs/people/peopleResults'; // Styles import styles from './searchResultStyles'; @@ -58,19 +59,19 @@ const SearchResultScreen = ({ navigation }) => { tabLabel={intl.formatMessage({ id: 'search_result.best.title' })} style={styles.tabbarItem} > - + - + - + { +const PostsResults = ({ navigation, searchValue }) => { const intl = useIntl(); const _renderItem = (item, index) => { @@ -78,22 +78,9 @@ const PostResult = ({ navigation, searchValue }) => { }; return ( - - {({ data, filterIndex, handleFilterChanged, handleOnPress, loadMore }) => ( + + {({ data, handleOnPress, loadMore }) => ( - - intl.formatMessage({ - id: `search_result.post_result_filter.${item}`, - }), - )} - defaultText={intl.formatMessage({ - id: `search_result.post_result_filter.${filterOptions[filterIndex]}`, - })} - selectedOptionIndex={filterIndex} - onDropdownSelect={(index) => handleFilterChanged(index, filterOptions[index])} - /> item.id && item.id.toString()} @@ -108,8 +95,8 @@ const PostResult = ({ navigation, searchValue }) => { /> )} - + ); }; -export default PostResult; +export default PostsResults; diff --git a/src/screens/searchResult/screen/tabs/best/postResultStyles.js b/src/screens/searchResult/screen/tabs/best/postsResultsStyles.js similarity index 100% rename from src/screens/searchResult/screen/tabs/best/postResultStyles.js rename to src/screens/searchResult/screen/tabs/best/postsResultsStyles.js diff --git a/src/screens/searchResult/screen/tabs/communities/communities.js b/src/screens/searchResult/screen/tabs/communities/communities.js index d05358552..c1c3e15d6 100644 --- a/src/screens/searchResult/screen/tabs/communities/communities.js +++ b/src/screens/searchResult/screen/tabs/communities/communities.js @@ -9,7 +9,7 @@ import CommunitiesList from './communitiesList'; import { CommunitiesPlaceHolder } from '../../../../../components/basicUIElements'; import CommunitiesContainer from '../../../container/communitiesContainer'; -import styles from '../topics/otherResultsStyles'; +import styles from '../topics/topicsResultsStyles'; import DEFAULT_IMAGE from '../../../../../assets/no_image.png'; import Tag from '../../../../../components/basicUIElements/view/tag/tagView'; @@ -32,73 +32,16 @@ const CommunitiesScreen = ({ navigation, searchValue }) => { return ( - {({ - data, - filterIndex, - allSubscriptions, - handleOnVotersDropdownSelect, - handleOnPress, - handleSubscribeButtonPress, - isLoggedIn, - noResult, - }) => ( + {({ data, allSubscriptions, handleOnPress, handleSubscribeButtonPress, isLoggedIn }) => ( <> - - intl.formatMessage({ - id: `search_result.communities_filter.${item}`, - }), - )} - defaultText={intl.formatMessage({ - id: `search_result.communities_filter.${filterOptions[filterIndex]}`, - })} - selectedOptionIndex={filterIndex} - onDropdownSelect={(index) => handleOnVotersDropdownSelect(index, filterOptions[index])} - /> - {filterIndex !== 0 && ( - - )} - {filterIndex === 0 && allSubscriptions && allSubscriptions.length > 0 && ( - `${item}-${ind}`} - renderItem={({ item, index }) => ( - - - handleOnPress(item[0])}> - - - handleOnPress(item[0])}> - {item[1]} - - - - - handleSubscribeButtonPress({ isSubscribed: true, communityId: item[0] }) - } - /> - - - )} - ListEmptyComponent={_renderEmptyContent} - /> - )} + {/* */} )} diff --git a/src/screens/searchResult/screen/tabs/people/peopleResults.js b/src/screens/searchResult/screen/tabs/people/peopleResults.js new file mode 100644 index 000000000..03170e182 --- /dev/null +++ b/src/screens/searchResult/screen/tabs/people/peopleResults.js @@ -0,0 +1,52 @@ +import React from 'react'; +import { SafeAreaView, FlatList } from 'react-native'; +import { useIntl } from 'react-intl'; + +// Components +import { CommunitiesPlaceHolder, UserListItem } from '../../../../../components/basicUIElements'; +import PeopleResultsContainer from '../../../container/peopleResultsContainer'; + +import styles from './peopleResultsStyles'; + +const PeopleResults = ({ navigation, searchValue }) => { + const intl = useIntl(); + + const _renderEmptyContent = () => { + return ( + <> + + + + + + + + + ); + }; + + return ( + + {({ users, handleOnPress }) => ( + + {users && ( + `${item}-${ind}`} + renderItem={({ item, index }) => ( + handleOnPress(item)} + index={index} + username={item} + /> + )} + ListEmptyComponent={_renderEmptyContent} + /> + )} + + )} + + ); +}; + +export default PeopleResults; diff --git a/src/screens/searchResult/screen/tabs/people/peopleResultsStyles.js b/src/screens/searchResult/screen/tabs/people/peopleResultsStyles.js new file mode 100644 index 000000000..6fe3db675 --- /dev/null +++ b/src/screens/searchResult/screen/tabs/people/peopleResultsStyles.js @@ -0,0 +1,48 @@ +import EStyleSheet from 'react-native-extended-stylesheet'; + +export default EStyleSheet.create({ + container: { + flex: 1, + backgroundColor: '$primaryBackgroundColor', + }, + itemWrapper: { + paddingHorizontal: 16, + paddingTop: 16, + paddingBottom: 8, + borderRadius: 8, + backgroundColor: '$primaryBackgroundColor', + flexDirection: 'row', + alignItems: 'center', + }, + itemWrapperGray: { + backgroundColor: '$primaryLightBackground', + }, + username: { + marginLeft: 10, + color: '$primaryBlack', + }, + communityWrapper: { + paddingHorizontal: 16, + paddingTop: 10, + paddingBottom: 10, + borderRadius: 8, + backgroundColor: '$primaryBackgroundColor', + flexDirection: 'row', + alignItems: 'center', + flex: 1, + }, + subscribeButton: { + maxWidth: 75, + borderWidth: 1, + borderColor: '$primaryBlue', + }, + subscribeButtonText: { + textAlign: 'center', + color: '$primaryBlue', + }, + community: { + justifyContent: 'center', + marginLeft: 15, + color: '$primaryBlack', + }, +}); diff --git a/src/screens/searchResult/screen/tabs/topics/otherResults.js b/src/screens/searchResult/screen/tabs/topics/otherResults.js deleted file mode 100644 index aa3c948f0..000000000 --- a/src/screens/searchResult/screen/tabs/topics/otherResults.js +++ /dev/null @@ -1,100 +0,0 @@ -import React from 'react'; -import { SafeAreaView, FlatList, View, Text, TouchableOpacity } from 'react-native'; -import { useIntl } from 'react-intl'; - -// Components -import { FilterBar, UserAvatar } from '../../../../../components'; -import { CommunitiesPlaceHolder, UserListItem } from '../../../../../components/basicUIElements'; -import OtherResultContainer from '../../../container/otherResultContainer'; - -import styles from './otherResultsStyles'; - -const filterOptions = ['user', 'tag']; - -const OtherResult = ({ navigation, searchValue }) => { - const intl = useIntl(); - - const _renderTagItem = (item, index) => ( - - {`#${item.name}`} - - ); - - const _renderEmptyContent = () => { - return ( - <> - - - - - - - - - ); - }; - - const _renderList = (users, tags, filterIndex, handleOnPress) => { - switch (filterIndex) { - case 0: - if (users && users.length > 0) { - return ( - `${item}-${ind}`} - renderItem={({ item, index }) => ( - handleOnPress(item)} - index={index} - username={item} - /> - )} - ListEmptyComponent={_renderEmptyContent} - /> - ); - } - case 1: - if (tags && tags.length > 0) { - return ( - item.id} - renderItem={({ item, index }) => ( - handleOnPress(item)}> - {_renderTagItem(item, index)} - - )} - ListEmptyComponent={_renderEmptyContent} - /> - ); - } - default: - break; - } - }; - - return ( - - {({ users, tags, filterIndex, handleFilterChanged, handleOnPress, loadMore }) => ( - - - intl.formatMessage({ - id: `search_result.other_result_filter.${item}`, - }), - )} - defaultText={intl.formatMessage({ - id: `search_result.other_result_filter.${filterOptions[filterIndex]}`, - })} - selectedOptionIndex={filterIndex} - onDropdownSelect={(index) => handleFilterChanged(index, filterOptions[index])} - /> - {_renderList(users, tags, filterIndex, handleOnPress)} - - )} - - ); -}; - -export default OtherResult; diff --git a/src/screens/searchResult/screen/tabs/topics/topicsResults.js b/src/screens/searchResult/screen/tabs/topics/topicsResults.js new file mode 100644 index 000000000..8e5ca37e1 --- /dev/null +++ b/src/screens/searchResult/screen/tabs/topics/topicsResults.js @@ -0,0 +1,59 @@ +import React from 'react'; +import { SafeAreaView, FlatList, View, Text, TouchableOpacity } from 'react-native'; +import { useIntl } from 'react-intl'; + +// Components +import { FilterBar, UserAvatar } from '../../../../../components'; +import { CommunitiesPlaceHolder, UserListItem } from '../../../../../components/basicUIElements'; +import TopicsResultsContainer from '../../../container/topicsResultsContainer'; + +import styles from './topicsResultsStyles'; + +const filterOptions = ['user', 'tag']; + +const TopicsResults = ({ navigation, searchValue }) => { + const intl = useIntl(); + + const _renderTagItem = (item, index) => ( + + {`#${item.name}`} + + ); + + const _renderEmptyContent = () => { + return ( + <> + + + + + + + + + ); + }; + + return ( + + {({ tags, handleOnPress }) => ( + + {tags && ( + item.id} + renderItem={({ item, index }) => ( + handleOnPress(item)}> + {_renderTagItem(item, index)} + + )} + ListEmptyComponent={_renderEmptyContent} + /> + )} + + )} + + ); +}; + +export default TopicsResults; diff --git a/src/screens/searchResult/screen/tabs/topics/topicsResultsStyles.js b/src/screens/searchResult/screen/tabs/topics/topicsResultsStyles.js new file mode 100644 index 000000000..6fe3db675 --- /dev/null +++ b/src/screens/searchResult/screen/tabs/topics/topicsResultsStyles.js @@ -0,0 +1,48 @@ +import EStyleSheet from 'react-native-extended-stylesheet'; + +export default EStyleSheet.create({ + container: { + flex: 1, + backgroundColor: '$primaryBackgroundColor', + }, + itemWrapper: { + paddingHorizontal: 16, + paddingTop: 16, + paddingBottom: 8, + borderRadius: 8, + backgroundColor: '$primaryBackgroundColor', + flexDirection: 'row', + alignItems: 'center', + }, + itemWrapperGray: { + backgroundColor: '$primaryLightBackground', + }, + username: { + marginLeft: 10, + color: '$primaryBlack', + }, + communityWrapper: { + paddingHorizontal: 16, + paddingTop: 10, + paddingBottom: 10, + borderRadius: 8, + backgroundColor: '$primaryBackgroundColor', + flexDirection: 'row', + alignItems: 'center', + flex: 1, + }, + subscribeButton: { + maxWidth: 75, + borderWidth: 1, + borderColor: '$primaryBlue', + }, + subscribeButtonText: { + textAlign: 'center', + color: '$primaryBlue', + }, + community: { + justifyContent: 'center', + marginLeft: 15, + color: '$primaryBlack', + }, +}); From d481f44d8063ce6c4790b642dfcea0ffa86d2644 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 12:58:58 +0200 Subject: [PATCH 002/362] New translations en-US.json (Finnish) --- src/config/locales/fi-FI.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/locales/fi-FI.json b/src/config/locales/fi-FI.json index d5e426e03..c813ec7cc 100644 --- a/src/config/locales/fi-FI.json +++ b/src/config/locales/fi-FI.json @@ -538,7 +538,7 @@ "more_replies": "lisää vastauksia" }, "search_result": { - "others": "Others", + "others": "Muut", "best": { "title": "Parhaat" }, From 45eea04d9a7826cf2cdf377f074b25787a9c3f51 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 15:40:33 +0200 Subject: [PATCH 003/362] New translations en-US.json (Hindi) --- src/config/locales/hi-IN.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/locales/hi-IN.json b/src/config/locales/hi-IN.json index 16c6504d1..f37566d81 100644 --- a/src/config/locales/hi-IN.json +++ b/src/config/locales/hi-IN.json @@ -538,7 +538,7 @@ "more_replies": "अधिक जवाब" }, "search_result": { - "others": "Others", + "others": "अन्यों", "best": { "title": "सर्वश्रेष्ठ" }, From 5a803edb386ed60e8569c371efa1df40c201fee2 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 17:39:41 +0200 Subject: [PATCH 004/362] New translations en-US.json (Spanish) --- src/config/locales/es-ES.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/locales/es-ES.json b/src/config/locales/es-ES.json index 6c55ec435..14ac832fd 100644 --- a/src/config/locales/es-ES.json +++ b/src/config/locales/es-ES.json @@ -538,7 +538,7 @@ "more_replies": "mas comentarios" }, "search_result": { - "others": "Others", + "others": "Otros", "best": { "title": "Mejor" }, From 6515c0b5c3021f76664931bcad72cc146f29912d Mon Sep 17 00:00:00 2001 From: feruzm Date: Fri, 8 Jan 2021 11:56:53 +0200 Subject: [PATCH 005/362] version bump --- android/app/build.gradle | 2 +- ios/Ecency-tvOS/Info.plist | 4 ++-- ios/Ecency-tvOSTests/Info.plist | 4 ++-- ios/Ecency.xcodeproj/project.pbxproj | 4 ++-- ios/Ecency/Info.plist | 2 +- ios/EcencyTests/Info.plist | 4 ++-- ios/eshare/Info.plist | 4 ++-- package.json | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 68eb60f20..d4ec219d8 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -143,7 +143,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode versionMajor * 10000 + versionMinor * 100 + versionPatch - versionName "3.0.12" + versionName "3.0.13" resValue "string", "build_config_package", "app.esteem.mobile.android" multiDexEnabled true // react-native-image-crop-picker diff --git a/ios/Ecency-tvOS/Info.plist b/ios/Ecency-tvOS/Info.plist index a6007f638..61669a1c0 100644 --- a/ios/Ecency-tvOS/Info.plist +++ b/ios/Ecency-tvOS/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.0.12 + 3.0.13 CFBundleSignature ???? CFBundleVersion - 2562 + 2563 LSRequiresIPhoneOS NSAppTransportSecurity diff --git a/ios/Ecency-tvOSTests/Info.plist b/ios/Ecency-tvOSTests/Info.plist index bad06b9ae..944288e90 100644 --- a/ios/Ecency-tvOSTests/Info.plist +++ b/ios/Ecency-tvOSTests/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 3.0.12 + 3.0.13 CFBundleSignature ???? CFBundleVersion - 2562 + 2563 diff --git a/ios/Ecency.xcodeproj/project.pbxproj b/ios/Ecency.xcodeproj/project.pbxproj index b2332baad..3ce5ee0e5 100644 --- a/ios/Ecency.xcodeproj/project.pbxproj +++ b/ios/Ecency.xcodeproj/project.pbxproj @@ -1104,7 +1104,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2562; + CURRENT_PROJECT_VERSION = 2563; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = 75B6RXTKGT; HEADER_SEARCH_PATHS = ( @@ -1180,7 +1180,7 @@ CODE_SIGN_ENTITLEMENTS = Ecency/Ecency.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2562; + CURRENT_PROJECT_VERSION = 2563; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = 75B6RXTKGT; HEADER_SEARCH_PATHS = ( diff --git a/ios/Ecency/Info.plist b/ios/Ecency/Info.plist index 39dc75f1d..c55bf7b10 100644 --- a/ios/Ecency/Info.plist +++ b/ios/Ecency/Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.0.12 + 3.0.13 CFBundleSignature ???? CFBundleURLTypes diff --git a/ios/EcencyTests/Info.plist b/ios/EcencyTests/Info.plist index 68baa5f3f..a64983ad7 100644 --- a/ios/EcencyTests/Info.plist +++ b/ios/EcencyTests/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 3.0.12 + 3.0.13 CFBundleSignature ???? CFBundleVersion - 2562 + 2563 diff --git a/ios/eshare/Info.plist b/ios/eshare/Info.plist index f222e5c54..becba9595 100644 --- a/ios/eshare/Info.plist +++ b/ios/eshare/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 3.0.12 + 3.0.13 CFBundleVersion - 2562 + 2563 NSExtension NSExtensionAttributes diff --git a/package.json b/package.json index 66b5ae62d..e3cd54c91 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ecency", - "version": "3.0.12", + "version": "3.0.13", "displayName": "Ecency", "private": true, "rnpm": { From cb2100b09b8dddbd4ab1fb66a7047ff8df1775a4 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Fri, 8 Jan 2021 19:32:39 +0200 Subject: [PATCH 006/362] New translations en-US.json (Persian) --- src/config/locales/fa-IR.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json index 8306a92bf..6dfd0caea 100644 --- a/src/config/locales/fa-IR.json +++ b/src/config/locales/fa-IR.json @@ -2,11 +2,11 @@ "wallet": { "curation_reward": "پاداش مشارکت", "author_reward": "پاداش نویسنده", - "comment_benefactor_reward": "Benefactor Reward", - "claim_reward_balance": "Claim Reward ", + "comment_benefactor_reward": "پاداش حامی", + "claim_reward_balance": "دریافت پاداش", "transfer": "انتقال دادن", - "transfer_to_vesting": "To Vesting", - "transfer_from_savings": "From Savings", + "transfer_to_vesting": "واگذاری", + "transfer_from_savings": "از پس انداز", "withdraw_vesting": "کم کردن قدرت", "fill_order": "سفارش", "post": "پست", @@ -19,18 +19,18 @@ "outgoing_transfer_title": "تراکنش خروجی", "checkin_extra": "پاداش", "delegation": "اجاره", - "delegations": "Delegations", + "delegations": "اجاره", "delegation_title": "پاداش اجاره دادن", - "delegation_desc": "Earn Points everyday for delegation", + "delegation_desc": "کسب امیتاز برای اجاره", "post_title": "امتیاز برای ایجاد پست", "comment_title": "امتیاز برای نظر دادن", "vote_title": "امتیاز برای رای دادن", "reblog_title": "امتیاز برای اشتراک گذاری", "login_title": "امتیاز برای ورود به حساب کاربری", - "checkin_title": "Points for heartbeat", - "referral": "Referral", - "referral_title": "Referral rewards", - "referral_desc": "Invite friends and earn Points", + "checkin_title": "امتیاز برای تپش قلب", + "referral": "ارجاعی", + "referral_title": "پاداش ارجاع", + "referral_desc": "دوستت را دعوت کن و امیتاز بدست بیار", "checkin_extra_title": "استفاده از پاداش", "no_activity": "No recent activity", "outgoing_transfer_description": "", From c34ad8ebfaf4210e138407b0ed0fdcd34571f3c7 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Fri, 8 Jan 2021 19:39:01 +0200 Subject: [PATCH 007/362] New translations en-US.json (Persian) --- src/config/locales/fa-IR.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json index 6dfd0caea..69dfac1f9 100644 --- a/src/config/locales/fa-IR.json +++ b/src/config/locales/fa-IR.json @@ -32,13 +32,13 @@ "referral_title": "پاداش ارجاع", "referral_desc": "دوستت را دعوت کن و امیتاز بدست بیار", "checkin_extra_title": "استفاده از پاداش", - "no_activity": "No recent activity", + "no_activity": "اخیراً فعالیتی انجام نشده است", "outgoing_transfer_description": "", "incoming_transfer_description": "", - "post_desc": "You can earn point by posting regularly. Posting gives you upto 15 points.", - "comment_desc": "Each comment you make helps you to grow your audience and also earns you upto 5 points.", - "checkin_desc": "Checking in regularly gives you 0.25 points.", - "vote_desc": "By voting you give reward to other creators and also earn back upto 0.01 x vote weight points.", + "post_desc": "شما میتوانید با ایجاد پست بطور منظم، الا ۱۵ امتیاز بدست بیارید.", + "comment_desc": "هر نظری که ثبت میکنید باعث میشود مخاطبان و دوستان خود را افزایش دهید و همچنین ۵ امتیاز را به همراه دارد.", + "checkin_desc": "ورود به سیستم، بطور منظم ۰.۲۳ امیتاز بشما میدهد.", + "vote_desc": "شما با رای دادن به آثار دیگران قدردانی خود را نشان میدهید و علاوه بر آن به میزان (0.01 ×میزان رای شما ) امتیاز دریافت می کنید.", "reblog_desc": "Share what post you like with your friends and earn points.", "login_desc": "When you login into app first time you earn 100 points.", "checkin_extra_desc": "Consistent use of app gives you extra chances to earn more points, be more active and earn more.", From 90f239826cb6fdf4a755964b5a962fa32b97300d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Fri, 8 Jan 2021 19:47:12 +0200 Subject: [PATCH 008/362] New translations en-US.json (Persian) --- src/config/locales/fa-IR.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json index 69dfac1f9..c5b5109bd 100644 --- a/src/config/locales/fa-IR.json +++ b/src/config/locales/fa-IR.json @@ -39,10 +39,10 @@ "comment_desc": "هر نظری که ثبت میکنید باعث میشود مخاطبان و دوستان خود را افزایش دهید و همچنین ۵ امتیاز را به همراه دارد.", "checkin_desc": "ورود به سیستم، بطور منظم ۰.۲۳ امیتاز بشما میدهد.", "vote_desc": "شما با رای دادن به آثار دیگران قدردانی خود را نشان میدهید و علاوه بر آن به میزان (0.01 ×میزان رای شما ) امتیاز دریافت می کنید.", - "reblog_desc": "Share what post you like with your friends and earn points.", - "login_desc": "When you login into app first time you earn 100 points.", - "checkin_extra_desc": "Consistent use of app gives you extra chances to earn more points, be more active and earn more.", - "dropdown_transfer": "Gift", + "reblog_desc": "پست های مورد علاقه خود را با دوستانتان به اشتراک بگذارید و امتیاز دریافت کنید.", + "login_desc": "وقتی که برای اولین باز به برنامه وارد شوید ۱۰۰ امیتاز کسب میکنید.", + "checkin_extra_desc": "استفاده مداوم از برنامه به شما شانس کسب امتیاز بیشتر را میدهد، بیشتر فعال باشید و بیشتر امتیاز کسب کنید.", + "dropdown_transfer": "هدیه", "dropdown_promote": "Promote", "dropdown_boost": "Boost", "from": "از", From 171971f88dcd80e2e5b2552c51db3295fa89eb2d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Fri, 8 Jan 2021 19:59:47 +0200 Subject: [PATCH 009/362] New translations en-US.json (Persian) --- src/config/locales/fa-IR.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json index c5b5109bd..3c7078b1f 100644 --- a/src/config/locales/fa-IR.json +++ b/src/config/locales/fa-IR.json @@ -43,27 +43,27 @@ "login_desc": "وقتی که برای اولین باز به برنامه وارد شوید ۱۰۰ امیتاز کسب میکنید.", "checkin_extra_desc": "استفاده مداوم از برنامه به شما شانس کسب امتیاز بیشتر را میدهد، بیشتر فعال باشید و بیشتر امتیاز کسب کنید.", "dropdown_transfer": "هدیه", - "dropdown_promote": "Promote", - "dropdown_boost": "Boost", + "dropdown_promote": "تبلیغ", + "dropdown_boost": "ارتقاء", "from": "از", "to": "به", - "estimated_value_desc": "According to purchase value", - "estimated_value": "Estimated value", - "estimated_amount": "Vote value", - "amount_information": "Drag the slider to adjust the amount", + "estimated_value_desc": "با توجه به ارزش خرید", + "estimated_value": "ارزش برآورد شده", + "estimated_amount": "ارزش رای", + "amount_information": "کشیدن لغزنده برای تنظیم مقدار", "amount": "مقدار", "memo": "یادداشت", - "information": "Are you sure to transfer funds?", + "information": "آیا مطمئن هستید که وجوه را منتقل می کنید؟", "amount_desc": "موجودی", "memo_desc": "این یادداشت عمومی است", "to_placeholder": "نام کاربری", "memo_placeholder": "یادداشت های خود را در اینجا وارد کنید", "transfer_token": "انتقال دادن", - "purchase_estm": "GET POINTS", - "points": "Gift Points to someone", - "transfer_to_saving": "To Saving", + "purchase_estm": "گرفتن امتیاز", + "points": "هدیه دادن امیتازات به کسی دیگر", + "transfer_to_saving": "به پس انداز", "powerUp": "بالا بردن قدرت", - "withdraw_to_saving": "Withdraw Saving", + "withdraw_to_saving": "برداشت از پس انداز", "steemconnect_title": "Hivesigner Transfer", "next": "بعدی", "delegate": "Delegate", From 9c6da0efacaaa9d095742a897256a0ef24f03aca Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 9 Jan 2021 04:56:04 +0200 Subject: [PATCH 010/362] New translations en-US.json (Portuguese) --- src/config/locales/pt-PT.json | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/config/locales/pt-PT.json b/src/config/locales/pt-PT.json index 97394b880..bc2d18ed3 100644 --- a/src/config/locales/pt-PT.json +++ b/src/config/locales/pt-PT.json @@ -256,9 +256,9 @@ "logout": "Sair", "cancel": "Cancelar", "logout_text": "Tem certeza que deseja sair?", - "create_a_new_account": "Create a new account", - "add_an_existing_account": "Add an existing account", - "accounts": "Accounts" + "create_a_new_account": "Criar nova conta", + "add_an_existing_account": "Adicionar uma conta existente", + "accounts": "Contas" }, "header": { "title": "Login para personalizar o seu feed", @@ -295,10 +295,10 @@ "reward_decline": "Declinar Pagamento", "beneficiaries": "Beneficiários", "options": "Opções", - "my_blog": "My Blog", - "my_communities": "My Communities", - "top_communities": "Top Communities", - "schedule_modal_title": "Schedule Post" + "my_blog": "Meu Blog", + "my_communities": "Minhas Comunidades", + "top_communities": "Principais Comunidades", + "schedule_modal_title": "Agendar Post" }, "pincode": { "enter_text": "Insira PIN para desbloquear", @@ -324,15 +324,15 @@ "success_favorite": "Favorito adicionado!", "success_unfavorite": "Favorito removido!", "success_follow": "Seguido com sucesso!", - "fail_follow": "Follow failed!", - "success_subscribe": "Subscribe success!", - "fail_subscribe": "Subscribe failed!", - "success_leave": "Leave success!", - "fail_leave": "Leave failed!", + "fail_follow": "Falha ao seguir!", + "success_subscribe": "Inscrito com sucesso!", + "fail_subscribe": "Falha na assinatura!", + "success_leave": "Sair com sucesso!", + "fail_leave": "Sair falhou!", "success_mute": "Silenciado com sucesso!", "success_unmute": "Mudo desativado com sucesso!", "success_unfollow": "Deixou de seguir com sucesso!", - "fail_unfollow": "Unfollow failed!", + "fail_unfollow": "Falha a deixar de seguir!", "warning": "Aviso", "invalid_pincode": "Código PIN inválido, por favor verifique e tente novamente.", "remove_alert": "Tem a certeza de que pretende remover?", @@ -578,7 +578,7 @@ "details": "Detalhes" }, "user": { - "follow": "Follow", - "unfollow": "Unfollow" + "follow": "Seguir", + "unfollow": "Deixar de seguir" } } From 719be339be4accd1e665b7593dd388045ec39f6f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 9 Jan 2021 09:25:55 +0200 Subject: [PATCH 011/362] New translations en-US.json (Persian) --- src/config/locales/fa-IR.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json index 3c7078b1f..84fc1968b 100644 --- a/src/config/locales/fa-IR.json +++ b/src/config/locales/fa-IR.json @@ -64,12 +64,12 @@ "transfer_to_saving": "به پس انداز", "powerUp": "بالا بردن قدرت", "withdraw_to_saving": "برداشت از پس انداز", - "steemconnect_title": "Hivesigner Transfer", + "steemconnect_title": "انتقال از Hivesigner", "next": "بعدی", - "delegate": "Delegate", + "delegate": "اجاره", "power_down": "کم کردن قدرت", - "withdraw_steem": "Withdraw HIVE", - "withdraw_sbd": "Withdraw HBD", + "withdraw_steem": "برداشت HIVE", + "withdraw_sbd": "برداشتHBD", "transfer_to_savings": "To Savings", "convert": "Convert", "escrow_transfer": "Escrow Transfer", From 931d84bdc966f5d3029188751f9d055267a16f43 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 9 Jan 2021 09:36:16 +0200 Subject: [PATCH 012/362] New translations en-US.json (Persian) --- src/config/locales/fa-IR.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json index 84fc1968b..22271e031 100644 --- a/src/config/locales/fa-IR.json +++ b/src/config/locales/fa-IR.json @@ -70,16 +70,16 @@ "power_down": "کم کردن قدرت", "withdraw_steem": "برداشت HIVE", "withdraw_sbd": "برداشتHBD", - "transfer_to_savings": "To Savings", - "convert": "Convert", - "escrow_transfer": "Escrow Transfer", - "escrow_dispute": "Escrow Dispute", - "escrow_release": "Escrow Release", - "escrow_approve": "Escrow Approve", - "cancel_transfer_from_savings": "Cancel From Savings", + "transfer_to_savings": "به پس انداز", + "convert": "تبدیل", + "escrow_transfer": "انتقال اسکرو", + "escrow_dispute": "اختلاف سپرده", + "escrow_release": "رها کردن سپرده", + "escrow_approve": "تایید سپرده", + "cancel_transfer_from_savings": "لغو پس انداز", "delegate_vesting_shares": "اجاره", - "fill_convert_request": "Convert Executed", - "fill_transfer_from_savings": "Savings Executed", + "fill_convert_request": "تبدیل اجرا شد", + "fill_transfer_from_savings": "پس انداز اجرا اشد", "fill_vesting_withdraw": "PowerDown executed", "estm": { "title": "امتیازها", From 9a5cb6fbed30558e30f4d9cc615a73d56238d302 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 9 Jan 2021 09:46:24 +0200 Subject: [PATCH 013/362] New translations en-US.json (Persian) --- src/config/locales/fa-IR.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json index 22271e031..042d93eb9 100644 --- a/src/config/locales/fa-IR.json +++ b/src/config/locales/fa-IR.json @@ -80,39 +80,39 @@ "delegate_vesting_shares": "اجاره", "fill_convert_request": "تبدیل اجرا شد", "fill_transfer_from_savings": "پس انداز اجرا اشد", - "fill_vesting_withdraw": "PowerDown executed", + "fill_vesting_withdraw": "کاهش انرژی اجرا شد", "estm": { "title": "امتیازها", - "buy": "GET POINTS" + "buy": "امتیاز گرفتن" }, "savingsteem": { - "title": "HIVE Savings" + "title": "پس انداز های HIVE" }, "savingsbd": { - "title": "HBD Savings" + "title": "پس اندازهای HBD" }, "steem": { "title": "HIVE", - "buy": "GET HIVE" + "buy": "گرفتن HIVE" }, "sbd": { "title": "HBD", - "buy": "GET HBD" + "buy": "گرفتن HBD" }, "steem_power": { - "title": "HIVE POWER" + "title": "توانایی HIVE" }, "btc": { "title": "BTC", - "buy": "GET BTC", - "address": "RECEIVE" + "buy": "گرفتن BTC", + "address": "دريافت كردن" } }, "notification": { - "vote": "voted", - "unvote": "unvoted", - "reply": "replied to", - "mention": "mentioned in", + "vote": "رای داده شده", + "unvote": "رأی داده نشده", + "reply": "پاسخ داد به", + "mention": "نام برد به", "follow": "شما را دنبال میکند", "unfollow": "شما را دنبال نمیکند", "ignore": "شما را نادیده گرفته", From 55d8de3b85cd9acb59780d29d180bc4351b9547f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 9 Jan 2021 09:56:11 +0200 Subject: [PATCH 014/362] New translations en-US.json (Persian) --- src/config/locales/fa-IR.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json index 042d93eb9..da73ffa29 100644 --- a/src/config/locales/fa-IR.json +++ b/src/config/locales/fa-IR.json @@ -116,10 +116,10 @@ "follow": "شما را دنبال میکند", "unfollow": "شما را دنبال نمیکند", "ignore": "شما را نادیده گرفته", - "reblog": "reblogged", - "transfer": "transferred", - "spin": "Time to earn more Points", - "inactive": "Be active! Write a post, continue earning", + "reblog": "اشتراک شد", + "transfer": "منتقل شد", + "spin": "وقت کسب امتیاز بیشتر است", + "inactive": "فعال باشید! یک پست بنویسید، ادامه درامد دهید", "referral": "joined with your referral, welcome them", "notification": "اطلاعیه ها", "leaderboard": "جدول رده بندی", From 7febc8a1e5618fcf83954ec49d9b743765c4bb22 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 9 Jan 2021 10:06:10 +0200 Subject: [PATCH 015/362] New translations en-US.json (Persian) --- src/config/locales/fa-IR.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json index da73ffa29..078afb130 100644 --- a/src/config/locales/fa-IR.json +++ b/src/config/locales/fa-IR.json @@ -120,26 +120,26 @@ "transfer": "منتقل شد", "spin": "وقت کسب امتیاز بیشتر است", "inactive": "فعال باشید! یک پست بنویسید، ادامه درامد دهید", - "referral": "joined with your referral, welcome them", + "referral": "معرف شما پیوست، به آنها خوش آمد بگوید", "notification": "اطلاعیه ها", "leaderboard": "جدول رده بندی", "epoint": "امتیازها", - "leaderboard_title": "Top Users", + "leaderboard_title": "کاربران برتر", "recent": "اخیر", "yesterday": "دیروز", "this_week": "این هفته", "this_month": "این ماه", "older_then": "قدیمی تر از 1 ماه", - "activities": "All", + "activities": "همه", "replies": "پاسخ‌ها", - "mentions": "Mentions", - "reblogs": "Reblogs", - "noactivity": "No recent activity" + "mentions": "خطاب ها", + "reblogs": "اشترک ها", + "noactivity": "اخیراً فعالیتی انجام نشده است" }, "leaderboard": { - "daily": "DAILY", - "weekly": "WEEKLY", - "monthly": "MONTHLY" + "daily": "روزانه", + "weekly": "هفتگی", + "monthly": "ماهانه" }, "messages": { "comingsoon": "قابلیت ارسال پیام به زودی ارائه خواهد شد!" @@ -158,7 +158,7 @@ "hours": "ساعت ها", "voting_power": "قدرت رأی‌ دهی", "login_to_see": "ورود به سیستم برای دیدن", - "follow_people": "Follow some people to fill your feed", + "follow_people": "برخی افراد را دنبال کنید تا خبرنامه تان پر شود", "follow_communities": "Join some communities to fill your feed", "havent_commented": "هنوز نظری نداده", "havent_posted": "هنوز مطلبی ننوشته اید", From 45bfac8ff59999a76816b98a96a44b12b20cbf5e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 9 Jan 2021 10:15:55 +0200 Subject: [PATCH 016/362] New translations en-US.json (Persian) --- src/config/locales/fa-IR.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json index 078afb130..9431b4d7a 100644 --- a/src/config/locales/fa-IR.json +++ b/src/config/locales/fa-IR.json @@ -158,21 +158,21 @@ "hours": "ساعت ها", "voting_power": "قدرت رأی‌ دهی", "login_to_see": "ورود به سیستم برای دیدن", - "follow_people": "برخی افراد را دنبال کنید تا خبرنامه تان پر شود", - "follow_communities": "Join some communities to fill your feed", + "follow_people": "برخی افراد را دنبال کنید تا فید تان پر شود", + "follow_communities": "به برخی از کمیته ها بپیوندید تا فید شما پر شود", "havent_commented": "هنوز نظری نداده", "havent_posted": "هنوز مطلبی ننوشته اید", - "steem_power": "Hive Power", + "steem_power": "توانایی HIVE", "next_power_text": "روز باقی مانده تا کاهش قدرت،", "days": "روزها", "day": "روز", "steem_dollars": "Hive Dollars", "savings": "پس انداز", "edit": { - "display_name": "Display Name", - "about": "About", - "location": "Location", - "website": "Website" + "display_name": "نام نمایشی", + "about": "درباره", + "location": "موقیعت", + "website": "وب سایت" } }, "settings": { @@ -192,7 +192,7 @@ "transfers": "تراکنش ها" }, "pincode": "Pincode", - "reset_pin": "Reset Pin Code", + "reset_pin": "تنظیم مجدد پن کد", "reset": "راه اندازی مجدد", "nsfw_content": "NSFW", "send_feedback": "ارسال پیشنهادات و انتقادات", @@ -205,22 +205,22 @@ }, "feedback_success": "ایمیل با موفقیت باز شد", "feedback_fail": "سرویس دهنده ایمیل نمی تواند باز شود", - "server_fail": "Server not available" + "server_fail": "سرور در دسترس نیست" }, "voters": { "voters_info": "اطلاعات رأی دهندگان", - "no_user": "User is not found." + "no_user": "کاربر پیدا نشد." }, "login": { "signin": "ورود", - "signup": "JOIN NOW", - "signin_title": "To get all the benefits of using Ecency", + "signup": "حالا پیوستن", + "signin_title": "برای دریافت تمام مزایای استفاده از Ecency", "username": "نام کاربری", "password": "رمز عبور و یا WIF", - "description": "By signing in, you agree to our Terms of Services and Privacy Policies.", + "description": "با ثبت نام شما موافق قوانین و سیاست های حفظ حریم خصوصی ما خواهید بود. ", "cancel": "انصراف", "login": "ورود به سیستم", - "steemconnect_description": "If you don't want to keep your password encrypted and saved on your device, you can use Hivesigner.", + "steemconnect_description": "اگر نمی خواهید رمز عبورتان رمزنگاری و در دستگاهتان ذخیره شود، میتوانید از Hivesigner استفاده کنید.", "steemconnect_fee_description": "info" }, "register": { From e7b4c55ac64bb09c61aa874a2db6f5b76412c77b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 9 Jan 2021 10:32:11 +0200 Subject: [PATCH 017/362] New translations en-US.json (Persian) --- src/config/locales/fa-IR.json | 52 +++++++++++++++++------------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json index 9431b4d7a..495418328 100644 --- a/src/config/locales/fa-IR.json +++ b/src/config/locales/fa-IR.json @@ -221,28 +221,28 @@ "cancel": "انصراف", "login": "ورود به سیستم", "steemconnect_description": "اگر نمی خواهید رمز عبورتان رمزنگاری و در دستگاهتان ذخیره شود، میتوانید از Hivesigner استفاده کنید.", - "steemconnect_fee_description": "info" + "steemconnect_fee_description": "اطلاعات" }, "register": { - "button": "Sign Up", + "button": "ثبت نام", "title": "ثبت‌نام کنید", - "username": "Pick a username", - "mail": "Enter your email address", - "ref_user": "Referred user (Optional)", - "500_error": "Your request could not be processed, signup queue is likely full! Try again in few minutes...", - "title_description": "One account to manage everything", - "form_description": "By signing up with us, you agree to our Terms of Service and Privacy Policies." + "username": "نام کاربری را انتخاب کنید", + "mail": "آدرس ایمیل خود را وارد کنید", + "ref_user": "کاربر معدفی شده (اختیاری)", + "500_error": "درخواست شما پردازش نشد ، صف ثبت نام احتمالاً پر است! چند دقیقه دیگر دوباره امتحان کنید...", + "title_description": "یک حساب برای مدیریت همه چیز", + "form_description": "با ثبت نام کردن، شما با شرایط خدمات و قوانین خصوصی ما موافقت می کنید." }, "home": { "feed": "خبرنامه", "popular": "مورد علاقه", - "top": "Top", - "hot": "Hot", - "new": "New", - "blog": "Blog", + "top": "بالا", + "hot": "داغ", + "new": "جدید", + "blog": "وبلاگ", "posts": "Post", - "friends": "Friends", - "communities": "Communities" + "friends": "دوستان", + "communities": "انجمن ها" }, "side_menu": { "profile": "نمایه", @@ -256,9 +256,9 @@ "logout": "خروج از حساب", "cancel": "صرف نظر", "logout_text": "آیا مطمئنید که می‌خواهید خارج شوید؟", - "create_a_new_account": "Create a new account", - "add_an_existing_account": "Add an existing account", - "accounts": "Accounts" + "create_a_new_account": "ایجاد یک حساب جدید", + "add_an_existing_account": "یک حساب موجود اضافه کنید", + "accounts": "حساب ها" }, "header": { "title": "برای شخصی سازی فید های خود وارد شوید", @@ -272,14 +272,14 @@ }, "editor": { "title": "تیتر", - "tags": "Tags (separate with space)", - "default_placeholder": "Tell us something...", - "reply_placeholder": "Add your reply...", + "tags": "برچسب ها (جدا با فاصله)", + "default_placeholder": "چیزی به ما بگویید...", + "reply_placeholder": "پاسخ خود را اضافه کنید...", "publish": "نشر", "reply": "پاسخ دادن", "open_gallery": "باز کردن گالری", "capture_photo": "گرفتن عکس", - "limited_tags": "Only 10 tags allowed, remove some", + "limited_tags": "فقط ۱۰ برچسب مجاز است، برخی را بردارید", "limited_length": "Maximum length of each tag should be 24", "limited_dash": "Use one dash in each tag", "limited_space": "Use space to separate tags", @@ -362,13 +362,13 @@ "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", "something_wrong_reload": "Reload", - "can_not_be_empty": "Title and body can not be empty!" + "can_not_be_empty": "عنوان و متن نمی تواند خالی باشد!" }, "post": { - "reblog_alert": "Are you sure, you want to reblog?", - "removed_hint": "Content is not available", - "copy_link": "Copy link", - "reblogged": "reblogged by", + "reblog_alert": "آیا مطمئن هستید که می‌خواهید دوباره به اشتراک بگذارید?", + "removed_hint": "محتوا در دسترس نیست", + "copy_link": "کاپی لنک", + "reblogged": "اشتراک مجدد توسط", "sponsored": "SPONSORED", "open_thread": "Open thread", "image": "Image", From e486dcda10623fe4bf0e5e341e6ba71f221cb02b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 9 Jan 2021 10:46:12 +0200 Subject: [PATCH 018/362] New translations en-US.json (Persian) --- src/config/locales/fa-IR.json | 70 +++++++++++++++++------------------ 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json index 495418328..c3f156f46 100644 --- a/src/config/locales/fa-IR.json +++ b/src/config/locales/fa-IR.json @@ -369,15 +369,15 @@ "removed_hint": "محتوا در دسترس نیست", "copy_link": "کاپی لنک", "reblogged": "اشتراک مجدد توسط", - "sponsored": "SPONSORED", - "open_thread": "Open thread", - "image": "Image", - "link": "Link", - "gallery_mode": "Gallery mode", - "save_to_local": "Download to device", - "image_saved": "Image saved to Photo Gallery", - "image_saved_error": "Error Saving Image", - "wrong_link": "Wrong link" + "sponsored": "اسپانسر شده", + "open_thread": "بازکردن موضوع", + "image": "تصویر", + "link": "پیوند", + "gallery_mode": "حالت گالری", + "save_to_local": "بارگیری در دستگاه", + "image_saved": "تصویر در گالری عکس ذخیره شد", + "image_saved_error": "خطایی در ذخیره عکس بوجود آمد", + "wrong_link": "لنک اشتباه" }, "drafts": { "title": "پیشنویس ها", @@ -402,7 +402,7 @@ "add": "اضافه کردن به صفحات مورد علاقه" }, "report": { - "added": "Reported objectionable content" + "added": "محتوای قابل اعتراض گزارش شده است" }, "favorites": { "title": "برگزیده‌ها", @@ -415,7 +415,7 @@ "invalid_username": "نام کاربری نامعتبر، لطفا چک کنید و دوباره امتحان کنید", "already_logged": "شما در حال حاظر وارد شده اید، لطفا با یک حساب کاربری دیگر تلاش کنید", "invalid_credentials": "اعتبار نامه غیر معتبر، لطفا چک کنید و دوباره تلاش کنید", - "unknow_error": "Unknown error, please write to support@ecency.com" + "unknow_error": "خطای ناشناخته ، لطفا به ادرس support@ecency.com به تماس شوید" }, "payout": { "potential_payout": "پرداخت های بالقوه", @@ -423,9 +423,9 @@ "author_payout": "پاداش نویسنده", "curation_payout": "پاداش مشارکت", "payout_date": "پرداخت", - "beneficiaries": "Beneficiaries", - "warn_zero_payout": "Amount must reach $0.02 for payout", - "breakdown": "Breakdown" + "beneficiaries": "ذینفعان", + "warn_zero_payout": "مبلغ برای پرداخت باید به ۰. ۰۲ دلار برسد", + "breakdown": "درهم شکستن" }, "post_dropdown": { "copy": "کپی لینک", @@ -433,9 +433,9 @@ "reply": "پاسخ دادن", "share": "درمیان گذاری", "bookmarks": "اضافه کردن به صفحات مورد علاقه", - "promote": "promote", - "boost": "boost", - "report": "report" + "promote": "تبلیغ", + "boost": "ارتقاء", + "report": "گزارش" }, "deep_link": { "no_existing_user": "کاربری موجود نیست", @@ -446,39 +446,39 @@ "comments": "نظرات" }, "comment_filter": { - "trending": "TOP", - "reputation": "REPUTATION", - "votes": "VOTE", - "age": "AGE", - "top": "TOP", - "time": "TIME" + "trending": "بالا", + "reputation": "اعبتار", + "votes": "رای", + "age": "سن", + "top": "بالا", + "time": "وقت" }, "transfer": { "from": "از", "to": "به", - "amount_information": "Drag the slider to adjust the amount", + "amount_information": "برای تنظیم مقدار ، نوار لغزنده را بکشید", "amount": "مقدار", "memo": "یادداشت", - "information": "Are you sure to transfer funds?", + "information": "آیا مطمئن هستید که وجوه را منتقل می کنید?", "amount_desc": "موجودی", "memo_desc": "این یادداشت عمومی است", - "convert_desc": "Convert takes 3.5 days and NOT recommended IF HBD price is higher than $1", + "convert_desc": "تبدیل 3.5 روز طول می کشد و توصیه نمی شود اگر قیمت HBD بالاتر از 1 دلار باشد", "to_placeholder": "نام کاربری", "memo_placeholder": "یادداشت های خود را در اینجا وارد کنید", "transfer_token": "انتقال", - "purchase_estm": "Purchase Points", - "convert": "Convert HBD to HIVE", - "points": "Gift Points to someone", + "purchase_estm": "خریداری امتیاز", + "convert": "تبدیل HBD به HIVE", + "points": "به کسی امتیاز هدیه دهید", "transfer_to_saving": "انتقال به پس انداز", "powerUp": "بالا بردن قدرت", "withdraw_to_saving": "برداشت و انتقال به پس انداز", - "steemconnect_title": "Hivesigner Transfer", - "estimated_weekly": "Estimated Weekly", - "destination_accounts": "Destination Accounts", - "stop_information": "Are you sure want to stop?", - "percent": "Percent", + "steemconnect_title": "انتقال از Hivesigner", + "estimated_weekly": "برآورد هفتگی", + "destination_accounts": "حسابهای مقصد", + "stop_information": "مطمئناً می خواهید متوقف شوید؟", + "percent": "درصدی", "auto_vests": "Auto Vests", - "save": "SAVE", + "save": "ذخیره", "percent_information": "Percent info", "next": "بعدی", "delegate": "Delegate", From 18f81a445267f322ce34e76b8e778e8869ae7a4b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 9 Jan 2021 10:58:54 +0200 Subject: [PATCH 019/362] New translations en-US.json (Persian) --- src/config/locales/fa-IR.json | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json index c3f156f46..18980d8cd 100644 --- a/src/config/locales/fa-IR.json +++ b/src/config/locales/fa-IR.json @@ -4,7 +4,7 @@ "author_reward": "پاداش نویسنده", "comment_benefactor_reward": "پاداش حامی", "claim_reward_balance": "دریافت پاداش", - "transfer": "انتقال دادن", + "transfer": "انتقال", "transfer_to_vesting": "واگذاری", "transfer_from_savings": "از پس انداز", "withdraw_vesting": "کم کردن قدرت", @@ -15,11 +15,11 @@ "vote": "رأی", "reblog": "اشتراک گذاری", "login": "ورود", - "incoming_transfer_title": "تراکنش ورودی", - "outgoing_transfer_title": "تراکنش خروجی", + "incoming_transfer_title": "Incoming transfer", + "outgoing_transfer_title": "انتقال خروجی", "checkin_extra": "پاداش", "delegation": "اجاره", - "delegations": "اجاره", + "delegations": "اجاره ها", "delegation_title": "پاداش اجاره دادن", "delegation_desc": "کسب امیتاز برای اجاره", "post_title": "امتیاز برای ایجاد پست", @@ -28,10 +28,10 @@ "reblog_title": "امتیاز برای اشتراک گذاری", "login_title": "امتیاز برای ورود به حساب کاربری", "checkin_title": "امتیاز برای تپش قلب", - "referral": "ارجاعی", - "referral_title": "پاداش ارجاع", - "referral_desc": "دوستت را دعوت کن و امیتاز بدست بیار", - "checkin_extra_title": "استفاده از پاداش", + "referral": "معرف", + "referral_title": "پاداش های معرفی", + "referral_desc": "دوست ها را دعوت کنید و امیتاز کسب کنید", + "checkin_extra_title": "پاداش استفاده", "no_activity": "اخیراً فعالیتی انجام نشده است", "outgoing_transfer_description": "", "incoming_transfer_description": "", @@ -479,18 +479,18 @@ "percent": "درصدی", "auto_vests": "Auto Vests", "save": "ذخیره", - "percent_information": "Percent info", + "percent_information": "اطلاعات درصد", "next": "بعدی", - "delegate": "Delegate", - "power_down": "Power Down", - "withdraw_steem": "Withdraw HIVE", - "withdraw_sbd": "Withdraw HIVE Dollar", - "incoming_funds": "Incoming Funds", - "stop": "Stop", - "address_view": "View address" + "delegate": "اجاره", + "power_down": "کم کردن قدرت", + "withdraw_steem": "برداشت HIVE", + "withdraw_sbd": "برداشت دلار HIVE", + "incoming_funds": "وجوه دریافتی", + "stop": "توقف", + "address_view": "مشاهده آدرس" }, "boost": { - "title": "Get Points", + "title": "گرفتن امتیاز", "buy": "GET Points", "next": "NEXT", "account": { From 73cc88646e92ffd3d6cb1f6b9454362ded464898 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 9 Jan 2021 11:06:39 +0200 Subject: [PATCH 020/362] New translations en-US.json (Persian) --- src/config/locales/fa-IR.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json index 18980d8cd..278cfb1c4 100644 --- a/src/config/locales/fa-IR.json +++ b/src/config/locales/fa-IR.json @@ -280,13 +280,13 @@ "open_gallery": "باز کردن گالری", "capture_photo": "گرفتن عکس", "limited_tags": "فقط ۱۰ برچسب مجاز است، برخی را بردارید", - "limited_length": "Maximum length of each tag should be 24", - "limited_dash": "Use one dash in each tag", - "limited_space": "Use space to separate tags", - "limited_lowercase": "Only use lower letters in tag", - "limited_characters": "Use only lowercase letters, digits and one dash", - "limited_firstchar": "Tag must start with a letter", - "limited_lastchar": "Tag must end with letter or number", + "limited_length": "حداکثر طول هر برچسب باید ۲۴ باشد", + "limited_dash": "در هر برچسب از یک خط تیره استفاده کنید", + "limited_space": "برای جدا کردن برچسب ها از فاصله استفاده کنید", + "limited_lowercase": "فقط از حروف کوچک در برچسب استفاده کنید", + "limited_characters": "فقط از حروف کوچک ، رقم و یک خط تیره استفاده کنید", + "limited_firstchar": "برچسب باید با یک حرف شروع شود", + "limited_lastchar": "برچسب باید با یک حرف یا عدد پایان یابد", "setting_schedule": "Scheduling Time", "setting_reward": "Reward", "setting_beneficiary": "Beneficiary", From 8f0eb6daa9c8c067287e372760151d7933aba642 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 9 Jan 2021 11:16:50 +0200 Subject: [PATCH 021/362] New translations en-US.json (Persian) --- src/config/locales/fa-IR.json | 46 +++++++++++++++++------------------ 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json index 278cfb1c4..c8df06cca 100644 --- a/src/config/locales/fa-IR.json +++ b/src/config/locales/fa-IR.json @@ -287,18 +287,18 @@ "limited_characters": "فقط از حروف کوچک ، رقم و یک خط تیره استفاده کنید", "limited_firstchar": "برچسب باید با یک حرف شروع شود", "limited_lastchar": "برچسب باید با یک حرف یا عدد پایان یابد", - "setting_schedule": "Scheduling Time", - "setting_reward": "Reward", - "setting_beneficiary": "Beneficiary", - "reward_default": "Default 50% / 50%", - "reward_power_up": "Power Up 100%", - "reward_decline": "Decline Payout", - "beneficiaries": "Beneficiaries", - "options": "Options", - "my_blog": "My Blog", - "my_communities": "My Communities", - "top_communities": "Top Communities", - "schedule_modal_title": "Schedule Post" + "setting_schedule": "زمان برنامه‌ریزی", + "setting_reward": "پاداش", + "setting_beneficiary": "ذینفعان", + "reward_default": "پیش‌فرض ۵۰٪ / ۵۰٪", + "reward_power_up": "۱۰۰٪ بالا بردن قدرت", + "reward_decline": "امتناع از پرداخت", + "beneficiaries": "ذینفعان", + "options": "گزینه‌ها", + "my_blog": "وبلاگ من", + "my_communities": "انجمن ها", + "top_communities": "جوامع برتر", + "schedule_modal_title": "برنامه ریزی پست" }, "pincode": { "enter_text": "Enter pin to unlock", @@ -314,21 +314,21 @@ "fail": "ناموفق!", "move": "انتقال", "move_question": "آیا مطمئن هستید که می خواهید به پیشنویس ها منتقل کنید؟", - "success_shared": "Success! Content submitted!", + "success_shared": "موفق باشید! محتوا ارسال شد!", "success_moved": "به پیشنویس ها منتقل شد", "permission_denied": "خطای دسترسی", - "permission_text": "Please, go to phone Settings and change Ecency app permissions.", - "key_warning": "Operation requires active key or master password, please relogin!", + "permission_text": "لطفا به تنظیمات تلفن خود رفته و دسترسی Ecency را تغییر دهید.", + "key_warning": "این عملیات به کلید فعال یا گذرواژه اصلی نیاز دارد ، لطفاً دوباره وارد سیستم شوید!", "success_rebloged": "Rebloged!", "already_rebloged": "شما قبلا به اشتراک گذاشته اید!", - "success_favorite": "Favorite added!", - "success_unfavorite": "Favorite removed!", - "success_follow": "Follow success!", - "fail_follow": "Follow failed!", - "success_subscribe": "Subscribe success!", - "fail_subscribe": "Subscribe failed!", - "success_leave": "Leave success!", - "fail_leave": "Leave failed!", + "success_favorite": "مورد دلخواه اضافه شد", + "success_unfavorite": "مورد دلخواه پاک شد!", + "success_follow": "دنبال، موفق شد!", + "fail_follow": "دنبال، ناکام شد!", + "success_subscribe": "اشتراک، موفق شد!", + "fail_subscribe": "اشتراک، ناکام شد!", + "success_leave": "ترک، موفق شد!", + "fail_leave": "ترک، ناکام شد!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", From 117ae36ac25a97d60adf190757bcf102e4c74a09 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 9 Jan 2021 11:27:09 +0200 Subject: [PATCH 022/362] New translations en-US.json (Persian) --- src/config/locales/fa-IR.json | 38 +++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json index c8df06cca..4c24fb858 100644 --- a/src/config/locales/fa-IR.json +++ b/src/config/locales/fa-IR.json @@ -329,10 +329,10 @@ "fail_subscribe": "اشتراک، ناکام شد!", "success_leave": "ترک، موفق شد!", "fail_leave": "ترک، ناکام شد!", - "success_mute": "Mute success!", + "success_mute": "بی صدا، موفق شد!", "success_unmute": "Unmute success!", - "success_unfollow": "Unfollow success!", - "fail_unfollow": "Unfollow failed!", + "success_unfollow": "دنبال کردن لغو شد!", + "fail_unfollow": "لغو دنبال، ناکام شد!", "warning": "اخطار", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -346,22 +346,22 @@ "confirm": "تأیید", "removed": "حذف شد", "same_user": "این کاربر قبلا به لیست اضافه شده است", - "unknow_error": "An error occurred", - "error": "Error", - "fetch_error": "Connection issue, change server and restart", - "connection_fail": "Connection Failed!", - "connection_success": "Successfully connected!", - "checking": "Checking...", - "external_link": "Open in Browser", - "not_existing_post": "The post does not exist! Please check permlink and author.", - "google_play_version": "We noticed that your device has old version of Google Play. Please update Google Play services and try again!", - "rc_down": "Not enough resource credits to perform an action! \n\nBoost your account to continue enjoy the experience. Do you want to boost your account, now?", - "payloadTooLarge": "File size too big, please resize or upload smaller image", - "qoutaExceeded": "Upload quota exceeded", - "invalidImage": "Invalid image, try different file", - "something_wrong": "Something went wrong.", - "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload", + "unknow_error": "يک خطا رخ داده است", + "error": "خطا", + "fetch_error": "مشکل اتصال ، تغییر سرور و راه اندازی مجدد", + "connection_fail": "اتصال انجام نشد!", + "connection_success": "اتصال با موفقیت انجام شد!", + "checking": "در حال بررسی...", + "external_link": "باز کردن در مرورگر", + "not_existing_post": "پست موجود نیست! لطفاً لینک ثابت و نویسنده را بررسی کنید.", + "google_play_version": "متوجه شدیم که دستگاه شما دارای نسخه قدیمی Google Play است. لطفاً خدمات Google Play را به روز کنید و دوباره امتحان کنید!", + "rc_down": "اعتبار منابع کافی برای انجام عملی نیست!\n\nبرای لذت بردن از تجربه ، حساب خود را تقویت کنید. آیا می خواهید حساب خود را تقویت کنید?", + "payloadTooLarge": "اندازه فایل خیلی بزرگ است ، لطفاً اندازه کوچکتر را تغییر دهید یا تصویر کوچکتر را بارگذاری کنید", + "qoutaExceeded": "از سهمیه بارگذاری بیشتر شد", + "invalidImage": "تصویر نامعتبر است ، فایل دیگری را امتحان کنید", + "something_wrong": "مشکلی پیش آمد.", + "something_wrong_alt": "Https://ecency.com را امتحان کنید", + "something_wrong_reload": "ﻧﻮﺳﺎﺯﯼ", "can_not_be_empty": "عنوان و متن نمی تواند خالی باشد!" }, "post": { From dfb68e683da71c050425f258c09b9eecfafb458d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 9 Jan 2021 11:35:34 +0200 Subject: [PATCH 023/362] New translations en-US.json (Persian) --- src/config/locales/fa-IR.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json index 4c24fb858..e373ae503 100644 --- a/src/config/locales/fa-IR.json +++ b/src/config/locales/fa-IR.json @@ -491,26 +491,26 @@ }, "boost": { "title": "گرفتن امتیاز", - "buy": "GET Points", - "next": "NEXT", + "buy": "گرفتن امتیاز", + "next": "بعدی", "account": { - "title": "Get Account Boost", - "desc": "30 days delegation will boost your votes and social activities and give you more actions with more Resource Credits." + "title": "حساب را تقویت دهید", + "desc": "تفویض 30 روزه آرا و فعالیتهای اجتماعی شما را افزایش داده و اقدامات بیشتری را با اعتبارات بیشتر به شما می دهد." } }, "free_estm": { - "title": "Free Points", - "button": "SPIN & WIN", - "get_spin": "5 SPINS", - "spin_right": "Spin Left", - "timer_text": "Next free spin in" + "title": "گرفتن امتیاز", + "button": "چرخش و برنده شدن", + "get_spin": "5 چرخش", + "spin_right": "چرخش باقی", + "timer_text": "چرخش رایگان بعدی در" }, "promote": { - "title": "Promote", - "days": "days", - "user": "User", - "permlink": "Post", - "permlinkPlaceholder": "username/permlink", + "title": "تبلیغ", + "days": "روزها", + "user": "کاربر", + "permlink": "پست", + "permlinkPlaceholder": "نام کاربری/لینک ثابت", "information": "Are you sure to promote?" }, "boostPost": { From 32b7dedf5e24b873744b790e96516c17f9234e63 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 9 Jan 2021 11:45:56 +0200 Subject: [PATCH 024/362] New translations en-US.json (Persian) --- src/config/locales/fa-IR.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json index e373ae503..17fed81ec 100644 --- a/src/config/locales/fa-IR.json +++ b/src/config/locales/fa-IR.json @@ -511,15 +511,15 @@ "user": "کاربر", "permlink": "پست", "permlinkPlaceholder": "نام کاربری/لینک ثابت", - "information": "Are you sure to promote?" + "information": "آیا مطمئناً تبلیغ می کنید" }, "boostPost": { - "title": "Boost" + "title": "ارتقاء" }, "voters_dropdown": { - "rewards": "REWARDS", - "percent": "PERCENT", - "time": "TIME" + "rewards": "امتیازات", + "percent": "درصد", + "time": "وقت" }, "reblog": { "title": "Reblog Info" From cca59a42ebb0f5b609cf3775762e8ad2380514f0 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 9 Jan 2021 12:45:37 +0200 Subject: [PATCH 025/362] New translations en-US.json (Persian) --- src/config/locales/fa-IR.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json index 17fed81ec..55699a4f3 100644 --- a/src/config/locales/fa-IR.json +++ b/src/config/locales/fa-IR.json @@ -522,13 +522,13 @@ "time": "وقت" }, "reblog": { - "title": "Reblog Info" + "title": "اطلاعات reblog" }, "dsteem": { "date_error": { - "device_time": "Your device time;", - "current_time": "Current time;", - "information": "We noticed that your device has incorrect date or time. Please fix Date & Time or Set Automatically and try again." + "device_time": "زمان دستگاه شما;", + "current_time": "زمان کنونی;", + "information": "متوجه شدیم که دستگاه شما تاریخ یا ساعت نادرستی دارد. لطفاً تاریخ و زمان را برطرف کنید یا به صورت خودکار تنظیم کنید و دوباره امتحان کنید." } }, "comments": { From 74a9971996fafd69e734087a5f926c735e5e90aa Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 9 Jan 2021 12:56:09 +0200 Subject: [PATCH 026/362] New translations en-US.json (Persian) --- src/config/locales/fa-IR.json | 52 +++++++++++++++++------------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json index 55699a4f3..abec37ff4 100644 --- a/src/config/locales/fa-IR.json +++ b/src/config/locales/fa-IR.json @@ -533,52 +533,52 @@ }, "comments": { "title": "نظرات", - "reveal_comment": "Reveal comment", - "read_more": "Read more comments", - "more_replies": "more replies" + "reveal_comment": "نشان دادن نظریه", + "read_more": "نظرات بیشتر را بخوانید", + "more_replies": "پاسخ های بیشتر" }, "search_result": { - "others": "Others", + "others": "دیگر", "best": { - "title": "Best" + "title": "بهترین" }, "people": { - "title": "People" + "title": "مردم" }, "topics": { - "title": "Topics" + "title": "موضوعات" }, "communities": { - "title": "Communities", - "subscribe": "Join", - "unsubscribe": "Leave", - "subscribers": "Members", - "posters": "Posters", + "title": "انجمن ها", + "subscribe": "\"پیوستن\"", + "unsubscribe": "ترک کردن", + "subscribers": "اعضاء", + "posters": "پوسترها", "posts": "Post" }, "communities_filter": { - "my": "My Communities", - "rank": "Rank", - "subs": "Members", - "new": "New" + "my": "انجمن(های) من", + "rank": "رتبه", + "subs": "اعضاء", + "new": "جدید" }, "post_result_filter": { - "popularity": "Popularity", - "newest": "Newest", - "relevance": "Relevance" + "popularity": "محبوبیت", + "newest": "جدیدترین", + "relevance": "ارتباط" }, "other_result_filter": { - "user": "User", - "tag": "Tag" + "user": "کاربر", + "tag": "برچسب" } }, "community": { - "new_post": "New Post", - "community": "community", - "details": "Details" + "new_post": "پست جدید", + "community": "انجمن", + "details": "جزئیات" }, "user": { - "follow": "Follow", - "unfollow": "Unfollow" + "follow": "دنبال کردن", + "unfollow": "عدم دنبال کردن" } } From e8136019d46b34b8867d566d78409042c7ec51f0 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 11 Jan 2021 11:59:15 +0200 Subject: [PATCH 027/362] New translations en-US.json (Ukrainian) --- src/config/locales/uk-UA.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/config/locales/uk-UA.json b/src/config/locales/uk-UA.json index 1723a77fc..a24984eac 100644 --- a/src/config/locales/uk-UA.json +++ b/src/config/locales/uk-UA.json @@ -217,7 +217,7 @@ "signin_title": "Щоб отримати всі переваги від користування Ecency", "username": "Ім'я користувача", "password": "Пароль або WIF (приватний ключ)", - "description": "By signing in, you agree to our Terms of Services and Privacy Policies.", + "description": "Реєструючись, ви погоджуєтеся з Умовами надання послуг та Політикою конфіденційності.", "cancel": "скасувати", "login": "ЛОГІН", "steemconnect_description": "Якщо ви не бажаєте тримати пароль у зашифрованому вигляді на вашому пристрої, можете використовувати Hivesigner.", @@ -231,7 +231,7 @@ "ref_user": "Реферальний користувач (необов'язково)", "500_error": "Не вдалося обробити ваш запит, скоріш за все, черга реєстрації переповнена! Спробуйте ще раз через кілька хвилин...", "title_description": "Один рахунок для управління всім", - "form_description": "By signing up with us, you agree to our Terms of Service and Privacy Policies." + "form_description": "Реєструючись, ви погоджуєтеся з Умовами надання послуг та Політикою конфіденційності." }, "home": { "feed": "Стрічка", @@ -241,8 +241,8 @@ "new": "Нове", "blog": "Блог", "posts": "Дописи", - "friends": "Friends", - "communities": "Communities" + "friends": "Друзі", + "communities": "Спільноти" }, "side_menu": { "profile": "Профіль", @@ -293,11 +293,11 @@ "reward_default": "Default 50% / 50%", "reward_power_up": "Power Up 100%", "reward_decline": "Decline Payout", - "beneficiaries": "Beneficiaries", + "beneficiaries": "Бенефіціари (отримувачі)", "options": "Options", - "my_blog": "My Blog", - "my_communities": "My Communities", - "top_communities": "Top Communities", + "my_blog": "Мій блог", + "my_communities": "Мої спільноти", + "top_communities": "Найкращі спільноти", "schedule_modal_title": "Schedule Post" }, "pincode": { @@ -348,7 +348,7 @@ "same_user": "Цього користувача уже додано до списку", "unknow_error": "Виникла помилка", "error": "Помилка", - "fetch_error": "Connection issue, change server and restart", + "fetch_error": "Проблеми із підключенням, змініть сервер і перезапустіть", "connection_fail": "Помилка з’єднання!", "connection_success": "Успішне підключення!", "checking": "Перевірка...", @@ -550,7 +550,7 @@ }, "communities": { "title": "Спільноти", - "subscribe": "Join", + "subscribe": "Приєднатися", "unsubscribe": "Leave", "subscribers": "Members", "posters": "Автори", @@ -578,7 +578,7 @@ "details": "Details" }, "user": { - "follow": "Follow", - "unfollow": "Unfollow" + "follow": "Слідкувати", + "unfollow": "Не слідкувати" } } From 99de533b223bce37fe5d3c9552bb35fe02162ee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Wed, 13 Jan 2021 20:23:16 +0300 Subject: [PATCH 028/362] add tabs to commmunities screen --- ios/Ecency.xcodeproj/project.pbxproj | 20 +-- src/config/locales/en-US.json | 5 + src/constants/routeNames.js | 1 + src/constants/sideMenuItems.js | 6 + src/navigation/routes.js | 2 + src/screens/communities/communities.js | 226 ++++++++++++++++++------- src/screens/communities/index.js | 3 + src/screens/index.js | 2 + 8 files changed, 196 insertions(+), 69 deletions(-) create mode 100644 src/screens/communities/index.js diff --git a/ios/Ecency.xcodeproj/project.pbxproj b/ios/Ecency.xcodeproj/project.pbxproj index b2332baad..d1ccb6380 100644 --- a/ios/Ecency.xcodeproj/project.pbxproj +++ b/ios/Ecency.xcodeproj/project.pbxproj @@ -527,9 +527,9 @@ ProvisioningStyle = Manual; }; 05B6C48C24C306CE00B7FA60 = { - DevelopmentTeam = 75B6RXTKGT; + DevelopmentTeam = RBP7PE82SN; LastSwiftMigration = 1160; - ProvisioningStyle = Manual; + ProvisioningStyle = Automatic; }; 2D02E47A1E0B4A5D006451C7 = { CreatedOnToolsVersion = 8.2.1; @@ -1101,12 +1101,12 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Ecency/EcencyDebug.entitlements; - CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 2562; DEAD_CODE_STRIPPING = NO; - DEVELOPMENT_TEAM = 75B6RXTKGT; + DEVELOPMENT_TEAM = RBP7PE82SN; HEADER_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)/../../../../ios/Pods/Headers/Public/**", @@ -1161,7 +1161,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = app.esteem.mobile.ios; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ios_dev_app; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "Ecency-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -1178,11 +1178,11 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Ecency/Ecency.entitlements; - CODE_SIGN_IDENTITY = "iPhone Distribution"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 2562; DEAD_CODE_STRIPPING = NO; - DEVELOPMENT_TEAM = 75B6RXTKGT; + DEVELOPMENT_TEAM = RBP7PE82SN; HEADER_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)/../../../../ios/Pods/Headers/Public/**", @@ -1237,7 +1237,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = app.esteem.mobile.ios; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ios_dist_app; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "Ecency-Bridging-Header.h"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json index a101ec578..e494cf4a5 100644 --- a/src/config/locales/en-US.json +++ b/src/config/locales/en-US.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -579,5 +580,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Joined", + "discover": "Discover" } } diff --git a/src/constants/routeNames.js b/src/constants/routeNames.js index 8089bdf38..3225fad91 100644 --- a/src/constants/routeNames.js +++ b/src/constants/routeNames.js @@ -29,6 +29,7 @@ export default { COMMENTS: `Comments${SCREEN_SUFFIX}`, ACCOUNT_BOOST: `AccountBoost${SCREEN_SUFFIX}`, COMMUNITY: `Community${SCREEN_SUFFIX}`, + COMMUNITIES: `Communities${SCREEN_SUFFIX}`, }, DRAWER: { MAIN: `Main${DRAWER_SUFFIX}`, diff --git a/src/constants/sideMenuItems.js b/src/constants/sideMenuItems.js index 929dc8acb..29cd51825 100644 --- a/src/constants/sideMenuItems.js +++ b/src/constants/sideMenuItems.js @@ -25,6 +25,12 @@ const authMenuItems = [ // icon: 'photo-library', // id: 'gallery', // }, + { + name: 'Communities', + route: ROUTES.SCREENS.COMMUNITIES, + icon: 'settings', + id: 'communities', + }, { name: 'Settings', route: ROUTES.SCREENS.SETTINGS, diff --git a/src/navigation/routes.js b/src/navigation/routes.js index 01fc7ce9f..a789eb0f7 100644 --- a/src/navigation/routes.js +++ b/src/navigation/routes.js @@ -37,6 +37,7 @@ import { AccountBoost, TagResult, Community, + Communities, } from '../screens'; const bottomTabNavigator = createBottomTabNavigator( @@ -148,6 +149,7 @@ const stackNavigator = createStackNavigator( [ROUTES.SCREENS.SPIN_GAME]: { screen: SpinGame }, [ROUTES.SCREENS.ACCOUNT_BOOST]: { screen: AccountBoost }, [ROUTES.SCREENS.COMMUNITY]: { screen: Community }, + [ROUTES.SCREENS.COMMUNITIES]: { screen: Communities }, }, { headerMode: 'none', diff --git a/src/screens/communities/communities.js b/src/screens/communities/communities.js index ae4881c0e..1d19a9245 100644 --- a/src/screens/communities/communities.js +++ b/src/screens/communities/communities.js @@ -2,17 +2,21 @@ import React from 'react'; import { useIntl } from 'react-intl'; import { FlatList, View, Text, TouchableOpacity } from 'react-native'; import get from 'lodash/get'; +import { SafeAreaView } from 'react-navigation'; +import ScrollableTabView from 'react-native-scrollable-tab-view'; // Components -import { FilterBar, UserAvatar } from '../../components'; +import { FilterBar, UserAvatar, TabBar, BasicHeader } from '../../components'; import CommunitiesList from './communitiesList'; import { CommunitiesPlaceHolder } from '../../components/basicUIElements'; import { CommunitiesContainer } from '../../containers'; -import styles from './communitiesStyles'; import DEFAULT_IMAGE from '../../assets/no_image.png'; import Tag from '../../components/basicUIElements/view/tag/tagView'; +import styles from './communitiesStyles'; +import globalStyles from '../../globalStyles'; + const filterOptions = ['my', 'rank', 'subs', 'new']; const CommunitiesScreen = ({ navigation, searchValue }) => { @@ -30,6 +34,16 @@ const CommunitiesScreen = ({ navigation, searchValue }) => { ); }; + const _renderTabbar = () => ( + + ); + return ( {({ @@ -42,67 +56,161 @@ const CommunitiesScreen = ({ navigation, searchValue }) => { isLoggedIn, noResult, }) => ( - <> - - intl.formatMessage({ - id: `search_result.communities_filter.${item}`, - }), - )} - defaultText={intl.formatMessage({ - id: `search_result.communities_filter.${filterOptions[filterIndex]}`, - })} - selectedOptionIndex={filterIndex} - onDropdownSelect={(index) => handleOnVotersDropdownSelect(index, filterOptions[index])} - /> - {filterIndex !== 0 && ( - + + - )} - {filterIndex === 0 && allSubscriptions && allSubscriptions.length > 0 && ( - `${item}-${ind}`} - renderItem={({ item, index }) => ( - - - handleOnPress(item[0])}> - - - handleOnPress(item[0])}> - {item[1]} - - - - - handleSubscribeButtonPress({ isSubscribed: true, communityId: item[0] }) - } - /> - - - )} - ListEmptyComponent={_renderEmptyContent} - /> - )} - + + + `${item}-${ind}`} + renderItem={({ item, index }) => ( + + + handleOnPress(item[0])}> + + + handleOnPress(item[0])}> + {item[1]} + + + + + handleSubscribeButtonPress({ isSubscribed: true, communityId: item[0] }) + } + /> + + + )} + ListEmptyComponent={_renderEmptyContent} + /> + + + `${item}-${ind}`} + renderItem={({ item, index }) => ( + + + handleOnPress(item[0])}> + + + handleOnPress(item[0])}> + {item[1]} + + + + + handleSubscribeButtonPress({ isSubscribed: true, communityId: item[0] }) + } + /> + + + )} + ListEmptyComponent={_renderEmptyContent} + /> + + + + )} ); }; export default CommunitiesScreen; + +{ + /* <> + + intl.formatMessage({ + id: `search_result.communities_filter.${item}`, + }), + )} + defaultText={intl.formatMessage({ + id: `search_result.communities_filter.${filterOptions[filterIndex]}`, + })} + selectedOptionIndex={filterIndex} + onDropdownSelect={(index) => handleOnVotersDropdownSelect(index, filterOptions[index])} +/> +{filterIndex !== 0 && ( + +)} +{filterIndex === 0 && allSubscriptions && allSubscriptions.length > 0 && ( + `${item}-${ind}`} + renderItem={({ item, index }) => ( + + + handleOnPress(item[0])}> + + + handleOnPress(item[0])}> + {item[1]} + + + + + handleSubscribeButtonPress({ isSubscribed: true, communityId: item[0] }) + } + /> + + + )} + ListEmptyComponent={_renderEmptyContent} + /> +)} + */ +} diff --git a/src/screens/communities/index.js b/src/screens/communities/index.js new file mode 100644 index 000000000..4e9a173c3 --- /dev/null +++ b/src/screens/communities/index.js @@ -0,0 +1,3 @@ +import Communities from './communities'; + +export default Communities; diff --git a/src/screens/index.js b/src/screens/index.js index 577231806..2d37b40f8 100755 --- a/src/screens/index.js +++ b/src/screens/index.js @@ -24,6 +24,7 @@ import AccountBoost from './accountBoost/screen/accountBoostScreen'; import Register from './register/registerScreen'; import TagResult from './tagResult'; import { Community } from './community'; +import Communities from './communities'; export { Bookmarks, @@ -52,4 +53,5 @@ export { Wallet, TagResult, Community, + Communities, }; From 777929cc2f5f21dec3dc0df180674dcb95861af9 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 13 Jan 2021 22:45:47 +0200 Subject: [PATCH 029/362] New translations en-US.json (Russian) --- src/config/locales/ru-RU.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/config/locales/ru-RU.json b/src/config/locales/ru-RU.json index 8b8d03f14..9d1b106dc 100644 --- a/src/config/locales/ru-RU.json +++ b/src/config/locales/ru-RU.json @@ -159,7 +159,7 @@ "voting_power": "Сила голоса", "login_to_see": "Войдите, чтобы увидеть", "follow_people": "Подпишитесь на нескольких людей, чтобы заполнить ленту", - "follow_communities": "Join some communities to fill your feed", + "follow_communities": "Присоединяйтесь к сообществам, чтобы заполнить ленту новостей", "havent_commented": "ещё ничего не комментировал", "havent_posted": "ещё ничего не написал", "steem_power": "Hive Power (Сила)", @@ -231,7 +231,7 @@ "ref_user": "Реферал (необязательно)", "500_error": "Ваш запрос не удалось обработать, скорее всего, очередь регистрации заполнена! Повторите попытку через несколько минут...", "title_description": "Один аккаунт для управления всем", - "form_description": "By signing up with us, you agree to our Terms of Service and Privacy Policies." + "form_description": "Регистрируясь, вы соглашаетесь с Условиями использования и Политикой конфиденциальности." }, "home": { "feed": "Лента", @@ -241,8 +241,8 @@ "new": "Новое", "blog": "Блог", "posts": "Посты", - "friends": "Friends", - "communities": "Communities" + "friends": "Друзья", + "communities": "Сообщества" }, "side_menu": { "profile": "Профиль", @@ -256,9 +256,9 @@ "logout": "Выйти", "cancel": "Отмена", "logout_text": "Вы уверены, что хотите разлогина?", - "create_a_new_account": "Create a new account", - "add_an_existing_account": "Add an existing account", - "accounts": "Accounts" + "create_a_new_account": "Создать новый аккаунт", + "add_an_existing_account": "Добавить существующий аккаунт", + "accounts": "Аккаунты" }, "header": { "title": "Войдите, чтобы настроить свою ленту", @@ -289,15 +289,15 @@ "limited_lastchar": "Тег должен заканчиваться буквой или цифрой", "setting_schedule": "Scheduling Time", "setting_reward": "Вознаграждение", - "setting_beneficiary": "Beneficiary", + "setting_beneficiary": "Бенефициар", "reward_default": "По умолчанию 50% / 50%", "reward_power_up": "100% в Силу", "reward_decline": "Отказ от выплат", "beneficiaries": "Бенефициары", "options": "Options", - "my_blog": "My Blog", - "my_communities": "My Communities", - "top_communities": "Top Communities", + "my_blog": "Мой блог", + "my_communities": "Мои сообщества", + "top_communities": "Топовые сообщества", "schedule_modal_title": "Schedule Post" }, "pincode": { From 52069355c93c28228eb66cdba94ddee44169b102 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 13 Jan 2021 22:55:56 +0200 Subject: [PATCH 030/362] New translations en-US.json (Russian) --- src/config/locales/ru-RU.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/config/locales/ru-RU.json b/src/config/locales/ru-RU.json index 9d1b106dc..cc592e134 100644 --- a/src/config/locales/ru-RU.json +++ b/src/config/locales/ru-RU.json @@ -298,7 +298,7 @@ "my_blog": "Мой блог", "my_communities": "Мои сообщества", "top_communities": "Топовые сообщества", - "schedule_modal_title": "Schedule Post" + "schedule_modal_title": "Отложить пост" }, "pincode": { "enter_text": "Чтобы разблокировать введите пин-код", @@ -324,15 +324,15 @@ "success_favorite": "Добавлено в Избранное!", "success_unfavorite": "Удалено из Избранного!", "success_follow": "Успешная подписка!", - "fail_follow": "Follow failed!", - "success_subscribe": "Subscribe success!", - "fail_subscribe": "Subscribe failed!", - "success_leave": "Leave success!", - "fail_leave": "Leave failed!", + "fail_follow": "Не удалось подписаться!", + "success_subscribe": "Успешная подписка!", + "fail_subscribe": "Подписаться не удалось!", + "success_leave": "Успешный выход!", + "fail_leave": "Не удалось выйти!", "success_mute": "Успешно игнорируется!", "success_unmute": "Успешно перестали игнорировать!", "success_unfollow": "Успешная отписка!", - "fail_unfollow": "Unfollow failed!", + "fail_unfollow": "Не удалось отписаться!", "warning": "Внимание", "invalid_pincode": "Неверный пин-код. Пожалуйста, проверьте и попробуйте еще раз.", "remove_alert": "Вы уверены, что хотите удалить?", @@ -348,7 +348,7 @@ "same_user": "Этот пользователь уже добавлен в список", "unknow_error": "Произошла ошибка", "error": "Ошибка", - "fetch_error": "Connection issue, change server and restart", + "fetch_error": "Проблема с соединением, смените сервер и перезапустите", "connection_fail": "Ошибка подключения!", "connection_success": "Успешное подключение!", "checking": "Проверка...", @@ -359,9 +359,9 @@ "payloadTooLarge": "Размер файла слишком большой. Ппожалуйста, измените размер или загрузите изображение меньшего размера", "qoutaExceeded": "Превышен лимит загрузки", "invalidImage": "Изображение не подходит, попробуйте другой файл", - "something_wrong": "Something went wrong.", - "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload", + "something_wrong": "Что-то пошло не так.", + "something_wrong_alt": "Попробуйте https://ecency.com", + "something_wrong_reload": "Перезагрузить", "can_not_be_empty": "Title and body can not be empty!" }, "post": { From 0b59b92a30c786a267a62c77ac48f4d0dcd545de Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 13 Jan 2021 23:07:32 +0200 Subject: [PATCH 031/362] New translations en-US.json (Russian) --- src/config/locales/ru-RU.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/config/locales/ru-RU.json b/src/config/locales/ru-RU.json index cc592e134..d3bebe56b 100644 --- a/src/config/locales/ru-RU.json +++ b/src/config/locales/ru-RU.json @@ -543,23 +543,23 @@ "title": "Best" }, "people": { - "title": "People" + "title": "Люди" }, "topics": { - "title": "Topics" + "title": "Темы" }, "communities": { "title": "Сообщества", - "subscribe": "Join", - "unsubscribe": "Leave", - "subscribers": "Members", + "subscribe": "Присоединиться", + "unsubscribe": "Покинуть", + "subscribers": "Участники", "posters": "Авторы", "posts": "Посты" }, "communities_filter": { - "my": "My Communities", + "my": "Мои сообщества", "rank": "Рейтинг", - "subs": "Members", + "subs": "Участники", "new": "Новое" }, "post_result_filter": { @@ -578,7 +578,7 @@ "details": "Подробности" }, "user": { - "follow": "Follow", - "unfollow": "Unfollow" + "follow": "Подписаться", + "unfollow": "Отписаться" } } From b2e1fc277b8b9132074758d00e5a9a880357cc51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Fri, 15 Jan 2021 01:06:44 +0300 Subject: [PATCH 032/362] Add AccountsBottomSheet --- package.json | 1 + .../container/accountsBottomSheetContainer.js | 32 ++++++++++ src/components/accountsBottomSheet/index.js | 5 ++ .../view/accountsBottomSheetStyles.js | 14 +++++ .../view/accountsBottomSheetView.js | 41 +++++++++++++ src/components/index.js | 2 + .../sideMenu/container/sideMenuContainer.js | 16 ++++- src/components/sideMenu/view/sideMenuView.js | 40 +------------ src/redux/actions/uiAction.js | 6 ++ src/redux/constants/constants.js | 1 + src/redux/reducers/uiReducer.js | 7 +++ .../application/screen/applicationScreen.js | 3 +- yarn.lock | 60 +++++++++++++++++++ 13 files changed, 188 insertions(+), 40 deletions(-) create mode 100644 src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js create mode 100644 src/components/accountsBottomSheet/index.js create mode 100644 src/components/accountsBottomSheet/view/accountsBottomSheetStyles.js create mode 100644 src/components/accountsBottomSheet/view/accountsBottomSheetView.js diff --git a/package.json b/package.json index e3cd54c91..6a328339b 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "@esteemapp/react-native-multi-slider": "^1.1.0", "@esteemapp/react-native-render-html": "^4.1.5", "@esteemapp/react-native-slider": "^0.12.0", + "@gorhom/bottom-sheet": "^2", "@hiveio/dhive": "^0.14.12", "@react-native-community/async-storage": "^1.11.0", "@react-native-community/cameraroll": "^1.3.0", diff --git a/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js b/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js new file mode 100644 index 000000000..ff9726bab --- /dev/null +++ b/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js @@ -0,0 +1,32 @@ +import React, { useEffect, useRef } from 'react'; +import { View } from 'react-native'; +import { useSelector } from 'react-redux'; + +import { AccountContainer } from '../../../containers'; +import AccountsBottomSheet from '../view/accountsBottomSheetView'; + +const AccountsBottomSheetContainer = () => { + const accountsBottomSheetdRef = useRef(); + + const isVisibleAccountsBottomSheet = useSelector( + (state) => state.ui.isVisibleAccountsBottomSheet, + ); + + useEffect(() => { + //console.log(isVisibleAccountsBottomSheet, 'isVisibleAccountsBottomSheet'); + if (isVisibleAccountsBottomSheet) { + console.log(accountsBottomSheetdRef.current); + accountsBottomSheetdRef.current?.showAccountsBottomSheet(); + } + }, [isVisibleAccountsBottomSheet]); + + return ( + + {({ accounts, currentAccount, isLoggedIn, isLoginDone, username }) => ( + + )} + + ); +}; + +export default AccountsBottomSheetContainer; diff --git a/src/components/accountsBottomSheet/index.js b/src/components/accountsBottomSheet/index.js new file mode 100644 index 000000000..7fbfb28f8 --- /dev/null +++ b/src/components/accountsBottomSheet/index.js @@ -0,0 +1,5 @@ +import AccountsBottomSheetContainer from './container/accountsBottomSheetContainer'; +import AccountsBottomSheet from './view/accountsBottomSheetView'; + +export { AccountsBottomSheet, AccountsBottomSheetContainer }; +export default AccountsBottomSheetContainer; diff --git a/src/components/accountsBottomSheet/view/accountsBottomSheetStyles.js b/src/components/accountsBottomSheet/view/accountsBottomSheetStyles.js new file mode 100644 index 000000000..d708a4563 --- /dev/null +++ b/src/components/accountsBottomSheet/view/accountsBottomSheetStyles.js @@ -0,0 +1,14 @@ +import EStyleSheet from 'react-native-extended-stylesheet'; + +export default EStyleSheet.create({ + container: { + flex: 1, + padding: 24, + justifyContent: 'center', + backgroundColor: 'grey', + }, + contentContainer: { + flex: 1, + alignItems: 'center', + }, +}); diff --git a/src/components/accountsBottomSheet/view/accountsBottomSheetView.js b/src/components/accountsBottomSheet/view/accountsBottomSheetView.js new file mode 100644 index 000000000..ad760022b --- /dev/null +++ b/src/components/accountsBottomSheet/view/accountsBottomSheetView.js @@ -0,0 +1,41 @@ +import React, { useCallback, useMemo, useRef, forwardRef, useImperativeHandle } from 'react'; +import { View, Text, StyleSheet, Button } from 'react-native'; +import { BottomSheetModal, BottomSheetModalProvider } from '@gorhom/bottom-sheet'; + +import styles from './accountsBottomSheetStyles'; + +const AccountsBottomSheet = forwardRef((props, ref) => { + // ref + const bottomSheetModalRef = useRef(); + + // variables + const snapPoints = useMemo(() => ['25%', '50%'], []); + + useImperativeHandle(ref, () => ({ + showAccountsBottomSheet() { + bottomSheetModalRef.current?.present(); + }, + })); + + const handleSheetChanges = useCallback((index) => { + console.log('handleSheetChanges', index); + }, []); + + // renders + return ( + + + + Awesome + + + + ); +}); + +export default AccountsBottomSheet; diff --git a/src/components/index.js b/src/components/index.js index a46c84ecd..716410820 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -21,6 +21,7 @@ import { LoginHeader } from './loginHeader'; import { MainButton } from './mainButton'; import { MarkdownEditor } from './markdownEditor'; import { Modal } from './modal'; +import AccountsBottomSheet from './accountsBottomSheet'; import { NotificationLine } from './notificationLine'; import { NumericKeyboard } from './numericKeyboard'; import { ParentPost } from './parentPost'; @@ -140,6 +141,7 @@ export { Logo, MainButton, MarkdownEditor, + AccountsBottomSheet, Modal, NoInternetConnection, NoPost, diff --git a/src/components/sideMenu/container/sideMenuContainer.js b/src/components/sideMenu/container/sideMenuContainer.js index 3604f6ad1..49ef88aef 100644 --- a/src/components/sideMenu/container/sideMenuContainer.js +++ b/src/components/sideMenu/container/sideMenuContainer.js @@ -5,6 +5,7 @@ import { connect } from 'react-redux'; import { getUserDataWithUsername } from '../../../realm/realm'; import { switchAccount } from '../../../providers/hive/auth'; import { updateCurrentAccount } from '../../../redux/actions/accountAction'; +import { toggleAccountsBottomSheet } from '../../../redux/actions/uiAction'; import { logout, isRenderRequired } from '../../../redux/actions/applicationActions'; @@ -96,6 +97,14 @@ class SideMenuContainer extends Component { dispatch(logout()); }; + _handlePressOptions = () => { + const { navigation, toggleAccountsBottomSheet } = this.props; + + //navigation.closeDrawer(); + + toggleAccountsBottomSheet(); + }; + UNSAFE_componentWillReceiveProps(nextProps) { const { isLoggedIn } = this.props; @@ -117,6 +126,7 @@ class SideMenuContainer extends Component { currentAccount={currentAccount} switchAccount={this._switchAccount} handleLogout={this._handleLogout} + handlePressOptions={this._handlePressOptions} /> ); } @@ -128,4 +138,8 @@ const mapStateToProps = (state) => ({ otherAccounts: state.account.otherAccounts, }); -export default connect(mapStateToProps)(SideMenuContainer); +const mapDispatchToProps = { + toggleAccountsBottomSheet, +}; + +export default connect(mapStateToProps, mapDispatchToProps)(SideMenuContainer); diff --git a/src/components/sideMenu/view/sideMenuView.js b/src/components/sideMenu/view/sideMenuView.js index dc71e8b9b..bdc840329 100644 --- a/src/components/sideMenu/view/sideMenuView.js +++ b/src/components/sideMenu/view/sideMenuView.js @@ -12,7 +12,6 @@ import LinearGradient from 'react-native-linear-gradient'; import ActionSheet from 'react-native-actionsheet'; import VersionNumber from 'react-native-version-number'; import { getStorageType } from '../../../realm/realm'; -import Modal from '../../modal'; // Components import { Icon } from '../../icon'; @@ -41,6 +40,7 @@ const SideMenuView = ({ accounts, switchAccount, navigateToRoute, + handlePressOptions, }) => { const intl = useIntl(); const ActionSheetRef = useRef(null); @@ -179,7 +179,7 @@ const SideMenuView = ({ /> - + - - - - } - renderItem={({ item }) => _renderAccountTile(item)} - scrollEnabled - /> - - - navigateToRoute(ROUTES.SCREENS.REGISTER)} - /> - - - - navigateToRoute(ROUTES.SCREENS.LOGIN)} - /> - - - ); }; diff --git a/src/redux/actions/uiAction.js b/src/redux/actions/uiAction.js index f7dfe72aa..da1808ef4 100644 --- a/src/redux/actions/uiAction.js +++ b/src/redux/actions/uiAction.js @@ -3,6 +3,7 @@ import { UPDATE_ACTIVE_BOTTOM_TAB, HIDE_POSTS_THUMBNAILS, RC_OFFER, + TOGGLE_ACCOUNTS_BOTTOM_SHEET, } from '../constants/constants'; export const updateActiveBottomTab = (payload) => ({ @@ -24,3 +25,8 @@ export const hidePostsThumbnails = (payload) => ({ payload, type: HIDE_POSTS_THUMBNAILS, }); + +export const toggleAccountsBottomSheet = (payload) => ({ + payload, + type: TOGGLE_ACCOUNTS_BOTTOM_SHEET, +}); diff --git a/src/redux/constants/constants.js b/src/redux/constants/constants.js index de0e0e9a9..83d712629 100644 --- a/src/redux/constants/constants.js +++ b/src/redux/constants/constants.js @@ -51,6 +51,7 @@ export const UPDATE_ACTIVE_BOTTOM_TAB = 'UPDATE_ACTIVE_BOTTOM_TAB'; export const TOAST_NOTIFICATION = 'TOAST_NOTIFICATION'; export const HIDE_POSTS_THUMBNAILS = 'HIDE_POSTS_THUMBNAILS'; export const RC_OFFER = 'RC_OFFER'; +export const TOGGLE_ACCOUNTS_BOTTOM_SHEET = 'TOGGLE_ACCOUNTS_BOTTOM_SHEET'; // POSTS export const SET_FEED_POSTS = 'SET_FEED_POSTS'; diff --git a/src/redux/reducers/uiReducer.js b/src/redux/reducers/uiReducer.js index 401a68c64..0f2a9f2ce 100644 --- a/src/redux/reducers/uiReducer.js +++ b/src/redux/reducers/uiReducer.js @@ -3,6 +3,7 @@ import { TOAST_NOTIFICATION, HIDE_POSTS_THUMBNAILS, RC_OFFER, + TOGGLE_ACCOUNTS_BOTTOM_SHEET, } from '../constants/constants'; const initialState = { @@ -10,6 +11,7 @@ const initialState = { toastNotification: '', hidePostsThumbnails: false, rcOffer: false, + isVisibleAccountsBottomSheet: false, }; export default function (state = initialState, action) { @@ -38,6 +40,11 @@ export default function (state = initialState, action) { hidePostsThumbnails: action.payload, }; + case TOGGLE_ACCOUNTS_BOTTOM_SHEET: + return { + ...state, + isVisibleAccountsBottomSheet: !state.isVisibleAccountsBottomSheet, + }; default: return state; } diff --git a/src/screens/application/screen/applicationScreen.js b/src/screens/application/screen/applicationScreen.js index 494924e01..7b197ca64 100644 --- a/src/screens/application/screen/applicationScreen.js +++ b/src/screens/application/screen/applicationScreen.js @@ -19,7 +19,7 @@ import { getVersionForWelcomeModal } from '../../../realm/realm'; import ROUTES from '../../../constants/routeNames'; // Components -import { ToastNotification, NoInternetConnection } from '../../../components'; +import { ToastNotification, NoInternetConnection, AccountsBottomSheet } from '../../../components'; // Themes (Styles) import darkTheme from '../../../themes/darkTheme'; @@ -154,6 +154,7 @@ class ApplicationScreen extends Component { onHide={this._handleOnHideToastNotification} /> )} + ); } diff --git a/yarn.lock b/yarn.lock index 6d3da8f86..622c1abea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -805,6 +805,25 @@ resolved "https://registry.yarnpkg.com/@formatjs/intl-utils/-/intl-utils-2.3.0.tgz#2dc8c57044de0340eb53a7ba602e59abf80dc799" integrity sha512-KWk80UPIzPmUg+P0rKh6TqspRw0G6eux1PuJr+zz47ftMaZ9QDwbGzHZbtzWkl5hgayM/qrKRutllRC7D/vVXQ== +"@gorhom/bottom-sheet@^2": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@gorhom/bottom-sheet/-/bottom-sheet-2.0.3.tgz#af72d3c934b0d397729f59c9108c5e2664cf0585" + integrity sha512-yTyefTzaXy4D/7td3rcSf0MAzmcZmwakYuhs+OeB+OwPJ+OwOZXm4t1TtDp5K/R9VZvLvFWHgKlQR8dlDxxENA== + dependencies: + "@gorhom/portal" "^0.1.4" + invariant "^2.2.4" + lodash.isequal "^4.5.0" + nanoid "^3.1.20" + react-native-redash "^14.2.4" + +"@gorhom/portal@^0.1.4": + version "0.1.4" + resolved "https://registry.yarnpkg.com/@gorhom/portal/-/portal-0.1.4.tgz#ef9e50d4b6c98ebe606a16d22d6cb58d661421b4" + integrity sha512-iU3D0i9NureT5ULTvD8moF2FWyFvVGcr/ahcRMDzBblUO1AwwixZRZ+Lf3d6uk0w4ujOQZ7+Az+uUnI+AsXXBw== + dependencies: + lodash.isequal "^4.5.0" + nanoid "^3.1.20" + "@hapi/address@2.x.x": version "2.1.4" resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5" @@ -1430,6 +1449,11 @@ abort-controller@^3.0.0: dependencies: event-target-shim "^5.0.0" +abs-svg-path@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/abs-svg-path/-/abs-svg-path-0.1.1.tgz#df601c8e8d2ba10d4a76d625e236a9a39c2723bf" + integrity sha1-32Acjo0roQ1KdtYl4japo5wnI78= + absolute-path@^0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/absolute-path/-/absolute-path-0.0.0.tgz#a78762fbdadfb5297be99b15d35a785b2f095bf7" @@ -5807,6 +5831,11 @@ lodash.flattendeep@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2" integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI= +lodash.isequal@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" + integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= + lodash.merge@^4.6.0: version "4.6.2" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" @@ -6489,6 +6518,11 @@ nan@^2.12.1, nan@^2.14.0: resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01" integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw== +nanoid@^3.1.20: + version "3.1.20" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788" + integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw== + nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -6602,6 +6636,13 @@ normalize-path@^2.1.1: dependencies: remove-trailing-separator "^1.0.1" +normalize-svg-path@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/normalize-svg-path/-/normalize-svg-path-1.1.0.tgz#0e614eca23c39f0cffe821d6be6cd17e569a766c" + integrity sha512-r9KHKG2UUeB5LoTouwDzBy2VxXlHsiM6fyLQvnJa0S5hrhzqElH/CH7TUGhT1fVvIYBIKf3OpY4YJ4CK+iaqHg== + dependencies: + svg-arc-to-cubic-bezier "^3.0.0" + npm-path@^2.0.2: version "2.0.4" resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.4.tgz#c641347a5ff9d6a09e4d9bce5580c4f505278e64" @@ -7003,6 +7044,11 @@ parse-node-version@^1.0.0: resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b" integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA== +parse-svg-path@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/parse-svg-path/-/parse-svg-path-0.1.2.tgz#7a7ec0d1eb06fa5325c7d3e009b859a09b5d49eb" + integrity sha1-en7A0esG+lMlx9PgCbhZoJtdSes= + parse5@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608" @@ -7624,6 +7670,15 @@ react-native-receive-sharing-intent@ecency/react-native-receive-sharing-intent: version "1.0.4" resolved "https://codeload.github.com/ecency/react-native-receive-sharing-intent/tar.gz/02d179b5eed6e18bd887248b8d9d2cb2cad0cb18" +react-native-redash@^14.2.4: + version "14.2.4" + resolved "https://registry.yarnpkg.com/react-native-redash/-/react-native-redash-14.2.4.tgz#5dbb4b2f1a7441bb304fe3494b89e0dc9010c8ef" + integrity sha512-/1R9UxXv3ffKcrbxolqa2B247Cgd3ikyEm2q1VlBng77Es6PAD4LAOXQ83pBavvwNfOsbhF3ebkbMpJcLaVt3Q== + dependencies: + abs-svg-path "^0.1.1" + normalize-svg-path "^1.0.1" + parse-svg-path "^0.1.2" + react-native-safe-area-view@^0.14.9: version "0.14.9" resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.14.9.tgz#90ee8383037010d9a5055a97cf97e4c1da1f0c3d" @@ -8940,6 +8995,11 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" +svg-arc-to-cubic-bezier@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/svg-arc-to-cubic-bezier/-/svg-arc-to-cubic-bezier-3.2.0.tgz#390c450035ae1c4a0104d90650304c3bc814abe6" + integrity sha512-djbJ/vZKZO+gPoSDThGNpKDO+o+bAeA4XQKovvkNCqnIS2t+S4qnLAGQhyyrulhCFRl1WWzAp0wUDV8PpTVU3g== + symbol-observable@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" From 2721653758121a56ab4bb5007d58dae990f70976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Fri, 15 Jan 2021 23:28:56 +0300 Subject: [PATCH 033/362] Start AccountsBottomSheetDesign --- ios/Podfile.lock | 6 + package.json | 1 + .../container/accountsBottomSheetContainer.js | 15 +- .../view/accountsBottomSheetStyles.js | 115 ++++++++++++++ .../view/accountsBottomSheetView.js | 149 ++++++++++++++++-- src/components/sideMenu/view/sideMenuView.js | 15 -- src/index.js | 5 +- yarn.lock | 5 + 8 files changed, 274 insertions(+), 37 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 929a14e0d..6f64d5060 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -324,6 +324,8 @@ PODS: - React - react-native-receive-sharing-intent (1.0.4): - React + - react-native-safe-area-context (3.1.9): + - React-Core - react-native-splash-screen (3.2.0): - React - react-native-version-number (0.3.6): @@ -452,6 +454,7 @@ DEPENDENCIES: - react-native-matomo-sdk (from `../node_modules/react-native-matomo-sdk`) - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)" - react-native-receive-sharing-intent (from `../node_modules/react-native-receive-sharing-intent`) + - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`) - react-native-splash-screen (from `../node_modules/react-native-splash-screen`) - react-native-version-number (from `../node_modules/react-native-version-number`) - react-native-webview (from `../node_modules/react-native-webview`) @@ -566,6 +569,8 @@ EXTERNAL SOURCES: :path: "../node_modules/@react-native-community/netinfo" react-native-receive-sharing-intent: :path: "../node_modules/react-native-receive-sharing-intent" + react-native-safe-area-context: + :path: "../node_modules/react-native-safe-area-context" react-native-splash-screen: :path: "../node_modules/react-native-splash-screen" react-native-version-number: @@ -677,6 +682,7 @@ SPEC CHECKSUMS: react-native-matomo-sdk: 025c54f92e1e26a4d0acee7c3f28cb0fc7e4729c react-native-netinfo: a53b00d949b6456913aaf507d9dba90c4008c611 react-native-receive-sharing-intent: feba0a332a07977549a85aa58b496eb44368366a + react-native-safe-area-context: b6e0e284002381d2ff29fa4fff42b4d8282e3c94 react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865 react-native-version-number: b415bbec6a13f2df62bf978e85bc0d699462f37f react-native-webview: 160ac8d6bb974e2933f2de6bb7464a8e934ff31d diff --git a/package.json b/package.json index 6a328339b..cedd8f300 100644 --- a/package.json +++ b/package.json @@ -88,6 +88,7 @@ "react-native-qrcode-svg": "^6.0.3", "react-native-reanimated": "^1.3.0", "react-native-receive-sharing-intent": "ecency/react-native-receive-sharing-intent", + "react-native-safe-area-context": "^3.1.9", "react-native-screens": "^2.9.0", "react-native-scrollable-tab-view": "ecency/react-native-scrollable-tab-view", "react-native-snap-carousel": "^3.8.0", diff --git a/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js b/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js index ff9726bab..61cb51c7c 100644 --- a/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js +++ b/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js @@ -6,24 +6,29 @@ import { AccountContainer } from '../../../containers'; import AccountsBottomSheet from '../view/accountsBottomSheetView'; const AccountsBottomSheetContainer = () => { - const accountsBottomSheetdRef = useRef(); + const accountsBottomSheetRef = useRef(); const isVisibleAccountsBottomSheet = useSelector( (state) => state.ui.isVisibleAccountsBottomSheet, ); useEffect(() => { - //console.log(isVisibleAccountsBottomSheet, 'isVisibleAccountsBottomSheet'); + console.log(isVisibleAccountsBottomSheet, 'isVisibleAccountsBottomSheet'); if (isVisibleAccountsBottomSheet) { - console.log(accountsBottomSheetdRef.current); - accountsBottomSheetdRef.current?.showAccountsBottomSheet(); + accountsBottomSheetRef.current?.showAccountsBottomSheet(); + } else { + accountsBottomSheetRef.current?.closeAccountsBottomSheet(); } }, [isVisibleAccountsBottomSheet]); return ( {({ accounts, currentAccount, isLoggedIn, isLoginDone, username }) => ( - + )} ); diff --git a/src/components/accountsBottomSheet/view/accountsBottomSheetStyles.js b/src/components/accountsBottomSheet/view/accountsBottomSheetStyles.js index d708a4563..5c52acc3e 100644 --- a/src/components/accountsBottomSheet/view/accountsBottomSheetStyles.js +++ b/src/components/accountsBottomSheet/view/accountsBottomSheetStyles.js @@ -11,4 +11,119 @@ export default EStyleSheet.create({ flex: 1, alignItems: 'center', }, + backdrop: { + position: 'absolute', + height: '$deviceHeight', + width: '$deviceWidth', + backgroundColor: 'rgba(0, 0, 0, 0.5)', + }, + otherUserAvatar: { + borderWidth: 0.1, + borderColor: '$borderColor', + marginLeft: -7, + marginRight: 10, + }, + userInfoWrapper: { + alignSelf: 'center', + marginLeft: 15, + width: 120, + }, + listItem: { + marginVertical: 15, + }, + listItemIcon: { + color: '$iconColor', + fontSize: 20, + marginRight: 5, + width: 20, + }, + listItemText: { + color: '$primaryDarkGray', + marginLeft: 12, + alignSelf: 'center', + fontWeight: '500', + fontSize: 14, + flex: 1, + }, + buttonText: { + fontSize: 18, + fontFamily: '$primaryFont', + textAlign: 'center', + margin: 10, + color: '$white', + backgroundColor: 'transparent', + }, + addAccountWrapper: { + alignSelf: 'flex-end', + justifyContent: 'center', + flex: 1, + flexDirection: 'row', + }, + itemWrapper: { + flexDirection: 'row', + marginLeft: 55, + }, + versionText: { + textAlign: 'center', + color: '$iconColor', + }, + imageBackground: { + width: '100%', + height: '100%', + flexDirection: 'row', + }, + iconWrapper: { + width: 32, + height: 32, + borderRadius: 16, + borderColor: 'white', + borderWidth: 1, + alignItems: 'center', + justifyContent: 'center', + }, + optionIcon: { + height: 16, + width: 16, + }, + accountTile: { + height: 60, + flexDirection: 'row', + paddingHorizontal: 16, + alignItems: 'center', + flex: 1, + justifyContent: 'space-between', + }, + nameContainer: { + marginLeft: 8, + }, + displayName: { + fontWeight: '600', + fontSize: 16, + color: '$primaryBlack', + }, + name: { + color: '$primaryDarkGray', + }, + accountModal: { + backgroundColor: '$primaryBackgroundColor', + }, + textButton: { + color: '$primaryBlue', + }, + buttonContainer: { + height: 50, + justifyContent: 'center', + paddingHorizontal: 16, + }, + separator: { + backgroundColor: '$darkIconColor', + height: 0.5, + }, + avatarAndNameContainer: { + flexDirection: 'row', + alignItems: 'center', + }, + checkIcon: { + color: '$successColor', + }, }); diff --git a/src/components/accountsBottomSheet/view/accountsBottomSheetView.js b/src/components/accountsBottomSheet/view/accountsBottomSheetView.js index ad760022b..cd629a940 100644 --- a/src/components/accountsBottomSheet/view/accountsBottomSheetView.js +++ b/src/components/accountsBottomSheet/view/accountsBottomSheetView.js @@ -1,38 +1,155 @@ import React, { useCallback, useMemo, useRef, forwardRef, useImperativeHandle } from 'react'; -import { View, Text, StyleSheet, Button } from 'react-native'; -import { BottomSheetModal, BottomSheetModalProvider } from '@gorhom/bottom-sheet'; +import { View, Text, TouchableOpacity } from 'react-native'; +import { useDispatch } from 'react-redux'; +import { + BottomSheetModal, + BottomSheetModalProvider, + BottomSheetFlatList, +} from '@gorhom/bottom-sheet'; +import { useSafeAreaInsets } from 'react-native-safe-area-context'; + +import { toggleAccountsBottomSheet } from '../../../redux/actions/uiAction'; + +import { UserAvatar, Icon } from '../../index'; import styles from './accountsBottomSheetStyles'; -const AccountsBottomSheet = forwardRef((props, ref) => { - // ref - const bottomSheetModalRef = useRef(); +const data = [ + { + name: 'deneme', + username: 'furkankilic', + isCurrentAccount: true, + }, + { + name: 'deneme', + username: 'furkankilic', + }, + { + name: 'deneme', + username: 'furkankilic', + }, + { + name: 'deneme', + username: 'furkankilic', + }, + { + name: 'deneme', + username: 'furkankilic', + }, + { + name: 'deneme', + username: 'furkankilic', + }, + { + name: 'deneme', + username: 'furkankilic', + }, + { + name: 'deneme', + username: 'furkankilic', + }, + { + name: 'deneme', + username: 'furkankilic', + }, + { + name: 'deneme', + username: 'furkankilic', + }, + { + name: 'deneme', + username: 'furkankilic', + }, + { + name: 'deneme', + username: 'furkankilic', + }, + { + name: 'deneme', + username: 'furkankilic', + }, + { + name: 'deneme', + username: 'furkankilic', + }, + { + name: 'deneme', + username: 'furkankilic', + }, + { + name: 'deneme', + username: 'furkankilic', + }, + { + name: 'deneme', + username: 'furkankilic', + }, + { + name: 'deneme', + username: 'furkankilic', + }, +]; - // variables - const snapPoints = useMemo(() => ['25%', '50%'], []); +const AccountsBottomSheet = forwardRef(({ accounts, currentAccount }, ref) => { + const dispatch = useDispatch(); + const bottomSheetModalRef = useRef(); + const insets = useSafeAreaInsets(); + + const snapPoints = useMemo(() => ['35%'], []); useImperativeHandle(ref, () => ({ showAccountsBottomSheet() { bottomSheetModalRef.current?.present(); }, + closeAccountsBottomSheet() { + _handleDismissBottomSheet(); + }, })); - const handleSheetChanges = useCallback((index) => { - console.log('handleSheetChanges', index); - }, []); + const _handleDismissBottomSheet = () => { + bottomSheetModalRef.current?.dismiss(); + dispatch(toggleAccountsBottomSheet()); + }; + + //_handlePressAccountTile(item) + const _renderAccountTile = (item) => ( + {}}> + + + + {item.displayName && {item.displayName}} + {item.name} + + + {item.isCurrentAccount && ( + + )} + + ); - // renders return ( ( + + )} ref={bottomSheetModalRef} - index={1} + index={0} snapPoints={snapPoints} - onChange={handleSheetChanges} + onDismiss={() => console.log('dismiss')} > - - Awesome - + i} + renderItem={({ item }) => _renderAccountTile(item)} + //contentContainerStyle={styles.contentContainer} + /> + ); diff --git a/src/components/sideMenu/view/sideMenuView.js b/src/components/sideMenu/view/sideMenuView.js index bdc840329..3ee3f217c 100644 --- a/src/components/sideMenu/view/sideMenuView.js +++ b/src/components/sideMenu/view/sideMenuView.js @@ -129,21 +129,6 @@ const SideMenuView = ({ setIsAccountsModalOpen(false); }; - const _renderAccountTile = (item) => ( - _handlePressAccountTile(item)}> - - - - {item.displayName && {item.displayName}} - {item.name} - - - {item.isCurrentAccount && ( - - )} - - ); - return ( ( - + + + ); diff --git a/yarn.lock b/yarn.lock index 622c1abea..a41ed955a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7679,6 +7679,11 @@ react-native-redash@^14.2.4: normalize-svg-path "^1.0.1" parse-svg-path "^0.1.2" +react-native-safe-area-context@^3.1.9: + version "3.1.9" + resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-3.1.9.tgz#48864ea976b0fa57142a2cc523e1fd3314e7247e" + integrity sha512-wmcGbdyE/vBSL5IjDPReoJUEqxkZsywZw5gPwsVUV1NBpw5eTIdnL6Y0uNKHE25Z661moxPHQz6kwAkYQyorxA== + react-native-safe-area-view@^0.14.9: version "0.14.9" resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.14.9.tgz#90ee8383037010d9a5055a97cf97e4c1da1f0c3d" From 458f39f92ab598f63de3ffda3d1bdef0cbae8ef9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Fri, 15 Jan 2021 23:55:21 +0300 Subject: [PATCH 034/362] improvements for AccountsBottomSheet logic --- .../container/accountsBottomSheetContainer.js | 2 - .../view/accountsBottomSheetView.js | 105 ++++++------------ 2 files changed, 31 insertions(+), 76 deletions(-) diff --git a/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js b/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js index 61cb51c7c..1cb51c210 100644 --- a/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js +++ b/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js @@ -16,8 +16,6 @@ const AccountsBottomSheetContainer = () => { console.log(isVisibleAccountsBottomSheet, 'isVisibleAccountsBottomSheet'); if (isVisibleAccountsBottomSheet) { accountsBottomSheetRef.current?.showAccountsBottomSheet(); - } else { - accountsBottomSheetRef.current?.closeAccountsBottomSheet(); } }, [isVisibleAccountsBottomSheet]); diff --git a/src/components/accountsBottomSheet/view/accountsBottomSheetView.js b/src/components/accountsBottomSheet/view/accountsBottomSheetView.js index cd629a940..2a862d8d0 100644 --- a/src/components/accountsBottomSheet/view/accountsBottomSheetView.js +++ b/src/components/accountsBottomSheet/view/accountsBottomSheetView.js @@ -1,6 +1,7 @@ import React, { useCallback, useMemo, useRef, forwardRef, useImperativeHandle } from 'react'; import { View, Text, TouchableOpacity } from 'react-native'; import { useDispatch } from 'react-redux'; +import { useIntl } from 'react-intl'; import { BottomSheetModal, BottomSheetModalProvider, @@ -10,82 +11,18 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context'; import { toggleAccountsBottomSheet } from '../../../redux/actions/uiAction'; -import { UserAvatar, Icon } from '../../index'; +import { UserAvatar, Icon, TextButton, Separator } from '../../index'; import styles from './accountsBottomSheetStyles'; const data = [ { - name: 'deneme', + name: 'example', username: 'furkankilic', isCurrentAccount: true, }, { - name: 'deneme', - username: 'furkankilic', - }, - { - name: 'deneme', - username: 'furkankilic', - }, - { - name: 'deneme', - username: 'furkankilic', - }, - { - name: 'deneme', - username: 'furkankilic', - }, - { - name: 'deneme', - username: 'furkankilic', - }, - { - name: 'deneme', - username: 'furkankilic', - }, - { - name: 'deneme', - username: 'furkankilic', - }, - { - name: 'deneme', - username: 'furkankilic', - }, - { - name: 'deneme', - username: 'furkankilic', - }, - { - name: 'deneme', - username: 'furkankilic', - }, - { - name: 'deneme', - username: 'furkankilic', - }, - { - name: 'deneme', - username: 'furkankilic', - }, - { - name: 'deneme', - username: 'furkankilic', - }, - { - name: 'deneme', - username: 'furkankilic', - }, - { - name: 'deneme', - username: 'furkankilic', - }, - { - name: 'deneme', - username: 'furkankilic', - }, - { - name: 'deneme', + name: 'example', username: 'furkankilic', }, ]; @@ -94,16 +31,16 @@ const AccountsBottomSheet = forwardRef(({ accounts, currentAccount }, ref) => { const dispatch = useDispatch(); const bottomSheetModalRef = useRef(); const insets = useSafeAreaInsets(); + const intl = useIntl(); - const snapPoints = useMemo(() => ['35%'], []); + const snapPoints = useMemo(() => [200], []); + + //const calculateHeight = () => data.length * 50 + 160; useImperativeHandle(ref, () => ({ showAccountsBottomSheet() { bottomSheetModalRef.current?.present(); }, - closeAccountsBottomSheet() { - _handleDismissBottomSheet(); - }, })); const _handleDismissBottomSheet = () => { @@ -134,13 +71,15 @@ const AccountsBottomSheet = forwardRef(({ accounts, currentAccount }, ref) => { )} ref={bottomSheetModalRef} index={0} snapPoints={snapPoints} - onDismiss={() => console.log('dismiss')} + onDismiss={_handleDismissBottomSheet} + shouldMeasureContentHeight={true} > { renderItem={({ item }) => _renderAccountTile(item)} //contentContainerStyle={styles.contentContainer} /> - + + + + navigateToRoute(ROUTES.SCREENS.REGISTER)} + /> + + + + navigateToRoute(ROUTES.SCREENS.LOGIN)} + /> + + + ); From c170cf62031a59286bb1411e63d798823fab2e33 Mon Sep 17 00:00:00 2001 From: feruz Date: Sat, 16 Jan 2021 14:51:12 +0200 Subject: [PATCH 035/362] post card image size set --- ios/Podfile.lock | 2 +- .../markdownEditor/view/markdownEditorStyles.js | 2 +- .../markdownEditor/view/markdownEditorView.js | 3 ++- src/components/postCard/view/postCardStyles.js | 4 ++-- src/components/postCard/view/postCardView.js | 12 +++++++++--- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 929a14e0d..640541d01 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -714,4 +714,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 1f30c7da5061dbc47185442a6ab4a3c95ac48c04 -COCOAPODS: 1.10.0 +COCOAPODS: 1.9.3 diff --git a/src/components/markdownEditor/view/markdownEditorStyles.js b/src/components/markdownEditor/view/markdownEditorStyles.js index 0286b6ea1..0bdb64731 100644 --- a/src/components/markdownEditor/view/markdownEditorStyles.js +++ b/src/components/markdownEditor/view/markdownEditorStyles.js @@ -14,7 +14,7 @@ export default EStyleSheet.create({ color: '$primaryBlack', backgroundColor: '$primaryBackgroundColor', // fontFamily: '$editorFont', - //textAlignVertical: 'top', + // textAlignVertical: 'top', }, previewContainer: { flex: 1, diff --git a/src/components/markdownEditor/view/markdownEditorView.js b/src/components/markdownEditor/view/markdownEditorView.js index 7a86fc73b..59c3c8644 100644 --- a/src/components/markdownEditor/view/markdownEditorView.js +++ b/src/components/markdownEditor/view/markdownEditorView.js @@ -44,6 +44,7 @@ const MarkdownEditorView = ({ const [text, setText] = useState(draftBody || ''); const [selection, setSelection] = useState({ start: 0, end: 0 }); const [editable, setEditable] = useState(true); + const [height, setHeight] = useState(0); const inputRef = useRef(null); const galleryRef = useRef(null); @@ -260,7 +261,7 @@ const MarkdownEditorView = ({ { const [rebloggedBy, setRebloggedBy] = useState(get(content, 'reblogged_by[0]', null)); const [activeVot, setActiveVot] = useState(activeVotes); + const [calcImgHeight, setCalcImgHeight] = useState(0); //console.log(activeVotes); // Component Functions @@ -103,10 +106,13 @@ const PostCardView = ({ {!isHideImage && ( + setCalcImgHeight((evt.nativeEvent.height / evt.nativeEvent.width) * width) + } /> )} From ee9a79d51195ed66796ebf6b807317093c761bd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Sat, 16 Jan 2021 16:35:36 +0300 Subject: [PATCH 036/362] Add functions to AccountsBottomSheet --- .../container/accountsBottomSheetContainer.js | 10 +++++++-- .../view/accountsBottomSheetView.js | 22 +++++++++++++------ src/components/sideMenu/view/sideMenuView.js | 21 ++---------------- 3 files changed, 25 insertions(+), 28 deletions(-) diff --git a/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js b/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js index 1cb51c210..5d2f872c2 100644 --- a/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js +++ b/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js @@ -5,7 +5,7 @@ import { useSelector } from 'react-redux'; import { AccountContainer } from '../../../containers'; import AccountsBottomSheet from '../view/accountsBottomSheetView'; -const AccountsBottomSheetContainer = () => { +const AccountsBottomSheetContainer = ({ navigation }) => { const accountsBottomSheetRef = useRef(); const isVisibleAccountsBottomSheet = useSelector( @@ -13,12 +13,17 @@ const AccountsBottomSheetContainer = () => { ); useEffect(() => { - console.log(isVisibleAccountsBottomSheet, 'isVisibleAccountsBottomSheet'); if (isVisibleAccountsBottomSheet) { accountsBottomSheetRef.current?.showAccountsBottomSheet(); } }, [isVisibleAccountsBottomSheet]); + const _navigateToRoute = (route = null) => { + if (route) { + //navigation.navigate(route); + } + }; + return ( {({ accounts, currentAccount, isLoggedIn, isLoginDone, username }) => ( @@ -26,6 +31,7 @@ const AccountsBottomSheetContainer = () => { ref={accountsBottomSheetRef} accounts={accounts} currentAccount={currentAccount} + navigateToRoute={_navigateToRoute} /> )} diff --git a/src/components/accountsBottomSheet/view/accountsBottomSheetView.js b/src/components/accountsBottomSheet/view/accountsBottomSheetView.js index 2a862d8d0..3d7e01f97 100644 --- a/src/components/accountsBottomSheet/view/accountsBottomSheetView.js +++ b/src/components/accountsBottomSheet/view/accountsBottomSheetView.js @@ -13,6 +13,8 @@ import { toggleAccountsBottomSheet } from '../../../redux/actions/uiAction'; import { UserAvatar, Icon, TextButton, Separator } from '../../index'; +import { default as ROUTES } from '../../../constants/routeNames'; + import styles from './accountsBottomSheetStyles'; const data = [ @@ -25,17 +27,23 @@ const data = [ name: 'example', username: 'furkankilic', }, + { + name: 'example', + username: 'furkankilic', + }, + { + name: 'example', + username: 'furkankilic', + }, ]; -const AccountsBottomSheet = forwardRef(({ accounts, currentAccount }, ref) => { +const AccountsBottomSheet = forwardRef(({ accounts, currentAccount, navigateToRoute }, ref) => { const dispatch = useDispatch(); const bottomSheetModalRef = useRef(); const insets = useSafeAreaInsets(); const intl = useIntl(); - const snapPoints = useMemo(() => [200], []); - - //const calculateHeight = () => data.length * 50 + 160; + const snapPoints = useMemo(() => [data.length <= 4 ? data.length * 60 + 150 : 405], []); useImperativeHandle(ref, () => ({ showAccountsBottomSheet() { @@ -84,7 +92,7 @@ const AccountsBottomSheet = forwardRef(({ accounts, currentAccount }, ref) => { i} + keyExtractor={(item) => item.name} renderItem={({ item }) => _renderAccountTile(item)} //contentContainerStyle={styles.contentContainer} /> @@ -94,7 +102,7 @@ const AccountsBottomSheet = forwardRef(({ accounts, currentAccount }, ref) => { navigateToRoute(ROUTES.SCREENS.REGISTER)} + onPress={() => navigateToRoute(ROUTES.SCREENS.REGISTER)} /> @@ -102,7 +110,7 @@ const AccountsBottomSheet = forwardRef(({ accounts, currentAccount }, ref) => { navigateToRoute(ROUTES.SCREENS.LOGIN)} + onPress={() => navigateToRoute(ROUTES.SCREENS.LOGIN)} /> diff --git a/src/components/sideMenu/view/sideMenuView.js b/src/components/sideMenu/view/sideMenuView.js index 3ee3f217c..c12c803ad 100644 --- a/src/components/sideMenu/view/sideMenuView.js +++ b/src/components/sideMenu/view/sideMenuView.js @@ -1,12 +1,5 @@ -import React, { Component, useEffect, useState, useRef } from 'react'; -import { - View, - Text, - ImageBackground, - FlatList, - TouchableOpacity, - SafeAreaView, -} from 'react-native'; +import React, { useEffect, useState, useRef } from 'react'; +import { View, Text, ImageBackground, FlatList, TouchableOpacity } from 'react-native'; import { injectIntl, useIntl } from 'react-intl'; import LinearGradient from 'react-native-linear-gradient'; import ActionSheet from 'react-native-actionsheet'; @@ -16,19 +9,16 @@ import { getStorageType } from '../../../realm/realm'; // Components import { Icon } from '../../icon'; import { UserAvatar } from '../../userAvatar'; -import Separator from '../../basicUIElements/view/separator/separatorView'; import { TextWithIcon } from '../../basicUIElements'; // Constants import MENU from '../../../constants/sideMenuItems'; -import { default as ROUTES } from '../../../constants/routeNames'; //Utils import { getVotingPower } from '../../../utils/manaBar'; // Styles import styles from './sideMenuStyles'; -import { TextButton } from '../../buttons'; // Images const SIDE_MENU_BACKGROUND = require('../../../assets/side_menu_background.png'); @@ -49,7 +39,6 @@ const SideMenuView = ({ isLoggedIn ? MENU.AUTH_MENU_ITEMS : MENU.NO_AUTH_MENU_ITEMS, ); const [storageT, setStorageT] = useState('R'); - const [isAccountsModalOpen, setIsAccountsModalOpen] = useState(false); const [upower, setUpower] = useState(0); // Component Life Cycles @@ -81,10 +70,6 @@ const SideMenuView = ({ navigateToRoute(item.route); }; - const _toggleAccountsModalOpen = () => { - setIsAccountsModalOpen(!isAccountsModalOpen); - }; - useEffect(() => { setMenuItems(isLoggedIn ? MENU.AUTH_MENU_ITEMS : MENU.NO_AUTH_MENU_ITEMS); }, [isLoggedIn]); @@ -125,8 +110,6 @@ const SideMenuView = ({ if (!item.isCurrentAccount) { switchAccount(item); } - - setIsAccountsModalOpen(false); }; return ( From 14dc37671f41d5754e2d48fe9eef7ee4871ad84e Mon Sep 17 00:00:00 2001 From: feruz Date: Sat, 16 Jan 2021 19:01:38 +0200 Subject: [PATCH 037/362] improve post thumbnails --- src/components/postCard/view/postCardView.js | 7 +++++-- .../postListItem/view/postListItemStyles.js | 4 ++-- .../postListItem/view/postListItemView.js | 17 +++++++++++++---- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/components/postCard/view/postCardView.js b/src/components/postCard/view/postCardView.js index fd09abc9b..1d747f7aa 100644 --- a/src/components/postCard/view/postCardView.js +++ b/src/components/postCard/view/postCardView.js @@ -21,7 +21,7 @@ import styles from './postCardStyles'; import DEFAULT_IMAGE from '../../../assets/no_image.png'; import NSFW_IMAGE from '../../../assets/nsfw.png'; -const { width } = Dimensions.get('window'); +const { width, height } = Dimensions.get('window'); const PostCardView = ({ handleOnUserPress, @@ -106,7 +106,10 @@ const PostCardView = ({ {!isHideImage && ( { const actionSheet = useRef(null); - + const [calcImgHeight, setCalcImgHeight] = useState(0); // Component Life Cycles // Component Functions @@ -60,7 +62,14 @@ const PostListItemView = ({ handleOnPressItem(id)}> - + + setCalcImgHeight((evt.nativeEvent.height / evt.nativeEvent.width) * width) + } + /> {title} {summary} From e5f9385696173f91c9b973e4e888a7e05cdf28a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Sun, 17 Jan 2021 00:03:26 +0300 Subject: [PATCH 038/362] call data for communities screen --- src/components/communitiesList/index.js | 4 + .../communitiesList/view}/communitiesList.js | 15 +- .../view/communitiesListItem/index.js | 4 + .../view}/CommunitiesListItem.js | 53 ++--- .../view}/communitiesListItemStyles.js | 0 .../view}/communitiesListStyles.js | 0 .../posts/container/postsContainer.js | 4 +- src/constants/sideMenuItems.js | 2 +- src/containers/communitiesContainer.js | 107 --------- src/containers/index.js | 2 - src/screens/communities/communities.js | 216 ------------------ .../container/communitiesContainer.js | 122 ++++++++++ src/screens/communities/index.js | 2 +- .../communities/view/communitiesScreen.js | 122 ++++++++++ .../communitiesScreenStyles.js} | 3 + .../screen/tabs/communities/communities.js | 31 +-- 16 files changed, 310 insertions(+), 377 deletions(-) create mode 100644 src/components/communitiesList/index.js rename src/{screens/communities => components/communitiesList/view}/communitiesList.js (83%) create mode 100644 src/components/communitiesList/view/communitiesListItem/index.js rename src/{screens/communities => components/communitiesList/view/communitiesListItem/view}/CommunitiesListItem.js (56%) rename src/{screens/communities => components/communitiesList/view/communitiesListItem/view}/communitiesListItemStyles.js (100%) rename src/{screens/communities => components/communitiesList/view}/communitiesListStyles.js (100%) delete mode 100644 src/containers/communitiesContainer.js delete mode 100644 src/screens/communities/communities.js create mode 100644 src/screens/communities/container/communitiesContainer.js create mode 100644 src/screens/communities/view/communitiesScreen.js rename src/screens/communities/{communitiesStyles.js => view/communitiesScreenStyles.js} (96%) diff --git a/src/components/communitiesList/index.js b/src/components/communitiesList/index.js new file mode 100644 index 000000000..48417abad --- /dev/null +++ b/src/components/communitiesList/index.js @@ -0,0 +1,4 @@ +import { CommunityListItem } from '../basicUIElements'; +import CommunitiesList from './view/communitiesList'; + +export default CommunitiesList; diff --git a/src/screens/communities/communitiesList.js b/src/components/communitiesList/view/communitiesList.js similarity index 83% rename from src/screens/communities/communitiesList.js rename to src/components/communitiesList/view/communitiesList.js index 8d4ce7461..6f7b32da0 100644 --- a/src/screens/communities/communitiesList.js +++ b/src/components/communitiesList/view/communitiesList.js @@ -2,24 +2,22 @@ import React from 'react'; import { SafeAreaView, FlatList } from 'react-native'; // Components -import { CommunityListItem, CommunitiesPlaceHolder } from '../../components/basicUIElements'; +import { CommunitiesPlaceHolder } from '../../basicUIElements'; +import CommunitiesListItem from './communitiesListItem'; // Styles import styles from './communitiesListStyles'; const CommunitiesList = ({ - votes, + data, handleOnPress, handleSubscribeButtonPress, - allSubscriptions, isLoggedIn, noResult, }) => { const _renderItem = ({ item, index }) => { - const isSubscribed = allSubscriptions.some((sub) => sub[0] === item.name); - return ( - ); }; @@ -56,7 +55,7 @@ const CommunitiesList = ({ {!noResult && ( item.id && item.id.toString()} renderItem={_renderItem} ListEmptyComponent={_renderEmptyContent} diff --git a/src/components/communitiesList/view/communitiesListItem/index.js b/src/components/communitiesList/view/communitiesListItem/index.js new file mode 100644 index 000000000..41d065f4e --- /dev/null +++ b/src/components/communitiesList/view/communitiesListItem/index.js @@ -0,0 +1,4 @@ +import CommunitiesList from '../../../../screens/searchResult/screen/tabs/communities/communitiesList'; +import CommunitiesListItem from './view/CommunitiesListItem'; + +export default CommunitiesListItem; diff --git a/src/screens/communities/CommunitiesListItem.js b/src/components/communitiesList/view/communitiesListItem/view/CommunitiesListItem.js similarity index 56% rename from src/screens/communities/CommunitiesListItem.js rename to src/components/communitiesList/view/communitiesListItem/view/CommunitiesListItem.js index 842b18092..50fedeee4 100644 --- a/src/screens/communities/CommunitiesListItem.js +++ b/src/components/communitiesList/view/communitiesListItem/view/CommunitiesListItem.js @@ -1,12 +1,12 @@ import React, { useState } from 'react'; -import { View, Text, TouchableOpacity } from 'react-native'; +import { View, Text, TouchableOpacity, ActivityIndicator } from 'react-native'; import { useIntl } from 'react-intl'; import styles from './communitiesListItemStyles'; -import { Tag } from '../../components/basicUIElements'; +import { Tag } from '../../../../basicUIElements'; -const UserListItem = ({ +const CommunitiesListItem = ({ index, handleOnPress, handleOnLongPress, @@ -22,14 +22,12 @@ const UserListItem = ({ handleSubscribeButtonPress, isSubscribed, isLoggedIn, + loading, }) => { - const [subscribed, setSubscribed] = useState(isSubscribed); const intl = useIntl(); const _handleSubscribeButtonPress = () => { - handleSubscribeButtonPress({ subscribed: !subscribed, communityId: name }).then(() => { - setSubscribed(!subscribed); - }); + handleSubscribeButtonPress({ isSubscribed: !isSubscribed, communityId: name }); }; return ( @@ -41,24 +39,27 @@ const UserListItem = ({ {title} - {isLoggedIn && ( - - )} + {isLoggedIn && + (loading ? ( + + ) : ( + + ))} {!!about && {about}} @@ -77,4 +78,4 @@ const UserListItem = ({ ); }; -export default UserListItem; +export default CommunitiesListItem; diff --git a/src/screens/communities/communitiesListItemStyles.js b/src/components/communitiesList/view/communitiesListItem/view/communitiesListItemStyles.js similarity index 100% rename from src/screens/communities/communitiesListItemStyles.js rename to src/components/communitiesList/view/communitiesListItem/view/communitiesListItemStyles.js diff --git a/src/screens/communities/communitiesListStyles.js b/src/components/communitiesList/view/communitiesListStyles.js similarity index 100% rename from src/screens/communities/communitiesListStyles.js rename to src/components/communitiesList/view/communitiesListStyles.js diff --git a/src/components/posts/container/postsContainer.js b/src/components/posts/container/postsContainer.js index 322a3da61..6437f3341 100644 --- a/src/components/posts/container/postsContainer.js +++ b/src/components/posts/container/postsContainer.js @@ -462,7 +462,9 @@ const PostsContainer = ({ }); } - dispatch(subscribeAction(currentAccount, pinCode, data, successToastText, failToastText)); + dispatch( + subscribeAction(currentAccount, pinCode, data, successToastText, failToastText, 'feedScreen'), + ); }; return ( diff --git a/src/constants/sideMenuItems.js b/src/constants/sideMenuItems.js index 29cd51825..0d38e56dc 100644 --- a/src/constants/sideMenuItems.js +++ b/src/constants/sideMenuItems.js @@ -28,7 +28,7 @@ const authMenuItems = [ { name: 'Communities', route: ROUTES.SCREENS.COMMUNITIES, - icon: 'settings', + icon: 'people', id: 'communities', }, { diff --git a/src/containers/communitiesContainer.js b/src/containers/communitiesContainer.js deleted file mode 100644 index 9d40d7939..000000000 --- a/src/containers/communitiesContainer.js +++ /dev/null @@ -1,107 +0,0 @@ -import { useState, useEffect } from 'react'; -import { withNavigation } from 'react-navigation'; -import { connect } from 'react-redux'; -import isEmpty from 'lodash/isEmpty'; - -import ROUTES from '../constants/routeNames'; - -import { getCommunities, getSubscriptions, subscribeCommunity } from '../providers/hive/dhive'; - -const CommunitiesContainer = ({ - children, - navigation, - searchValue, - currentAccount, - pinCode, - isLoggedIn, -}) => { - const [data, setData] = useState(); - const [filterIndex, setFilterIndex] = useState(1); - const [query, setQuery] = useState(''); - const [sort, setSort] = useState('rank'); - const [allSubscriptions, setAllSubscriptions] = useState([]); - const [noResult, setNoResult] = useState(false); - - useEffect(() => { - let isCancelled = false; - setData([]); - if (sort === 'my') { - setNoResult(true); - } else { - getCommunities('', 100, query, sort).then((res) => { - if (!isCancelled) { - if (!isEmpty(res)) { - setData(res); - setNoResult(false); - } else { - setNoResult(true); - } - } - }); - } - return () => { - isCancelled = true; - }; - }, [query, sort]); - - useEffect(() => { - setData([]); - setQuery(searchValue); - setNoResult(false); - }, [searchValue]); - - useEffect(() => { - let isCancelled = false; - if (data && !isCancelled) { - getSubscriptions(currentAccount.username).then((result) => { - if (result) { - setAllSubscriptions(result); - } - }); - } - return () => { - isCancelled = true; - }; - }, [data]); - - // Component Functions - const _handleOnVotersDropdownSelect = (index, value) => { - setFilterIndex(index); - setSort(value); - }; - - const _handleOnPress = (name) => { - navigation.navigate({ - routeName: ROUTES.SCREENS.COMMUNITY, - params: { - tag: name, - }, - }); - }; - - const _handleSubscribeButtonPress = (_data) => { - return subscribeCommunity(currentAccount, pinCode, _data); - }; - - return ( - children && - children({ - data, - filterIndex, - allSubscriptions, - handleOnVotersDropdownSelect: _handleOnVotersDropdownSelect, - handleOnPress: _handleOnPress, - handleSubscribeButtonPress: _handleSubscribeButtonPress, - isLoggedIn, - noResult, - }) - ); -}; - -const mapStateToProps = (state) => ({ - currentAccount: state.account.currentAccount, - pinCode: state.application.pin, - isLoggedIn: state.application.isLoggedIn, -}); - -export default connect(mapStateToProps)(withNavigation(CommunitiesContainer)); diff --git a/src/containers/index.js b/src/containers/index.js index b62c9d272..abe7bdab2 100644 --- a/src/containers/index.js +++ b/src/containers/index.js @@ -1,5 +1,4 @@ import AccountContainer from './accountContainer'; -import CommunitiesContainer from './communitiesContainer'; import InAppPurchaseContainer from './inAppPurchaseContainer'; import LoggedInContainer from './loggedInContainer'; import PointsContainer from './pointsContainer'; @@ -13,7 +12,6 @@ import TransferContainer from './transferContainer'; export { AccountContainer, - CommunitiesContainer, InAppPurchaseContainer, LoggedInContainer, PointsContainer, diff --git a/src/screens/communities/communities.js b/src/screens/communities/communities.js deleted file mode 100644 index 1d19a9245..000000000 --- a/src/screens/communities/communities.js +++ /dev/null @@ -1,216 +0,0 @@ -import React from 'react'; -import { useIntl } from 'react-intl'; -import { FlatList, View, Text, TouchableOpacity } from 'react-native'; -import get from 'lodash/get'; -import { SafeAreaView } from 'react-navigation'; -import ScrollableTabView from 'react-native-scrollable-tab-view'; - -// Components -import { FilterBar, UserAvatar, TabBar, BasicHeader } from '../../components'; -import CommunitiesList from './communitiesList'; -import { CommunitiesPlaceHolder } from '../../components/basicUIElements'; - -import { CommunitiesContainer } from '../../containers'; -import DEFAULT_IMAGE from '../../assets/no_image.png'; -import Tag from '../../components/basicUIElements/view/tag/tagView'; - -import styles from './communitiesStyles'; -import globalStyles from '../../globalStyles'; - -const filterOptions = ['my', 'rank', 'subs', 'new']; - -const CommunitiesScreen = ({ navigation, searchValue }) => { - const intl = useIntl(); - - const activeVotes = get(navigation, 'state.params.activeVotes'); - - const _renderEmptyContent = () => { - return ( - <> - - - - - ); - }; - - const _renderTabbar = () => ( - - ); - - return ( - - {({ - data, - filterIndex, - allSubscriptions, - handleOnVotersDropdownSelect, - handleOnPress, - handleSubscribeButtonPress, - isLoggedIn, - noResult, - }) => ( - - - - - - `${item}-${ind}`} - renderItem={({ item, index }) => ( - - - handleOnPress(item[0])}> - - - handleOnPress(item[0])}> - {item[1]} - - - - - handleSubscribeButtonPress({ isSubscribed: true, communityId: item[0] }) - } - /> - - - )} - ListEmptyComponent={_renderEmptyContent} - /> - - - `${item}-${ind}`} - renderItem={({ item, index }) => ( - - - handleOnPress(item[0])}> - - - handleOnPress(item[0])}> - {item[1]} - - - - - handleSubscribeButtonPress({ isSubscribed: true, communityId: item[0] }) - } - /> - - - )} - ListEmptyComponent={_renderEmptyContent} - /> - - - - - )} - - ); -}; - -export default CommunitiesScreen; - -{ - /* <> - - intl.formatMessage({ - id: `search_result.communities_filter.${item}`, - }), - )} - defaultText={intl.formatMessage({ - id: `search_result.communities_filter.${filterOptions[filterIndex]}`, - })} - selectedOptionIndex={filterIndex} - onDropdownSelect={(index) => handleOnVotersDropdownSelect(index, filterOptions[index])} -/> -{filterIndex !== 0 && ( - -)} -{filterIndex === 0 && allSubscriptions && allSubscriptions.length > 0 && ( - `${item}-${ind}`} - renderItem={({ item, index }) => ( - - - handleOnPress(item[0])}> - - - handleOnPress(item[0])}> - {item[1]} - - - - - handleSubscribeButtonPress({ isSubscribed: true, communityId: item[0] }) - } - /> - - - )} - ListEmptyComponent={_renderEmptyContent} - /> -)} - */ -} diff --git a/src/screens/communities/container/communitiesContainer.js b/src/screens/communities/container/communitiesContainer.js new file mode 100644 index 000000000..2545ffbf9 --- /dev/null +++ b/src/screens/communities/container/communitiesContainer.js @@ -0,0 +1,122 @@ +import { useState, useEffect } from 'react'; +import { withNavigation } from 'react-navigation'; +import { useSelector, useDispatch } from 'react-redux'; +import { shuffle } from 'lodash'; +import { useIntl } from 'react-intl'; + +import ROUTES from '../../../constants/routeNames'; + +import { + getCommunities, + getSubscriptions, + subscribeCommunity, +} from '../../../providers/hive/dhive'; + +import { toastNotification } from '../../../redux/actions/uiAction'; + +const CommunitiesContainer = ({ children, navigation }) => { + const dispatch = useDispatch(); + const intl = useIntl(); + + const [discovers, setDiscovers] = useState([]); + const [subscriptions, setSubscriptions] = useState([]); + + const currentAccount = useSelector((state) => state.account.currentAccount); + const pinCode = useSelector((state) => state.application.pin); + + useEffect(() => { + getSubscriptions(currentAccount.username).then((subs) => { + getCommunities('', 50, '', 'rank').then((communities) => { + communities.forEach((community) => + Object.assign(community, { + isSubscribed: subs.some( + (subscribedCommunity) => subscribedCommunity[0] === community.name, + ), + loading: false, + }), + ); + + setSubscriptions(subs); + setDiscovers(shuffle(communities)); + }); + }); + }, []); + + // Component Functions + const _handleOnPress = (name) => { + navigation.navigate({ + routeName: ROUTES.SCREENS.COMMUNITY, + params: { + tag: name, + }, + }); + }; + + const _handleSubscribeButtonPress = (_data) => { + const subscribedCommunityIndex = discovers.findIndex( + (community) => community.name === _data.communityId, + ); + + const newDiscovers = [ + ...discovers.slice(0, subscribedCommunityIndex), + Object.assign({}, discovers[subscribedCommunityIndex], { loading: true }), + ...discovers.slice(subscribedCommunityIndex + 1), + ]; + + setDiscovers(newDiscovers); + + subscribeCommunity(currentAccount, pinCode, _data) + .then(() => { + const updatedDiscovers = [ + ...discovers.slice(0, subscribedCommunityIndex), + Object.assign({}, discovers[subscribedCommunityIndex], { + loading: false, + isSubscribed: _data.isSubscribed, + }), + ...discovers.slice(subscribedCommunityIndex + 1), + ]; + + setDiscovers(updatedDiscovers); + + dispatch( + toastNotification( + intl.formatMessage({ + id: 'alert.success_subscribe', + }), + ), + ); + }) + .catch((error) => { + const updatedDiscovers = [ + ...discovers.slice(0, subscribedCommunityIndex), + Object.assign({}, discovers[subscribedCommunityIndex], { + loading: false, + isSubscribed: !_data.isSubscribed, + }), + ...discovers.slice(subscribedCommunityIndex + 1), + ]; + + setDiscovers(updatedDiscovers); + + dispatch( + toastNotification( + intl.formatMessage({ + id: 'alert.fail_subscribe', + }), + ), + ); + }); + }; + + return ( + children && + children({ + subscriptions, + discovers, + handleOnPress: _handleOnPress, + handleSubscribeButtonPress: _handleSubscribeButtonPress, + }) + ); +}; + +export default withNavigation(CommunitiesContainer); diff --git a/src/screens/communities/index.js b/src/screens/communities/index.js index 4e9a173c3..0cb5f7260 100644 --- a/src/screens/communities/index.js +++ b/src/screens/communities/index.js @@ -1,3 +1,3 @@ -import Communities from './communities'; +import Communities from './view/communitiesScreen'; export default Communities; diff --git a/src/screens/communities/view/communitiesScreen.js b/src/screens/communities/view/communitiesScreen.js new file mode 100644 index 000000000..a58805c37 --- /dev/null +++ b/src/screens/communities/view/communitiesScreen.js @@ -0,0 +1,122 @@ +import React from 'react'; +import { useIntl } from 'react-intl'; +import { FlatList, View, Text, TouchableOpacity } from 'react-native'; +import get from 'lodash/get'; +import { SafeAreaView } from 'react-navigation'; +import ScrollableTabView from 'react-native-scrollable-tab-view'; + +// Components +import { FilterBar, UserAvatar, TabBar, BasicHeader } from '../../../components'; +import CommunitiesList from '../../../components/communitiesList'; +import { CommunitiesPlaceHolder } from '../../../components/basicUIElements'; + +import CommunitiesContainer from '../container/communitiesContainer'; +import DEFAULT_IMAGE from '../../../assets/no_image.png'; +import Tag from '../../../components/basicUIElements/view/tag/tagView'; + +import styles from './communitiesScreenStyles'; +import globalStyles from '../../../globalStyles'; + +const CommunitiesScreen = ({ navigation, searchValue }) => { + const intl = useIntl(); + + const _renderEmptyContent = () => { + return ( + <> + + + + + ); + }; + + const _renderTabbar = () => ( + + ); + + return ( + + {({ subscriptions, discovers, handleOnPress, handleSubscribeButtonPress }) => { + console.log(subscriptions, discovers); + return ( + + + + + + `${item}-${ind}`} + renderItem={({ item, index }) => ( + + + handleOnPress(item[0])}> + + + handleOnPress(item[0])}> + {item[1]} + + + + + handleSubscribeButtonPress({ + isSubscribed: true, + communityId: item[0], + }) + } + /> + + + )} + ListEmptyComponent={_renderEmptyContent} + /> + + + + + + + + ); + }} + + ); +}; + +export default CommunitiesScreen; diff --git a/src/screens/communities/communitiesStyles.js b/src/screens/communities/view/communitiesScreenStyles.js similarity index 96% rename from src/screens/communities/communitiesStyles.js rename to src/screens/communities/view/communitiesScreenStyles.js index 6fe3db675..7b3d00622 100644 --- a/src/screens/communities/communitiesStyles.js +++ b/src/screens/communities/view/communitiesScreenStyles.js @@ -45,4 +45,7 @@ export default EStyleSheet.create({ marginLeft: 15, color: '$primaryBlack', }, + tabbarItem: { + flex: 1, + }, }); diff --git a/src/screens/searchResult/screen/tabs/communities/communities.js b/src/screens/searchResult/screen/tabs/communities/communities.js index c1c3e15d6..df6d582f1 100644 --- a/src/screens/searchResult/screen/tabs/communities/communities.js +++ b/src/screens/searchResult/screen/tabs/communities/communities.js @@ -8,7 +8,7 @@ import { FilterBar, UserAvatar } from '../../../../../components'; import CommunitiesList from './communitiesList'; import { CommunitiesPlaceHolder } from '../../../../../components/basicUIElements'; -import CommunitiesContainer from '../../../container/communitiesContainer'; +//import CommunitiesContainer from '../../../container/communitiesContainer'; import styles from '../topics/topicsResultsStyles'; import DEFAULT_IMAGE from '../../../../../assets/no_image.png'; import Tag from '../../../../../components/basicUIElements/view/tag/tagView'; @@ -31,20 +31,21 @@ const CommunitiesScreen = ({ navigation, searchValue }) => { }; return ( - - {({ data, allSubscriptions, handleOnPress, handleSubscribeButtonPress, isLoggedIn }) => ( - <> - {/* */} - - )} - + // + // {({ data, allSubscriptions, handleOnPress, handleSubscribeButtonPress, isLoggedIn }) => ( + // <> + // {/* */} + // + // )} + // + <> ); }; From 563618e173645b4d6ab35c885e3a6d6edabb389d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Sun, 17 Jan 2021 19:54:48 +0300 Subject: [PATCH 039/362] finish communities screen --- src/components/communitiesList/index.js | 1 - .../communitiesList/view/communitiesList.js | 6 +- .../view/CommunitiesListItem.js | 9 +- .../view/communitiesListItemStyles.js | 5 + src/components/index.js | 4 + .../subscribedCommunitiesList/index.js | 4 + .../view/subscribedCommunitiesListStyles.js | 51 +++ .../view/subscribedCommunitiesListView.js | 84 +++++ src/redux/actions/communitiesAction.js | 46 ++- src/redux/reducers/communitiesReducer.js | 320 ++++++++++++++---- .../container/communitiesContainer.js | 145 ++++---- .../communities/view/communitiesScreen.js | 58 ++-- 12 files changed, 553 insertions(+), 180 deletions(-) create mode 100644 src/components/subscribedCommunitiesList/index.js create mode 100644 src/components/subscribedCommunitiesList/view/subscribedCommunitiesListStyles.js create mode 100644 src/components/subscribedCommunitiesList/view/subscribedCommunitiesListView.js diff --git a/src/components/communitiesList/index.js b/src/components/communitiesList/index.js index 48417abad..e5b3872fe 100644 --- a/src/components/communitiesList/index.js +++ b/src/components/communitiesList/index.js @@ -1,4 +1,3 @@ -import { CommunityListItem } from '../basicUIElements'; import CommunitiesList from './view/communitiesList'; export default CommunitiesList; diff --git a/src/components/communitiesList/view/communitiesList.js b/src/components/communitiesList/view/communitiesList.js index 6f7b32da0..26ecf9d51 100644 --- a/src/components/communitiesList/view/communitiesList.js +++ b/src/components/communitiesList/view/communitiesList.js @@ -10,6 +10,7 @@ import styles from './communitiesListStyles'; const CommunitiesList = ({ data, + subscribingCommunities, handleOnPress, handleSubscribeButtonPress, isLoggedIn, @@ -32,7 +33,10 @@ const CommunitiesList = ({ handleSubscribeButtonPress={handleSubscribeButtonPress} isSubscribed={item.isSubscribed} isLoggedIn={isLoggedIn} - loading={item.loading} + loading={ + subscribingCommunities.hasOwnProperty(item.name) && + subscribingCommunities[item.name].loading + } /> ); }; diff --git a/src/components/communitiesList/view/communitiesListItem/view/CommunitiesListItem.js b/src/components/communitiesList/view/communitiesListItem/view/CommunitiesListItem.js index 50fedeee4..ada99dfdd 100644 --- a/src/components/communitiesList/view/communitiesListItem/view/CommunitiesListItem.js +++ b/src/components/communitiesList/view/communitiesListItem/view/CommunitiesListItem.js @@ -27,7 +27,10 @@ const CommunitiesListItem = ({ const intl = useIntl(); const _handleSubscribeButtonPress = () => { - handleSubscribeButtonPress({ isSubscribed: !isSubscribed, communityId: name }); + handleSubscribeButtonPress( + { isSubscribed: isSubscribed, communityId: name }, + 'communitiesScreenDiscoverTab', + ); }; return ( @@ -41,7 +44,9 @@ const CommunitiesListItem = ({ {title} {isLoggedIn && (loading ? ( - + + + ) : ( { + const intl = useIntl(); + + const _renderEmptyContent = () => { + return ( + <> + + + + + ); + }; + + return ( + ind} + renderItem={({ item, index }) => ( + + + handleOnPress(item[0])}> + + + handleOnPress(item[0])}> + {item[1]} + + + + {subscribingCommunities.hasOwnProperty(item[0]) && + subscribingCommunities[item[0]].loading ? ( + + + + ) : ( + + handleSubscribeButtonPress( + { + isSubscribed: item[4], + communityId: item[0], + }, + 'communitiesScreenJoinedTab', + ) + } + /> + )} + + + )} + ListEmptyComponent={_renderEmptyContent} + /> + ); +}; + +export default SubscribedCommunitiesListView; diff --git a/src/redux/actions/communitiesAction.js b/src/redux/actions/communitiesAction.js index e07c37de4..3ae39cfc2 100644 --- a/src/redux/actions/communitiesAction.js +++ b/src/redux/actions/communitiesAction.js @@ -61,19 +61,26 @@ export const fetchSubscribedCommunitiesFail = (payload) => ({ }); // Subscribe Community -export const subscribeCommunity = (currentAccount, pin, data, successToastText, failToastText) => { +export const subscribeCommunity = ( + currentAccount, + pin, + data, + successToastText, + failToastText, + screen, +) => { return (dispatch) => { - dispatch({ type: SUBSCRIBE_COMMUNITY, payload: data }); + dispatch({ type: SUBSCRIBE_COMMUNITY, payload: { ...data, screen } }); subscribeCommunityReq(currentAccount, pin, data) - .then((res) => dispatch(subscribeCommunitySuccess(data, successToastText))) - .catch((err) => dispatch(subscribeCommunityFail(err, data, failToastText))); + .then((res) => dispatch(subscribeCommunitySuccess(data, successToastText, screen))) + .catch((err) => dispatch(subscribeCommunityFail(err, data, failToastText, screen))); }; }; -export const subscribeCommunitySuccess = (data, successToastText) => { +export const subscribeCommunitySuccess = (data, successToastText, screen) => { return (dispatch) => [ dispatch({ - payload: data, + payload: { ...data, screen }, type: SUBSCRIBE_COMMUNITY_SUCCESS, }), dispatch({ @@ -83,10 +90,10 @@ export const subscribeCommunitySuccess = (data, successToastText) => { ]; }; -export const subscribeCommunityFail = (error, data, failToastText) => { +export const subscribeCommunityFail = (error, data, failToastText, screen) => { return (dispatch) => [ dispatch({ - payload: data, + payload: { ...data, screen }, type: SUBSCRIBE_COMMUNITY_FAIL, }), dispatch({ @@ -97,19 +104,26 @@ export const subscribeCommunityFail = (error, data, failToastText) => { }; // Leave Community -export const leaveCommunity = (currentAccount, pin, data, successToastText, failToastText) => { +export const leaveCommunity = ( + currentAccount, + pin, + data, + successToastText, + failToastText, + screen, +) => { return (dispatch) => { - dispatch({ type: LEAVE_COMMUNITY, payload: data }); + dispatch({ type: LEAVE_COMMUNITY, payload: { ...data, screen } }); subscribeCommunityReq(currentAccount, pin, data) - .then((res) => dispatch(leaveCommunitySuccess(data, successToastText))) - .catch((err) => dispatch(leaveCommunityFail(err, data, failToastText))); + .then((res) => dispatch(leaveCommunitySuccess(data, successToastText, screen))) + .catch((err) => dispatch(leaveCommunityFail(err, data, failToastText, screen))); }; }; -export const leaveCommunitySuccess = (data, successToastText) => { +export const leaveCommunitySuccess = (data, successToastText, screen) => { return (dispatch) => [ dispatch({ - payload: data, + payload: { ...data, screen }, type: LEAVE_COMMUNITY_SUCCESS, }), dispatch({ @@ -119,10 +133,10 @@ export const leaveCommunitySuccess = (data, successToastText) => { ]; }; -export const leaveCommunityFail = (error, data, failToastText) => { +export const leaveCommunityFail = (error, data, failToastText, screen) => { return (dispatch) => [ dispatch({ - payload: data, + payload: { ...data, screen }, type: LEAVE_COMMUNITY_FAIL, }), dispatch({ diff --git a/src/redux/reducers/communitiesReducer.js b/src/redux/reducers/communitiesReducer.js index 7d9c682ed..197983194 100644 --- a/src/redux/reducers/communitiesReducer.js +++ b/src/redux/reducers/communitiesReducer.js @@ -31,6 +31,20 @@ const initialState = { // error: false, //} }, + subscribingCommunitiesInCommunitiesScreenDiscoverTab: { + //['name']: { + // isSubscribed: false, + // loading: false, + // error: false, + //} + }, + subscribingCommunitiesInCommunitiesScreenJoinedTab: { + //['name']: { + // isSubscribed: false, + // loading: false, + // error: false, + //} + }, }; export default function (state = initialState, action) { @@ -90,77 +104,251 @@ export default function (state = initialState, action) { }, }; case SUBSCRIBE_COMMUNITY: - return { - ...state, - subscribingCommunitiesInFeedScreen: { - ...state.subscribingCommunitiesInFeedScreen, - [action.payload.communityId]: { - isSubscribed: false, - loading: true, - error: false, - }, - }, - }; + switch (action.payload.screen) { + case 'communitiesScreenDiscoverTab': + return { + ...state, + subscribingCommunitiesInCommunitiesScreenDiscoverTab: { + ...state.subscribingCommunitiesInCommunitiesScreenDiscoverTab, + [action.payload.communityId]: { + isSubscribed: false, + loading: true, + error: false, + }, + }, + }; + case 'communitiesScreenJoinedTab': + return { + ...state, + subscribingCommunitiesInCommunitiesScreenJoinedTab: { + ...state.subscribingCommunitiesInCommunitiesScreenJoinedTab, + [action.payload.communityId]: { + isSubscribed: false, + loading: true, + error: false, + }, + }, + }; + case 'feedScreen': + return { + ...state, + subscribingCommunitiesInFeedScreen: { + ...state.subscribingCommunitiesInFeedScreen, + [action.payload.communityId]: { + isSubscribed: false, + loading: true, + error: false, + }, + }, + }; + default: + return state; + } case SUBSCRIBE_COMMUNITY_SUCCESS: - return { - ...state, - subscribingCommunitiesInFeedScreen: { - ...state.subscribingCommunitiesInFeedScreen, - [action.payload.communityId]: { - isSubscribed: true, - loading: false, - error: false, - }, - }, - }; + switch (action.payload.screen) { + case 'communitiesScreenDiscoverTab': + return { + ...state, + subscribingCommunitiesInCommunitiesScreenDiscoverTab: { + ...state.subscribingCommunitiesInCommunitiesScreenDiscoverTab, + [action.payload.communityId]: { + isSubscribed: true, + loading: false, + error: false, + }, + }, + }; + case 'communitiesScreenJoinedTab': + return { + ...state, + subscribingCommunitiesInCommunitiesScreenJoinedTab: { + ...state.subscribingCommunitiesInCommunitiesScreenJoinedTab, + [action.payload.communityId]: { + isSubscribed: true, + loading: false, + error: false, + }, + }, + }; + case 'feedScreen': + return { + ...state, + subscribingCommunitiesInFeedScreen: { + ...state.subscribingCommunitiesInFeedScreen, + [action.payload.communityId]: { + isSubscribed: true, + loading: false, + error: false, + }, + }, + }; + default: + return state; + } case SUBSCRIBE_COMMUNITY_FAIL: - return { - ...state, - subscribingCommunitiesInFeedScreen: { - ...state.subscribingCommunitiesInFeedScreen, - [action.payload.communityId]: { - isSubscribed: false, - loading: false, - error: true, - }, - }, - }; + switch (action.payload.screen) { + case 'communitiesScreenDiscoverTab': + return { + ...state, + subscribingCommunitiesInCommunitiesScreenDiscoverTab: { + ...state.subscribingCommunitiesInCommunitiesScreenDiscoverTab, + [action.payload.communityId]: { + isSubscribed: false, + loading: false, + error: true, + }, + }, + }; + case 'communitiesScreenJoinedTab': + return { + ...state, + subscribingCommunitiesInCommunitiesScreenJoinedTab: { + ...state.subscribingCommunitiesInCommunitiesScreenJoinedTab, + [action.payload.communityId]: { + isSubscribed: false, + loading: false, + error: true, + }, + }, + }; + case 'feedScreen': + return { + ...state, + subscribingCommunitiesInFeedScreen: { + ...state.subscribingCommunitiesInFeedScreen, + [action.payload.communityId]: { + isSubscribed: false, + loading: false, + error: true, + }, + }, + }; + default: + return state; + } case LEAVE_COMMUNITY: - return { - ...state, - subscribingCommunitiesInFeedScreen: { - ...state.subscribingCommunitiesInFeedScreen, - [action.payload.communityId]: { - isSubscribed: true, - loading: true, - error: false, - }, - }, - }; + switch (action.payload.screen) { + case 'communitiesScreenDiscoverTab': + return { + ...state, + subscribingCommunitiesInCommunitiesScreenDiscoverTab: { + ...state.subscribingCommunitiesInCommunitiesScreenDiscoverTab, + [action.payload.communityId]: { + isSubscribed: true, + loading: true, + error: false, + }, + }, + }; + case 'communitiesScreenJoinedTab': + return { + ...state, + subscribingCommunitiesInCommunitiesScreenJoinedTab: { + ...state.subscribingCommunitiesInCommunitiesScreenJoinedTab, + [action.payload.communityId]: { + isSubscribed: true, + loading: true, + error: false, + }, + }, + }; + case 'feedScreen': + return { + ...state, + subscribingCommunitiesInFeedScreen: { + ...state.subscribingCommunitiesInFeedScreen, + [action.payload.communityId]: { + isSubscribed: true, + loading: true, + error: false, + }, + }, + }; + default: + return state; + } case LEAVE_COMMUNITY_SUCCESS: - return { - ...state, - subscribingCommunitiesInFeedScreen: { - ...state.subscribingCommunitiesInFeedScreen, - [action.payload.communityId]: { - isSubscribed: false, - loading: false, - error: false, - }, - }, - }; + switch (action.payload.screen) { + case 'communitiesScreenDiscoverTab': + return { + ...state, + subscribingCommunitiesInCommunitiesScreenDiscoverTab: { + ...state.subscribingCommunitiesInCommunitiesScreenDiscoverTab, + [action.payload.communityId]: { + isSubscribed: false, + loading: false, + error: false, + }, + }, + }; + case 'communitiesScreenJoinedTab': + return { + ...state, + subscribingCommunitiesInCommunitiesScreenJoinedTab: { + ...state.subscribingCommunitiesInCommunitiesScreenJoinedTab, + [action.payload.communityId]: { + isSubscribed: false, + loading: false, + error: false, + }, + }, + }; + case 'feedScreen': + return { + ...state, + subscribingCommunitiesInFeedScreen: { + ...state.subscribingCommunitiesInFeedScreen, + [action.payload.communityId]: { + isSubscribed: false, + loading: false, + error: false, + }, + }, + }; + default: + return state; + } case LEAVE_COMMUNITY_FAIL: - return { - ...state, - subscribingCommunitiesInFeedScreen: { - ...state.subscribingCommunitiesInFeedScreen, - [action.payload.communityId]: { - isSubscribed: true, - loading: false, - error: true, - }, - }, - }; + switch (action.payload.screen) { + case 'communitiesScreenDiscoverTab': + return { + ...state, + subscribingCommunitiesInCommunitiesScreenDiscoverTab: { + ...state.subscribingCommunitiesInCommunitiesScreenDiscoverTab, + [action.payload.communityId]: { + isSubscribed: true, + loading: false, + error: true, + }, + }, + }; + case 'communitiesScreenJoinedTab': + return { + ...state, + subscribingCommunitiesInCommunitiesScreenJoinedTab: { + ...state.subscribingCommunitiesInCommunitiesScreenJoinedTab, + [action.payload.communityId]: { + isSubscribed: true, + loading: false, + error: true, + }, + }, + }; + case 'feedScreen': + return { + ...state, + subscribingCommunitiesInFeedScreen: { + ...state.subscribingCommunitiesInFeedScreen, + [action.payload.communityId]: { + isSubscribed: true, + loading: false, + error: true, + }, + }, + }; + default: + return state; + } default: return state; } diff --git a/src/screens/communities/container/communitiesContainer.js b/src/screens/communities/container/communitiesContainer.js index 2545ffbf9..162a05e83 100644 --- a/src/screens/communities/container/communitiesContainer.js +++ b/src/screens/communities/container/communitiesContainer.js @@ -6,13 +6,10 @@ import { useIntl } from 'react-intl'; import ROUTES from '../../../constants/routeNames'; -import { - getCommunities, - getSubscriptions, - subscribeCommunity, -} from '../../../providers/hive/dhive'; +import { getCommunities, getSubscriptions } from '../../../providers/hive/dhive'; import { toastNotification } from '../../../redux/actions/uiAction'; +import { subscribeCommunity, leaveCommunity } from '../../../redux/actions/communitiesAction'; const CommunitiesContainer = ({ children, navigation }) => { const dispatch = useDispatch(); @@ -23,16 +20,22 @@ const CommunitiesContainer = ({ children, navigation }) => { const currentAccount = useSelector((state) => state.account.currentAccount); const pinCode = useSelector((state) => state.application.pin); + const subscribingCommunitiesInDiscoverTab = useSelector( + (state) => state.communities.subscribingCommunitiesInCommunitiesScreenDiscoverTab, + ); + const subscribingCommunitiesInJoinedTab = useSelector( + (state) => state.communities.subscribingCommunitiesInCommunitiesScreenJoinedTab, + ); useEffect(() => { getSubscriptions(currentAccount.username).then((subs) => { + subs.forEach((item) => item.push(true)); getCommunities('', 50, '', 'rank').then((communities) => { communities.forEach((community) => Object.assign(community, { isSubscribed: subs.some( (subscribedCommunity) => subscribedCommunity[0] === community.name, ), - loading: false, }), ); @@ -42,6 +45,58 @@ const CommunitiesContainer = ({ children, navigation }) => { }); }, []); + useEffect(() => { + const discoversData = [...discovers]; + + Object.keys(subscribingCommunitiesInDiscoverTab).map((communityId) => { + if (!subscribingCommunitiesInDiscoverTab[communityId].loading) { + if (!subscribingCommunitiesInDiscoverTab[communityId].error) { + if (subscribingCommunitiesInDiscoverTab[communityId].isSubscribed) { + discoversData.forEach((item) => { + if (item.name === communityId) { + item.isSubscribed = true; + } + }); + } else { + discoversData.forEach((item) => { + if (item.name === communityId) { + item.isSubscribed = false; + } + }); + } + } + } + }); + + setDiscovers(discoversData); + }, [subscribingCommunitiesInDiscoverTab]); + + useEffect(() => { + const subscribedsData = [...subscriptions]; + + Object.keys(subscribingCommunitiesInJoinedTab).map((communityId) => { + if (!subscribingCommunitiesInJoinedTab[communityId].loading) { + if (!subscribingCommunitiesInJoinedTab[communityId].error) { + if (subscribingCommunitiesInJoinedTab[communityId].isSubscribed) { + subscribedsData.forEach((item) => { + if (item[0] === communityId) { + item[4] = true; + } + }); + } else { + subscribedsData.forEach((item) => { + if (item[0] === communityId) { + item[4] = false; + } + }); + } + } + } + }); + + setSubscriptions(subscribedsData); + }, [subscribingCommunitiesInJoinedTab]); + // Component Functions const _handleOnPress = (name) => { navigation.navigate({ @@ -52,60 +107,34 @@ const CommunitiesContainer = ({ children, navigation }) => { }); }; - const _handleSubscribeButtonPress = (_data) => { - const subscribedCommunityIndex = discovers.findIndex( - (community) => community.name === _data.communityId, - ); + const _handleSubscribeButtonPress = (data, screen) => { + let subscribeAction; + let successToastText = ''; + let failToastText = ''; - const newDiscovers = [ - ...discovers.slice(0, subscribedCommunityIndex), - Object.assign({}, discovers[subscribedCommunityIndex], { loading: true }), - ...discovers.slice(subscribedCommunityIndex + 1), - ]; + if (!data.isSubscribed) { + subscribeAction = subscribeCommunity; - setDiscovers(newDiscovers); - - subscribeCommunity(currentAccount, pinCode, _data) - .then(() => { - const updatedDiscovers = [ - ...discovers.slice(0, subscribedCommunityIndex), - Object.assign({}, discovers[subscribedCommunityIndex], { - loading: false, - isSubscribed: _data.isSubscribed, - }), - ...discovers.slice(subscribedCommunityIndex + 1), - ]; - - setDiscovers(updatedDiscovers); - - dispatch( - toastNotification( - intl.formatMessage({ - id: 'alert.success_subscribe', - }), - ), - ); - }) - .catch((error) => { - const updatedDiscovers = [ - ...discovers.slice(0, subscribedCommunityIndex), - Object.assign({}, discovers[subscribedCommunityIndex], { - loading: false, - isSubscribed: !_data.isSubscribed, - }), - ...discovers.slice(subscribedCommunityIndex + 1), - ]; - - setDiscovers(updatedDiscovers); - - dispatch( - toastNotification( - intl.formatMessage({ - id: 'alert.fail_subscribe', - }), - ), - ); + successToastText = intl.formatMessage({ + id: 'alert.success_subscribe', }); + failToastText = intl.formatMessage({ + id: 'alert.fail_subscribe', + }); + } else { + subscribeAction = leaveCommunity; + + successToastText = intl.formatMessage({ + id: 'alert.success_leave', + }); + failToastText = intl.formatMessage({ + id: 'alert.fail_leave', + }); + } + + dispatch( + subscribeAction(currentAccount, pinCode, data, successToastText, failToastText, screen), + ); }; return ( @@ -113,6 +142,8 @@ const CommunitiesContainer = ({ children, navigation }) => { children({ subscriptions, discovers, + subscribingCommunitiesInDiscoverTab, + subscribingCommunitiesInJoinedTab, handleOnPress: _handleOnPress, handleSubscribeButtonPress: _handleSubscribeButtonPress, }) diff --git a/src/screens/communities/view/communitiesScreen.js b/src/screens/communities/view/communitiesScreen.js index a58805c37..409d62299 100644 --- a/src/screens/communities/view/communitiesScreen.js +++ b/src/screens/communities/view/communitiesScreen.js @@ -6,8 +6,14 @@ import { SafeAreaView } from 'react-navigation'; import ScrollableTabView from 'react-native-scrollable-tab-view'; // Components -import { FilterBar, UserAvatar, TabBar, BasicHeader } from '../../../components'; -import CommunitiesList from '../../../components/communitiesList'; +import { + FilterBar, + UserAvatar, + TabBar, + BasicHeader, + CommunitiesList, + SubscribedCommunitiesList, +} from '../../../components'; import { CommunitiesPlaceHolder } from '../../../components/basicUIElements'; import CommunitiesContainer from '../container/communitiesContainer'; @@ -42,7 +48,14 @@ const CommunitiesScreen = ({ navigation, searchValue }) => { return ( - {({ subscriptions, discovers, handleOnPress, handleSubscribeButtonPress }) => { + {({ + subscriptions, + discovers, + handleOnPress, + handleSubscribeButtonPress, + subscribingCommunitiesInDiscoverTab, + subscribingCommunitiesInJoinedTab, + }) => { console.log(subscriptions, discovers); return ( @@ -61,41 +74,11 @@ const CommunitiesScreen = ({ navigation, searchValue }) => { tabLabel={intl.formatMessage({ id: 'communities.joined' })} style={styles.tabbarItem} > - `${item}-${ind}`} - renderItem={({ item, index }) => ( - - - handleOnPress(item[0])}> - - - handleOnPress(item[0])}> - {item[1]} - - - - - handleSubscribeButtonPress({ - isSubscribed: true, - communityId: item[0], - }) - } - /> - - - )} - ListEmptyComponent={_renderEmptyContent} + subscribingCommunities={subscribingCommunitiesInJoinedTab} + handleSubscribeButtonPress={handleSubscribeButtonPress} + handleOnPress={handleOnPress} /> { > Date: Mon, 18 Jan 2021 00:51:59 +0300 Subject: [PATCH 040/362] searchResults bug fix stuff --- .../container/postsResultsContainer.js | 54 ++++++++++--------- .../container/topicsResultsContainer.js | 5 +- .../searchResult/screen/searchResultScreen.js | 1 + src/utils/communityValidation.js | 4 +- 4 files changed, 38 insertions(+), 26 deletions(-) diff --git a/src/screens/searchResult/container/postsResultsContainer.js b/src/screens/searchResult/container/postsResultsContainer.js index dfe9b4b05..2a1010c71 100644 --- a/src/screens/searchResult/container/postsResultsContainer.js +++ b/src/screens/searchResult/container/postsResultsContainer.js @@ -17,34 +17,40 @@ const PostsResultsContainer = ({ children, navigation, searchValue, currentAccou setData([]); if (searchValue) { - search({ q: searchValue, sort }).then((res) => { - setScrollId(res.scroll_id); - setData(res.results); - }); - } else { - getPromotePosts() - .then((result) => { - return Promise.all( - result.map((item) => - getPost( - get(item, 'author'), - get(item, 'permlink'), - currentAccountUsername, - true, - ).then((post) => { - post.author_rep = post.author_reputation; - post.body = (post.summary && post.summary.substring(0, 130)) || ''; - return post; - }), - ), - ); + search({ q: searchValue, sort }) + .then((res) => { + setScrollId(res.scroll_id); + setData(res.results); }) - .then((result) => { - setData(result); - }); + .catch((err) => console.log(err, 'search error')); + } else { + getInitialPosts().then((res) => { + console.log(res, 'res'); + // setData(res); + }); } }, [searchValue, sort]); + const getInitialPosts = async () => { + const promoteds = await getPromotePosts(); + + return await Promise.all( + promoteds.map(async (item) => { + const post = await getPost( + get(item, 'author'), + get(item, 'permlink'), + currentAccountUsername, + true, + ); + + post.author_rep = post.author_reputation; + post.body = (post.summary && post.summary.substring(0, 130)) || ''; + // return await call to your function + return post; + }), + ); + }; + // Component Functions const _handleOnPress = (item) => { diff --git a/src/screens/searchResult/container/topicsResultsContainer.js b/src/screens/searchResult/container/topicsResultsContainer.js index 190cdbafd..6c2e49d02 100644 --- a/src/screens/searchResult/container/topicsResultsContainer.js +++ b/src/screens/searchResult/container/topicsResultsContainer.js @@ -7,6 +7,7 @@ import ROUTES from '../../../constants/routeNames'; import { getTrendingTags } from '../../../providers/hive/dhive'; import { getLeaderboard } from '../../../providers/ecency/ecency'; +import { isCommunity } from '../../../utils/communityValidation'; const OtherResultContainer = (props) => { const [tags, setTags] = useState([]); @@ -17,7 +18,9 @@ const OtherResultContainer = (props) => { setTags([]); getTrendingTags(searchValue).then((res) => { - setTags(res); + const data = res.filter((item) => !isCommunity(item.name)); + console.log(data, 'data'); + setTags(data); }); }, [searchValue]); diff --git a/src/screens/searchResult/screen/searchResultScreen.js b/src/screens/searchResult/screen/searchResultScreen.js index 6a5552c45..11032f86b 100644 --- a/src/screens/searchResult/screen/searchResultScreen.js +++ b/src/screens/searchResult/screen/searchResultScreen.js @@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react'; import { View, SafeAreaView } from 'react-native'; import ScrollableTabView from 'react-native-scrollable-tab-view'; import { useIntl } from 'react-intl'; +import { debounce } from 'lodash'; // Components import { SearchInput, TabBar } from '../../../components'; diff --git a/src/utils/communityValidation.js b/src/utils/communityValidation.js index 52ccf9f3e..11faf4e8f 100644 --- a/src/utils/communityValidation.js +++ b/src/utils/communityValidation.js @@ -1,5 +1,7 @@ +import { isNumber } from 'lodash'; + export const isCommunity = (text) => { - if (/^hive-\d+/.test(text) && text.length === 11) { + if (/^hive-\d+/.test(text) && text.length === 11 && isNumber(Number(text.split('-')[1]))) { return true; } From 245e6bd9ca1afc1ad478a3f1ff7d402422849e36 Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 18 Jan 2021 11:08:07 +0200 Subject: [PATCH 041/362] scalepx --- src/components/postCard/view/postCardView.js | 3 ++- src/components/postListItem/view/postListItemView.js | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/postCard/view/postCardView.js b/src/components/postCard/view/postCardView.js index 1d747f7aa..dac027623 100644 --- a/src/components/postCard/view/postCardView.js +++ b/src/components/postCard/view/postCardView.js @@ -6,6 +6,7 @@ import { injectIntl } from 'react-intl'; // Utils import { getTimeFromNow } from '../../../utils/time'; +import scalePx from '../../../utils/scalePx'; // Components import { PostHeaderDescription } from '../../postElements'; @@ -108,7 +109,7 @@ const PostCardView = ({ handleOnPressItem(id)}> setCalcImgHeight((evt.nativeEvent.height / evt.nativeEvent.width) * width) From 6066c58d43fecafb4d316ef2fe5cdf27c0b1b3ac Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 18 Jan 2021 13:49:57 +0200 Subject: [PATCH 042/362] add progressive thumbnail loading --- package.json | 1 + src/components/index.js | 1 + src/components/postCard/view/postCardView.js | 36 ++++++------ .../postListItem/view/postListItemView.js | 36 +++++++----- src/components/progressiveImage/index.js | 57 +++++++++++++++++++ src/screens/drafts/screen/draftsScreen.js | 4 +- src/utils/image.js | 8 ++- src/utils/postParser.js | 1 + yarn.lock | 5 ++ 9 files changed, 114 insertions(+), 35 deletions(-) create mode 100644 src/components/progressiveImage/index.js diff --git a/package.json b/package.json index e3cd54c91..7a8454525 100644 --- a/package.json +++ b/package.json @@ -75,6 +75,7 @@ "react-native-gesture-handler": "^1.4.1", "react-native-iap": "3.4.15", "react-native-image-crop-picker": "^0.26.1", + "react-native-image-size": "^1.1.3", "react-native-image-zoom-viewer": "^2.2.27", "react-native-keyboard-aware-scroll-view": "^0.9.1", "react-native-linear-gradient": "^2.4.2", diff --git a/src/components/index.js b/src/components/index.js index a46c84ecd..4c778930d 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -33,6 +33,7 @@ import { PostForm } from './postForm'; import { PostHeaderDescription, PostBody, Tags } from './postElements'; import { PostListItem } from './postListItem'; import { ProfileSummary } from './profileSummary'; +import { ProgressiveImage } from './progressiveImage'; import { SearchInput } from './searchInput'; import { SearchModal } from './searchModal'; diff --git a/src/components/postCard/view/postCardView.js b/src/components/postCard/view/postCardView.js index dac027623..3c0140e78 100644 --- a/src/components/postCard/view/postCardView.js +++ b/src/components/postCard/view/postCardView.js @@ -1,8 +1,8 @@ import React, { Component, useState, useEffect } from 'react'; import get from 'lodash/get'; import { TouchableOpacity, Text, View, Dimensions } from 'react-native'; -import FastImage from 'react-native-fast-image'; import { injectIntl } from 'react-intl'; +import ImageSize from 'react-native-image-size'; // Utils import { getTimeFromNow } from '../../../utils/time'; @@ -19,10 +19,13 @@ import { Upvote } from '../../upvote'; import styles from './postCardStyles'; // Defaults -import DEFAULT_IMAGE from '../../../assets/no_image.png'; -import NSFW_IMAGE from '../../../assets/nsfw.png'; +import ProgressiveImage from '../../progressiveImage'; -const { width, height } = Dimensions.get('window'); +const dim = Dimensions.get('window'); +const DEFAULT_IMAGE = + 'https://images.ecency.com/DQmT8R33geccEjJfzZEdsRHpP3VE8pu3peRCnQa1qukU4KR/no_image_3x.png'; +const NSFW_IMAGE = + 'https://images.ecency.com/DQmZ1jW4p7o5GyoqWyCib1fSLE2ftbewsMCt2GvbmT9kmoY/nsfw_3x.png'; const PostCardView = ({ handleOnUserPress, @@ -39,7 +42,7 @@ const PostCardView = ({ }) => { const [rebloggedBy, setRebloggedBy] = useState(get(content, 'reblogged_by[0]', null)); const [activeVot, setActiveVot] = useState(activeVotes); - const [calcImgHeight, setCalcImgHeight] = useState(0); + const [calcImgHeight, setCalcImgHeight] = useState(300); //console.log(activeVotes); // Component Functions @@ -66,11 +69,16 @@ const PostCardView = ({ const _getPostImage = (content, isNsfwPost) => { if (content && content.image) { if (isNsfwPost && content.nsfw) { - return NSFW_IMAGE; + return { image: NSFW_IMAGE, thumbnail: NSFW_IMAGE }; } - return { uri: content.image, priority: FastImage.priority.high }; + //console.log(content) + ImageSize.getSize(content.image).then((size) => { + setCalcImgHeight((size.height / size.width) * dim.width); + }); + return { image: content.image, thumbnail: content.thumbnail }; + } else { + return { image: DEFAULT_IMAGE, thumbnail: DEFAULT_IMAGE }; } - return DEFAULT_IMAGE; }; useEffect(() => { @@ -106,17 +114,13 @@ const PostCardView = ({ {!isHideImage && ( - - setCalcImgHeight((evt.nativeEvent.height / evt.nativeEvent.width) * width) - } /> )} diff --git a/src/components/postListItem/view/postListItemView.js b/src/components/postListItem/view/postListItemView.js index 36c8ff8df..08d8d964f 100644 --- a/src/components/postListItem/view/postListItemView.js +++ b/src/components/postListItem/view/postListItemView.js @@ -1,8 +1,8 @@ -import React, { useRef, useState, Fragment } from 'react'; +import React, { useRef, useState, useEffect, Fragment } from 'react'; import ActionSheet from 'react-native-actionsheet'; import { View, Text, TouchableOpacity, Dimensions } from 'react-native'; import { injectIntl } from 'react-intl'; -import FastImage from 'react-native-fast-image'; +import ImageSize from 'react-native-image-size'; // Utils import { getTimeFromNow } from '../../../utils/time'; @@ -11,14 +11,16 @@ import scalePx from '../../../utils/scalePx'; // Components import { PostHeaderDescription } from '../../postElements'; import { IconButton } from '../../iconButton'; - -// Defaults -import DEFAULT_IMAGE from '../../../assets/no_image.png'; +import ProgressiveImage from '../../progressiveImage'; // Styles import styles from './postListItemStyles'; -const { width, height } = Dimensions.get('window'); +// Defaults +const DEFAULT_IMAGE = + 'https://images.ecency.com/DQmT8R33geccEjJfzZEdsRHpP3VE8pu3peRCnQa1qukU4KR/no_image_3x.png'; + +const dim = Dimensions.get('window'); const PostListItemView = ({ title, @@ -28,6 +30,7 @@ const PostListItemView = ({ reputation, created, image, + thumbnail, handleOnPressItem, handleOnRemoveItem, id, @@ -35,9 +38,15 @@ const PostListItemView = ({ isFormatedDate, }) => { const actionSheet = useRef(null); - const [calcImgHeight, setCalcImgHeight] = useState(0); + const [calcImgHeight, setCalcImgHeight] = useState(300); // Component Life Cycles - + useEffect(() => { + if (image) { + ImageSize.getSize(image.uri).then((size) => { + setCalcImgHeight((size.height / size.width) * dim.width); + }); + } + }, []); // Component Functions return ( @@ -63,16 +72,13 @@ const PostListItemView = ({ handleOnPressItem(id)}> - - setCalcImgHeight((evt.nativeEvent.height / evt.nativeEvent.width) * width) - } /> {title} diff --git a/src/components/progressiveImage/index.js b/src/components/progressiveImage/index.js new file mode 100644 index 000000000..734fc9afa --- /dev/null +++ b/src/components/progressiveImage/index.js @@ -0,0 +1,57 @@ +import React from 'react'; +import { View, StyleSheet, Animated } from 'react-native'; + +const styles = StyleSheet.create({ + imageOverlay: { + position: 'absolute', + left: 0, + right: 0, + bottom: 0, + top: 0, + }, + container: { + backgroundColor: '#f6f6f6', + }, +}); + +class ProgressiveImage extends React.Component { + thumbnailAnimated = new Animated.Value(0); + + imageAnimated = new Animated.Value(0); + + handleThumbnailLoad = () => { + Animated.timing(this.thumbnailAnimated, { + toValue: 1, + }).start(); + }; + + onImageLoad = () => { + Animated.timing(this.imageAnimated, { + toValue: 1, + }).start(); + }; + + render() { + const { thumbnailSource, source, style, ...props } = this.props; + + return ( + + + + + ); + } +} + +export default ProgressiveImage; diff --git a/src/screens/drafts/screen/draftsScreen.js b/src/screens/drafts/screen/draftsScreen.js index 247b38a24..4c2ba126d 100644 --- a/src/screens/drafts/screen/draftsScreen.js +++ b/src/screens/drafts/screen/draftsScreen.js @@ -47,6 +47,7 @@ const DraftsScreen = ({ const tags = item.tags ? item.tags.split(/[ ,]+/) : []; const tag = tags[0] || ''; const image = catchDraftImage(item.body); + const thumbnail = catchDraftImage(item.body, 'match', true); const summary = postBodySummary({ item, last_update: item.created }, 100); const isSchedules = type === 'schedules'; @@ -57,7 +58,8 @@ const DraftsScreen = ({ title={item.title} summary={summary} isFormatedDate={isSchedules} - image={image ? { uri: catchDraftImage(item.body) } : null} + image={image ? { uri: image } : null} + thumbnail={thumbnail ? { uri: thumbnail } : null} username={currentAccount.name} reputation={currentAccount.reputation} handleOnPressItem={() => (isSchedules ? setSelectedId(item._id) : editDraft(item._id))} diff --git a/src/utils/image.js b/src/utils/image.js index a71b1d7b7..a9f91540a 100644 --- a/src/utils/image.js +++ b/src/utils/image.js @@ -63,14 +63,16 @@ export const catchEntryImage = (entry, width = 0, height = 0, format = 'match') return null; }; -export const catchDraftImage = (body, format = 'match') => { +export const catchDraftImage = (body, format = 'match', thumbnail = false) => { const imgRegex = /(https?:\/\/.*\.(?:tiff?|jpe?g|gif|png|svg|ico|PNG|GIF|JPG))/g; format = whatOs === 'android' ? 'webp' : 'match'; if (body && imgRegex.test(body)) { const imageMatch = body.match(imgRegex); - - return proxifyImageSrc(imageMatch[0], 0, 0, format); + if (thumbnail) { + return proxifyImageSrc(imageMatch[0], 60, 50, format); + } + return proxifyImageSrc(imageMatch[0], 600, 500, format); } return null; }; diff --git a/src/utils/postParser.js b/src/utils/postParser.js index e633cce4f..6d7f8ca22 100644 --- a/src/utils/postParser.js +++ b/src/utils/postParser.js @@ -33,6 +33,7 @@ export const parsePost = (post, currentUserName, isPromoted) => { post.json_metadata = {}; } post.image = catchPostImage(post.body, 600, 500, webp ? 'webp' : 'match'); + post.thumbnail = catchPostImage(post.body, 60, 50, webp ? 'webp' : 'match'); post.author_reputation = getReputation(post.author_reputation); post.avatar = getResizedAvatar(get(post, 'author')); diff --git a/yarn.lock b/yarn.lock index 6d3da8f86..ac93de96e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7538,6 +7538,11 @@ react-native-image-pan-zoom@^2.1.9: resolved "https://registry.yarnpkg.com/react-native-image-pan-zoom/-/react-native-image-pan-zoom-2.1.12.tgz#eb98bf56fb5610379bdbfdb63219cc1baca98fd2" integrity sha512-BF66XeP6dzuANsPmmFsJshM2Jyh/Mo1t8FsGc1L9Q9/sVP8MJULDabB1hms+eAoqgtyhMr5BuXV3E1hJ5U5H6Q== +react-native-image-size@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/react-native-image-size/-/react-native-image-size-1.1.3.tgz#7d69c2cd4e1d1632947867e47643ed8cabb9de27" + integrity sha512-jJvN6CjXVAm69LAVZNV7m7r50Qk9vuPZwLyrbs/k31/3Xs8bZyVCdvfP44FuBisITn/yFsiOo6i8NPrFBPH20w== + react-native-image-zoom-viewer@^2.2.27: version "2.2.27" resolved "https://registry.yarnpkg.com/react-native-image-zoom-viewer/-/react-native-image-zoom-viewer-2.2.27.tgz#fb3314c5dc86ac33da48cb31bf4920d97eecb6eb" From 70e82e20421114bca5cc12a6fed803c3cdbd6865 Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 18 Jan 2021 13:54:38 +0200 Subject: [PATCH 043/362] unmounting fix --- src/components/postListItem/view/postListItemView.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/components/postListItem/view/postListItemView.js b/src/components/postListItem/view/postListItemView.js index 08d8d964f..dd9b22cdb 100644 --- a/src/components/postListItem/view/postListItemView.js +++ b/src/components/postListItem/view/postListItemView.js @@ -41,11 +41,17 @@ const PostListItemView = ({ const [calcImgHeight, setCalcImgHeight] = useState(300); // Component Life Cycles useEffect(() => { + let _isMounted = false; if (image) { - ImageSize.getSize(image.uri).then((size) => { - setCalcImgHeight((size.height / size.width) * dim.width); - }); + if (!_isMounted) { + ImageSize.getSize(image.uri).then((size) => { + setCalcImgHeight((size.height / size.width) * dim.width); + }); + } } + return () => { + _isMounted = true; + }; }, []); // Component Functions From b51a8833f4ca8e2abfd085f383cbde739d257a56 Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 18 Jan 2021 14:00:24 +0200 Subject: [PATCH 044/362] remove scalepx --- src/components/postCard/view/postCardView.js | 3 +-- src/components/postListItem/view/postListItemView.js | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/postCard/view/postCardView.js b/src/components/postCard/view/postCardView.js index 3c0140e78..e220c0c8d 100644 --- a/src/components/postCard/view/postCardView.js +++ b/src/components/postCard/view/postCardView.js @@ -6,7 +6,6 @@ import ImageSize from 'react-native-image-size'; // Utils import { getTimeFromNow } from '../../../utils/time'; -import scalePx from '../../../utils/scalePx'; // Components import { PostHeaderDescription } from '../../postElements'; @@ -119,7 +118,7 @@ const PostCardView = ({ thumbnailSource={{ uri: _image.thumbnail }} style={[ styles.thumbnail, - { width: scalePx(dim.width - 16), height: Math.min(calcImgHeight, dim.height) }, + { width: dim.width - 16, height: Math.min(calcImgHeight, dim.height) }, ]} /> )} diff --git a/src/components/postListItem/view/postListItemView.js b/src/components/postListItem/view/postListItemView.js index dd9b22cdb..cfe1fff07 100644 --- a/src/components/postListItem/view/postListItemView.js +++ b/src/components/postListItem/view/postListItemView.js @@ -6,7 +6,6 @@ import ImageSize from 'react-native-image-size'; // Utils import { getTimeFromNow } from '../../../utils/time'; -import scalePx from '../../../utils/scalePx'; // Components import { PostHeaderDescription } from '../../postElements'; @@ -83,7 +82,7 @@ const PostListItemView = ({ thumbnailSource={thumbnail} style={[ styles.thumbnail, - { width: scalePx(dim.width - 16), height: Math.min(calcImgHeight, dim.height) }, + { width: dim.width - 16, height: Math.min(calcImgHeight, dim.height) }, ]} /> From 46b1118f634d9ca3341fca30ea7b7155a2a2fa4b Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 18 Jan 2021 14:29:54 +0200 Subject: [PATCH 045/362] fix caching issue and remove fallbacks --- .../upvote/container/upvoteContainer.js | 19 +++++++-------- src/containers/steemWalletContainer.js | 6 ++--- src/providers/hive/dhive.js | 12 ++++------ src/utils/wallet.js | 24 +++++-------------- 4 files changed, 23 insertions(+), 38 deletions(-) diff --git a/src/components/upvote/container/upvoteContainer.js b/src/components/upvote/container/upvoteContainer.js index 497528403..d8ffaeaa3 100644 --- a/src/components/upvote/container/upvoteContainer.js +++ b/src/components/upvote/container/upvoteContainer.js @@ -87,23 +87,22 @@ class UpvoteContainer extends PureComponent { const quote = get(globalProps, 'quote', 0); const sbdPrintRate = get(globalProps, 'sbdPrintRate', 0); const SBD_PRINT_RATE_MAX = 10000; - const percent_steem_dollars = - (content.percent_hbd || content.percent_steem_dollars || 10000) / 20000; + const percent_steem_dollars = (content.percent_hbd || 10000) / 20000; - const pending_payout_sbd = pendingPayout * percent_steem_dollars; + const pending_payout_hbd = pendingPayout * percent_steem_dollars; const price_per_steem = base / quote; - const pending_payout_sp = (pendingPayout - pending_payout_sbd) / price_per_steem; - const pending_payout_printed_sbd = pending_payout_sbd * (sbdPrintRate / SBD_PRINT_RATE_MAX); - const pending_payout_printed_steem = - (pending_payout_sbd - pending_payout_printed_sbd) / price_per_steem; + const pending_payout_hp = (pendingPayout - pending_payout_hbd) / price_per_steem; + const pending_payout_printed_hbd = pending_payout_hbd * (sbdPrintRate / SBD_PRINT_RATE_MAX); + const pending_payout_printed_hive = + (pending_payout_hbd - pending_payout_printed_hbd) / price_per_steem; const breakdownPayout = - pending_payout_printed_sbd.toFixed(3) + + pending_payout_printed_hbd.toFixed(3) + ' HBD, ' + - pending_payout_printed_steem.toFixed(3) + + pending_payout_printed_hive.toFixed(3) + ' HIVE, ' + - pending_payout_sp.toFixed(3) + + pending_payout_hp.toFixed(3) + ' HP'; return ( diff --git a/src/containers/steemWalletContainer.js b/src/containers/steemWalletContainer.js index ffda1d76a..3714ec5be 100644 --- a/src/containers/steemWalletContainer.js +++ b/src/containers/steemWalletContainer.js @@ -144,9 +144,9 @@ const WalletContainer = ({ const _isHasUnclaimedRewards = (account) => { return ( - parseToken(get(account, 'reward_steem_balance', account.reward_hive_balance)) > 0 || - parseToken(get(account, 'reward_sbd_balance', account.reward_hbd_balance)) > 0 || - parseToken(get(account, 'reward_vesting_steem', account.reward_vesting_hive)) > 0 + parseToken(get(account, 'reward_hive_balance')) > 0 || + parseToken(get(account, 'reward_hbd_balance')) > 0 || + parseToken(get(account, 'reward_vesting_hive')) > 0 ); }; diff --git a/src/providers/hive/dhive.js b/src/providers/hive/dhive.js index df187e969..258f178af 100644 --- a/src/providers/hive/dhive.js +++ b/src/providers/hive/dhive.js @@ -86,12 +86,10 @@ export const fetchGlobalProps = async () => { } const steemPerMVests = - (parseToken( - get(globalDynamic, 'total_vesting_fund_steem', globalDynamic.total_vesting_fund_hive), - ) / + (parseToken(get(globalDynamic, 'total_vesting_fund_hive')) / parseToken(get(globalDynamic, 'total_vesting_shares'))) * 1e6; - const sbdPrintRate = get(globalDynamic, 'sbd_print_rate', globalDynamic.hbd_print_rate); + const sbdPrintRate = get(globalDynamic, 'hbd_print_rate'); const base = parseAsset(get(feedHistory, 'current_median_history.base')).amount; const quote = parseAsset(get(feedHistory, 'current_median_history.quote')).amount; const fundRecentClaims = get(rewardFund, 'recent_claims'); @@ -216,17 +214,17 @@ export const getUser = async (user, loggedIn = true) => { _account.steem_power = await vestToSteem( _account.vesting_shares, globalProperties.total_vesting_shares, - globalProperties.total_vesting_fund_steem || globalProperties.total_vesting_fund_hive, + globalProperties.total_vesting_fund_hive, ); _account.received_steem_power = await vestToSteem( get(_account, 'received_vesting_shares'), get(globalProperties, 'total_vesting_shares'), - get(globalProperties, 'total_vesting_fund_steem', globalProperties.total_vesting_fund_hive), + get(globalProperties, 'total_vesting_fund_hive'), ); _account.delegated_steem_power = await vestToSteem( get(_account, 'delegated_vesting_shares'), get(globalProperties, 'total_vesting_shares'), - get(globalProperties, 'total_vesting_fund_steem', globalProperties.total_vesting_fund_hive), + get(globalProperties, 'total_vesting_fund_hive'), ); if (has(_account, 'posting_json_metadata')) { diff --git a/src/utils/wallet.js b/src/utils/wallet.js index c9d5b833a..c6f6d5f09 100644 --- a/src/utils/wallet.js +++ b/src/utils/wallet.js @@ -81,11 +81,7 @@ export const groomingTransactionData = (transaction, steemPerMVests) => { } break; case 'claim_reward_balance': - let { - reward_sbd: rewardSdb = opData.reward_hbd, - reward_steem: rewardSteem = opData.reward_hive, - reward_vests: rewardVests, - } = opData; + let { reward_hbd: rewardSdb, reward_hive: rewardSteem, reward_vests: rewardVests } = opData; rewardSdb = parseToken(rewardSdb).toFixed(3).replace(',', '.'); rewardSteem = parseToken(rewardSteem).toFixed(3).replace(',', '.'); @@ -192,15 +188,9 @@ export const groomingWalletData = async (user, globalProps, userCurrency) => { const [userdata] = state; // TODO: move them to utils these so big for a lifecycle function - walletData.rewardSteemBalance = parseToken( - userdata.reward_hive_balance || userdata.reward_steem_balance, - ); - walletData.rewardSbdBalance = parseToken( - userdata.reward_hbd_balance || userdata.reward_sbd_balance, - ); - walletData.rewardVestingSteem = parseToken( - userdata.reward_vesting_hive || userdata.reward_vesting_steem, - ); + walletData.rewardSteemBalance = parseToken(userdata.reward_hive_balance); + walletData.rewardSbdBalance = parseToken(userdata.reward_hbd_balance); + walletData.rewardVestingSteem = parseToken(userdata.reward_vesting_hive); walletData.hasUnclaimedRewards = walletData.rewardSteemBalance > 0 || walletData.rewardSbdBalance > 0 || @@ -211,11 +201,9 @@ export const groomingWalletData = async (user, globalProps, userCurrency) => { walletData.vestingSharesReceived = parseToken(userdata.received_vesting_shares); walletData.vestingSharesTotal = walletData.vestingShares - walletData.vestingSharesDelegated + walletData.vestingSharesReceived; - walletData.sbdBalance = parseToken(userdata.hbd_balance || userdata.sbd_balance); + walletData.sbdBalance = parseToken(userdata.hbd_balance); walletData.savingBalance = parseToken(userdata.savings_balance); - walletData.savingBalanceSbd = parseToken( - userdata.savings_hbd_balance || userdata.savings_sbd_balance, - ); + walletData.savingBalanceSbd = parseToken(userdata.savings_hbd_balance); const feedHistory = await getFeedHistory(); const base = parseToken(feedHistory.current_median_history.base); From 69a2f13e2ef0c7b7e221b9a0ddf1e7155b862d5d Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 18 Jan 2021 14:31:08 +0200 Subject: [PATCH 046/362] update render helper --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 7a8454525..560fde1fd 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ }, "dependencies": { "@babel/runtime": "^7.5.5", - "@ecency/render-helper": "^2.0.11", + "@ecency/render-helper": "^2.0.15", "@esteemapp/dhive": "0.15.0", "@esteemapp/react-native-autocomplete-input": "^4.2.1", "@esteemapp/react-native-modal-popover": "^0.0.15", diff --git a/yarn.lock b/yarn.lock index ac93de96e..d2ee0338d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -698,10 +698,10 @@ exec-sh "^0.3.2" minimist "^1.2.0" -"@ecency/render-helper@^2.0.11": - version "2.0.11" - resolved "https://registry.yarnpkg.com/@ecency/render-helper/-/render-helper-2.0.11.tgz#faa140a318aa6c2a693cfb3d21f3e8b1821cdb8e" - integrity sha512-g9lDtdB3yrta3pHQodPQQbFIkg3kCrVvcKhrqUrl2JY0hYreKUlmRzGWobJFphyAoXnUubrTW/l8p4N3hUwteg== +"@ecency/render-helper@^2.0.15": + version "2.0.15" + resolved "https://registry.yarnpkg.com/@ecency/render-helper/-/render-helper-2.0.15.tgz#8e78a2d771d44dc6e77bf63bbf786589cf11a772" + integrity sha512-II3TAdSy3pCqcuWgL81ZJ8N8jVrQR5rosxA8kGc40/vHeoDPhgLmUUxmykJVZUubejOTtowyIpjSu8g7sJkXRg== dependencies: he "^1.2.0" lru-cache "^5.1.1" From 390d8b43fe7593698e6d6de47e36682f4e03168c Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 18 Jan 2021 15:06:43 +0200 Subject: [PATCH 047/362] body parsing disable on feed --- src/providers/hive/dhive.js | 4 ++-- src/utils/postParser.js | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/providers/hive/dhive.js b/src/providers/hive/dhive.js index 258f178af..273ef2a11 100644 --- a/src/providers/hive/dhive.js +++ b/src/providers/hive/dhive.js @@ -457,7 +457,7 @@ export const getRankedPosts = async (query, currentUserName, filterNsfw) => { let posts = await client.call('bridge', 'get_ranked_posts', query); if (posts) { - posts = parsePosts(posts, currentUserName, true); + posts = parsePosts(posts, currentUserName); if (filterNsfw !== '0') { const updatedPosts = filterNsfwPost(posts, filterNsfw); @@ -475,7 +475,7 @@ export const getAccountPosts = async (query, currentUserName, filterNsfw) => { let posts = await client.call('bridge', 'get_account_posts', query); if (posts) { - posts = parsePosts(posts, currentUserName, true); + posts = parsePosts(posts, currentUserName); if (filterNsfw !== '0') { const updatedPosts = filterNsfwPost(posts, filterNsfw); diff --git a/src/utils/postParser.js b/src/utils/postParser.js index 6d7f8ca22..8aad0576d 100644 --- a/src/utils/postParser.js +++ b/src/utils/postParser.js @@ -13,13 +13,13 @@ const webp = Platform.OS === 'ios' ? false : true; export const parsePosts = (posts, currentUserName) => { if (posts) { - const formattedPosts = posts.map((post) => parsePost(post, currentUserName)); + const formattedPosts = posts.map((post) => parsePost(post, currentUserName, false, true)); return formattedPosts; } return null; }; -export const parsePost = (post, currentUserName, isPromoted) => { +export const parsePost = (post, currentUserName, isPromoted, isList = false) => { if (!post) { return null; } @@ -36,8 +36,9 @@ export const parsePost = (post, currentUserName, isPromoted) => { post.thumbnail = catchPostImage(post.body, 60, 50, webp ? 'webp' : 'match'); post.author_reputation = getReputation(post.author_reputation); post.avatar = getResizedAvatar(get(post, 'author')); - - post.body = renderPostBody(post, true, webp); + if (!isList) { + post.body = renderPostBody(post, true, webp); + } post.summary = postBodySummary(post, 150); post.is_declined_payout = parseAsset(post.max_accepted_payout).amount === 0; From b04318557496f13dfa3416f163139cd0e90cbe2c Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 18 Jan 2021 16:02:10 +0200 Subject: [PATCH 048/362] react-native-image-crop-picker --- ios/Ecency.xcodeproj/project.pbxproj | 14 +++++++------- ios/Podfile.lock | 21 +++++++++++---------- package.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/ios/Ecency.xcodeproj/project.pbxproj b/ios/Ecency.xcodeproj/project.pbxproj index 3ce5ee0e5..43297c5af 100644 --- a/ios/Ecency.xcodeproj/project.pbxproj +++ b/ios/Ecency.xcodeproj/project.pbxproj @@ -43,7 +43,7 @@ 05B6C4B024C306CE00B7FA60 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 980BC9BC0D3B4AC69645C842 /* Zocial.ttf */; }; 0A1D279E0D3CD306C889592E /* libPods-Ecency-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7093E51BBC0EE2F41AB19EBA /* libPods-Ecency-tvOS.a */; }; 1CD0B89E258019B600A7D78E /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1CD0B89B258019B600A7D78E /* GoogleService-Info.plist */; }; - 2B3CF3607B7CB9B7296FD5EF /* (null) in Frameworks */ = {isa = PBXBuildFile; }; + 2B3CF3607B7CB9B7296FD5EF /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; 2D02E4BC1E0B4A80006451C7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; 2D02E4BD1E0B4A84006451C7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; @@ -55,7 +55,7 @@ CFAA2A599FD65F360D9B3E1E /* libPods-EcencyTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B344CAA24725C973F48BE81E /* libPods-EcencyTests.a */; }; D71EB20EDB9B987C0574BAFE /* libPods-EcencyTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C97456BE898C00B5EDA21C2E /* libPods-EcencyTests.a */; }; DC0E25610BB5F49AFF4514AD /* libPods-Ecency.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 388DF3FF85F08109F722083B /* libPods-Ecency.a */; }; - F77F6C7E54F3C783A2773E9D /* (null) in Frameworks */ = {isa = PBXBuildFile; }; + F77F6C7E54F3C783A2773E9D /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -204,8 +204,8 @@ buildActionMask = 2147483647; files = ( 05B6C49424C306CE00B7FA60 /* StoreKit.framework in Frameworks */, - F77F6C7E54F3C783A2773E9D /* (null) in Frameworks */, - 2B3CF3607B7CB9B7296FD5EF /* (null) in Frameworks */, + F77F6C7E54F3C783A2773E9D /* BuildFile in Frameworks */, + 2B3CF3607B7CB9B7296FD5EF /* BuildFile in Frameworks */, DC0E25610BB5F49AFF4514AD /* libPods-Ecency.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -752,7 +752,7 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Ecency/Pods-Ecency-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/QBImagePickerController/QBImagePicker.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle", "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf", "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf", "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf", @@ -769,7 +769,7 @@ "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Octicons.ttf", "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf", "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Zocial.ttf", - "${PODS_ROOT}/RSKImageCropper/RSKImageCropper/RSKImageCropperStrings.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( @@ -790,7 +790,7 @@ "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Octicons.ttf", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SimpleLineIcons.ttf", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Zocial.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RSKImageCropperStrings.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 640541d01..f9be9b3d3 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -145,7 +145,6 @@ PODS: - nanopb/encode (1.30905.0) - PromisesObjC (1.2.9) - Protobuf (3.12.0) - - QBImagePickerController (3.4.0) - RCTRequired (0.61.5) - RCTTypeSafety (0.61.5): - FBLazyVector (= 0.61.5) @@ -398,11 +397,15 @@ PODS: - React - RNIap (3.4.15): - React - - RNImageCropPicker (0.26.2): - - QBImagePickerController + - RNImageCropPicker (0.35.2): - React-Core - React-RCTImage - - RSKImageCropper + - RNImageCropPicker/QBImagePickerController (= 0.35.2) + - TOCropViewController + - RNImageCropPicker/QBImagePickerController (0.35.2): + - React-Core + - React-RCTImage + - TOCropViewController - RNReanimated (1.13.2): - React-Core - RNScreens (2.10.1): @@ -411,13 +414,13 @@ PODS: - React - RNVectorIcons (6.7.0): - React - - RSKImageCropper (2.2.3) - SDWebImage (5.8.4): - SDWebImage/Core (= 5.8.4) - SDWebImage/Core (5.8.4) - SDWebImageWebPCoder (0.6.1): - libwebp (~> 1.0) - SDWebImage/Core (~> 5.7) + - TOCropViewController (2.6.0) - toolbar-android (0.1.0-rc.2): - React - Yoga (1.14.0) @@ -506,10 +509,9 @@ SPEC REPOS: - nanopb - PromisesObjC - Protobuf - - QBImagePickerController - - RSKImageCropper - SDWebImage - SDWebImageWebPCoder + - TOCropViewController EXTERNAL SOURCES: appcenter-analytics: @@ -661,7 +663,6 @@ SPEC CHECKSUMS: nanopb: c43f40fadfe79e8b8db116583945847910cbabc9 PromisesObjC: b48e0338dbbac2207e611750777895f7a5811b75 Protobuf: 2793fcd0622a00b546c60e7cbbcc493e043e9bb9 - QBImagePickerController: d54cf93db6decf26baf6ed3472f336ef35cae022 RCTRequired: b153add4da6e7dbc44aebf93f3cf4fcae392ddf1 RCTTypeSafety: 9aa1b91d7f9310fc6eadc3cf95126ffe818af320 React: b6a59ef847b2b40bb6e0180a97d0ca716969ac78 @@ -701,14 +702,14 @@ SPEC CHECKSUMS: RNFBMessaging: 3bb7dcf398789ce359a9f6b97b83472a3090f65a RNGestureHandler: b6b359bb800ae399a9c8b27032bdbf7c18f08a08 RNIap: b4c77c8bc4501203f4b743126a05da23f10f40b4 - RNImageCropPicker: 9d1a7eea4f8368fc479cbd2bf26459bd3c74d9aa + RNImageCropPicker: 9e0bf18cf4184a846fed55747c8e622208b39947 RNReanimated: e03f7425cb7a38dcf1b644d680d1bfc91c3337ad RNScreens: b748efec66e095134c7166ca333b628cd7e6f3e2 RNSVG: 8ba35cbeb385a52fd960fd28db9d7d18b4c2974f RNVectorIcons: 368d6d8b8301224e5ffb6254191f4f8876c2be0d - RSKImageCropper: a446db0e8444a036b34f3c43db01b2373baa4b2a SDWebImage: cf6922231e95550934da2ada0f20f2becf2ceba9 SDWebImageWebPCoder: d0dac55073088d24b2ac1b191a71a8f8d0adac21 + TOCropViewController: 3105367e808b7d3d886a74ff59bf4804e7d3ab38 toolbar-android: 85f3ef4d691469f2d304e7dee4bca013aa1ba1ff Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b diff --git a/package.json b/package.json index 560fde1fd..a679bca93 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "react-native-fast-image": "^8.3.2", "react-native-gesture-handler": "^1.4.1", "react-native-iap": "3.4.15", - "react-native-image-crop-picker": "^0.26.1", + "react-native-image-crop-picker": "^0.35.2", "react-native-image-size": "^1.1.3", "react-native-image-zoom-viewer": "^2.2.27", "react-native-keyboard-aware-scroll-view": "^0.9.1", diff --git a/yarn.lock b/yarn.lock index d2ee0338d..508708853 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7528,10 +7528,10 @@ react-native-iap@3.4.15: dependencies: dooboolab-welcome "^1.1.1" -react-native-image-crop-picker@^0.26.1: - version "0.26.2" - resolved "https://registry.yarnpkg.com/react-native-image-crop-picker/-/react-native-image-crop-picker-0.26.2.tgz#c70985ff6740e63569f90b185be0516d83f5933b" - integrity sha512-KnPtSJklwXr/BNdcyAlDp9xkDCQyJ5ZA4dM10elBc2aIXac/4CndbiPFZrwu4GlAYYYKlkiTTwTYW+h4RyGLaw== +react-native-image-crop-picker@^0.35.2: + version "0.35.2" + resolved "https://registry.yarnpkg.com/react-native-image-crop-picker/-/react-native-image-crop-picker-0.35.2.tgz#21e085e40cb5724e1e986b8eba59ef23df19598c" + integrity sha512-4nHAYwnemFJLzVJPl5dhNB+WQgNp41MLJjyYCypatMZl2GJD+EVXnu5eSUQE+UOpaIEhSVtqK5Y3OQ93hMhosQ== react-native-image-pan-zoom@^2.1.9: version "2.1.12" From d72801bf3d360510df6ff68203c3b8ba1bfff65c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Mon, 18 Jan 2021 18:34:28 +0300 Subject: [PATCH 049/362] Finish searchResults screen --- src/assets/animations/empty_screen.json | 1 + src/components/basicUIElements/index.js | 2 + .../view/emptyScreen/emptyScreenView.js | 18 +++ .../communitiesList/view/communitiesList.js | 4 +- .../view/communitiesListItem/index.js | 1 - .../view/CommunitiesListItem.js | 6 +- src/components/index.js | 2 + .../view/subscribedCommunitiesListView.js | 6 +- src/config/locales/en-US.json | 2 +- src/redux/reducers/communitiesReducer.js | 79 ++++++++++ .../communities/view/communitiesScreen.js | 2 +- .../community/screen/communityScreen.js | 4 +- .../container/communitiesContainer.js | 77 ---------- .../searchResult/screen/searchResultScreen.js | 45 +++--- .../searchResult/screen/searchResultStyles.js | 10 ++ .../best}/container/postsResultsContainer.js | 65 +++++--- .../tabs/best/{ => view}/postsResults.js | 44 +++--- .../best/{ => view}/postsResultsStyles.js | 0 .../tabs/communities/CommunitiesListItem.js | 80 ---------- .../screen/tabs/communities/communities.js | 52 ------- .../tabs/communities/communitiesList.js | 70 --------- .../communities/communitiesListItemStyles.js | 62 -------- .../tabs/communities/communitiesListStyles.js | 16 -- .../container/communitiesResultsContainer.js | 144 ++++++++++++++++++ .../communities/view/communitiesResults.js | 40 +++++ .../container/peopleResultsContainer.js | 15 +- .../tabs/people/{ => view}/peopleResults.js | 24 +-- .../people/{ => view}/peopleResultsStyles.js | 0 .../container/topicsResultsContainer.js | 27 ++-- .../tabs/topics/{ => view}/topicsResults.js | 21 +-- .../topics/{ => view}/topicsResultsStyles.js | 0 31 files changed, 450 insertions(+), 469 deletions(-) create mode 100644 src/assets/animations/empty_screen.json create mode 100644 src/components/basicUIElements/view/emptyScreen/emptyScreenView.js delete mode 100644 src/screens/searchResult/container/communitiesContainer.js rename src/screens/searchResult/{ => screen/tabs/best}/container/postsResultsContainer.js (53%) rename src/screens/searchResult/screen/tabs/best/{ => view}/postsResults.js (72%) rename src/screens/searchResult/screen/tabs/best/{ => view}/postsResultsStyles.js (100%) delete mode 100644 src/screens/searchResult/screen/tabs/communities/CommunitiesListItem.js delete mode 100644 src/screens/searchResult/screen/tabs/communities/communities.js delete mode 100644 src/screens/searchResult/screen/tabs/communities/communitiesList.js delete mode 100644 src/screens/searchResult/screen/tabs/communities/communitiesListItemStyles.js delete mode 100644 src/screens/searchResult/screen/tabs/communities/communitiesListStyles.js create mode 100644 src/screens/searchResult/screen/tabs/communities/container/communitiesResultsContainer.js create mode 100644 src/screens/searchResult/screen/tabs/communities/view/communitiesResults.js rename src/screens/searchResult/{ => screen/tabs/people}/container/peopleResultsContainer.js (72%) rename src/screens/searchResult/screen/tabs/people/{ => view}/peopleResults.js (63%) rename src/screens/searchResult/screen/tabs/people/{ => view}/peopleResultsStyles.js (100%) rename src/screens/searchResult/{ => screen/tabs/topics}/container/topicsResultsContainer.js (55%) rename src/screens/searchResult/screen/tabs/topics/{ => view}/topicsResults.js (66%) rename src/screens/searchResult/screen/tabs/topics/{ => view}/topicsResultsStyles.js (100%) diff --git a/src/assets/animations/empty_screen.json b/src/assets/animations/empty_screen.json new file mode 100644 index 000000000..985e23c13 --- /dev/null +++ b/src/assets/animations/empty_screen.json @@ -0,0 +1 @@ +{"v":"4.10.1","fr":30,"ip":0,"op":300,"w":1600,"h":800,"nm":"Sorry","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Shape Layer 4","parent":11,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p667_1_0p167_0"],"t":0,"s":[0],"e":[0]},{"i":{"x":[0.601],"y":[1]},"o":{"x":[0.402],"y":[0]},"n":["0p601_1_0p402_0"],"t":35,"s":[0],"e":[22]},{"i":{"x":[0.601],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p601_1_0p333_0"],"t":66,"s":[22],"e":[22]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p833_1_0p333_0"],"t":85,"s":[22],"e":[13]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p833_1_0p167_0"],"t":104,"s":[13],"e":[13]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p833_1_0p167_0"],"t":122,"s":[13],"e":[0]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p833_1_0p167_0"],"t":144,"s":[0],"e":[0]},{"t":299.00001217852}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":0.667},"o":{"x":0.167,"y":0.167},"n":"0p667_0p667_0p167_0p167","t":0,"s":[85.563,200.782,0],"e":[85.563,200.782,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.601,"y":1},"o":{"x":0.402,"y":0},"n":"0p601_1_0p402_0","t":35,"s":[85.563,200.782,0],"e":[44.563,200.782,0],"to":[-6.83333349227905,0,0],"ti":[6.83333349227905,0,0]},{"i":{"x":0.601,"y":0.601},"o":{"x":0.333,"y":0.333},"n":"0p601_0p601_0p333_0p333","t":66,"s":[44.563,200.782,0],"e":[44.563,200.782,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.544,"y":1},"o":{"x":0.333,"y":0},"n":"0p544_1_0p333_0","t":85,"s":[44.563,200.782,0],"e":[85.563,200.782,0],"to":[6.83333349227905,0,0],"ti":[-6.83333349227905,0,0]},{"i":{"x":0.544,"y":0.544},"o":{"x":0.167,"y":0.167},"n":"0p544_0p544_0p167_0p167","t":104,"s":[85.563,200.782,0],"e":[85.563,200.782,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.544,"y":0.544},"o":{"x":0.167,"y":0.167},"n":"0p544_0p544_0p167_0p167","t":122,"s":[85.563,200.782,0],"e":[85.563,200.782,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.544,"y":0.544},"o":{"x":0.167,"y":0.167},"n":"0p544_0p544_0p167_0p167","t":144,"s":[85.563,200.782,0],"e":[85.563,200.782,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.544,"y":0.544},"o":{"x":0.167,"y":0.167},"n":"0p544_0p544_0p167_0p167","t":165,"s":[85.563,200.782,0],"e":[85.563,200.782,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.544,"y":1},"o":{"x":0.167,"y":0},"n":"0p544_1_0p167_0","t":180,"s":[85.563,200.782,0],"e":[85.563,140.782,0],"to":[0,-10,0],"ti":[0,10,0]},{"i":{"x":0.544,"y":0.544},"o":{"x":0.167,"y":0.167},"n":"0p544_0p544_0p167_0p167","t":195,"s":[85.563,140.782,0],"e":[85.563,140.782,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.544,"y":1},"o":{"x":0.167,"y":0},"n":"0p544_1_0p167_0","t":210,"s":[85.563,140.782,0],"e":[85.563,264.782,0],"to":[0,20.6666660308838,0],"ti":[0,-20.6666660308838,0]},{"i":{"x":0.544,"y":0.544},"o":{"x":0.167,"y":0.167},"n":"0p544_0p544_0p167_0p167","t":230,"s":[85.563,264.782,0],"e":[85.563,264.782,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0},"n":"0p833_0p833_0p167_0","t":260,"s":[85.563,264.782,0],"e":[85.563,200.782,0],"to":[0,-10.6666669845581,0],"ti":[0,10.6666669845581,0]},{"t":299.00001217852}],"ix":2},"a":{"a":0,"k":[12,164,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.725,0.333,0.333],"y":[0,0,0]},"n":["0p833_1_0p725_0","0p833_1_0p333_0","0p833_1_0p333_0"],"t":66,"s":[100,100,100],"e":[100,100,100]},{"i":{"x":[0.244,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.725,0.333,0.333],"y":[0,0,0]},"n":["0p244_1_0p725_0","0p667_1_0p333_0","0p667_1_0p333_0"],"t":85,"s":[100,100,100],"e":[73,100,100]},{"i":{"x":[0.244,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"n":["0p244_1_0p167_0","0p667_1_0p167_0","0p667_1_0p167_0"],"t":104,"s":[73,100,100],"e":[73,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"n":["0p833_1_0p167_0","0p833_1_0p167_0","0p833_1_0p167_0"],"t":122,"s":[73,100,100],"e":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"n":["0p833_1_0p167_0","0p833_1_0p167_0","0p833_1_0p167_0"],"t":144,"s":[100,100,100],"e":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"n":["0p833_1_0p167_0","0p833_1_0p167_0","0p833_1_0p167_0"],"t":165,"s":[100,100,100],"e":[39,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"n":["0p833_1_0p167_0","0p833_1_0p167_0","0p833_1_0p167_0"],"t":195,"s":[39,100,100],"e":[39,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"n":["0p833_1_0p167_0","0p833_1_0p167_0","0p833_1_0p167_0"],"t":240,"s":[39,100,100],"e":[24,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"n":["0p833_1_0p167_0","0p833_1_0p167_0","0p833_1_0p167_0"],"t":260,"s":[24,100,100],"e":[100,100,100]},{"t":299.00001217852}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-48,167],[60,167]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.9647058823529412,0.9647058823529412,0.9647058823529412,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":15,"ix":5},"lc":2,"lj":1,"ml":4,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":305.000012422905,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"rast3","parent":11,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":0.667},"o":{"x":1,"y":1},"n":"0p667_0p667_1_1","t":179,"s":[155.563,88.782,0],"e":[155.563,88.782,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.505,"y":1},"o":{"x":0.506,"y":0},"n":"0p505_1_0p506_0","t":180,"s":[155.563,88.782,0],"e":[155.563,31.782,0],"to":[0,-9.5,0],"ti":[0,9.5,0]},{"i":{"x":0.505,"y":0.505},"o":{"x":0.333,"y":0.333},"n":"0p505_0p505_0p333_0p333","t":195,"s":[155.563,31.782,0],"e":[155.563,31.782,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"n":"0p667_1_0p333_0","t":210,"s":[155.563,31.782,0],"e":[155.563,88.782,0],"to":[0,9.5,0],"ti":[0,-9.5,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.506,"y":0.506},"n":"0p667_0p667_0p506_0p506","t":231,"s":[155.563,88.782,0],"e":[155.563,88.782,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.506,"y":0},"n":"0p667_1_0p506_0","t":240,"s":[155.563,88.782,0],"e":[155.563,200,0],"to":[0,18.53639793396,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.506,"y":0},"n":"0p667_1_0p506_0","t":260,"s":[155.563,200,0],"e":[155.563,88.782,0],"to":[0,0,0],"ti":[0,18.53639793396,0]},{"t":299.00001217852}],"ix":2},"a":{"a":0,"k":[-86,42,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":0,"s":[71.429,71.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":20,"s":[71.429,71.429,100],"e":[71.429,27.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":23,"s":[71.429,27.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":26,"s":[71.429,71.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":70,"s":[71.429,71.429,100],"e":[71.429,27.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":73,"s":[71.429,27.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":76,"s":[71.429,71.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":131,"s":[71.429,71.429,100],"e":[71.429,27.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":134,"s":[71.429,27.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":137,"s":[71.429,71.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":142,"s":[71.429,71.429,100],"e":[71.429,27.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":145,"s":[71.429,27.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":148,"s":[71.429,71.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":172,"s":[71.429,71.429,100],"e":[71.429,27.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":175,"s":[71.429,27.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":178,"s":[71.429,71.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":260,"s":[71.429,71.429,100],"e":[71.429,71.429,100]},{"t":299.00001217852}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[56,56],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.9647058823529412,0.9647058823529412,0.9647058823529412,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-86,42],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":305.000012422905,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"rast2","parent":11,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":0.667},"o":{"x":1,"y":1},"n":"0p667_0p667_1_1","t":179,"s":[155.563,88.782,0],"e":[155.563,88.782,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.505,"y":1},"o":{"x":0.506,"y":0},"n":"0p505_1_0p506_0","t":180,"s":[155.563,88.782,0],"e":[155.563,32.782,0],"to":[0,-9.33333301544189,0],"ti":[0,9.33333301544189,0]},{"i":{"x":0.505,"y":0.505},"o":{"x":0.333,"y":0.333},"n":"0p505_0p505_0p333_0p333","t":195,"s":[155.563,32.782,0],"e":[155.563,32.782,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"n":"0p667_1_0p333_0","t":210,"s":[155.563,32.782,0],"e":[155.563,88.782,0],"to":[0,9.33333301544189,0],"ti":[0,-9.33333301544189,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.506,"y":0.506},"n":"0p667_0p667_0p506_0p506","t":231,"s":[155.563,88.782,0],"e":[155.563,88.782,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.506,"y":0},"n":"0p667_1_0p506_0","t":240,"s":[155.563,88.782,0],"e":[155.563,200,0],"to":[0,18.53639793396,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.506,"y":0},"n":"0p667_1_0p506_0","t":260,"s":[155.563,200,0],"e":[155.563,88.782,0],"to":[0,0,0],"ti":[0,18.53639793396,0]},{"t":299.00001217852}],"ix":2},"a":{"a":0,"k":[-86,42,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":0,"s":[71.429,71.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":20,"s":[71.429,71.429,100],"e":[71.429,27.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":23,"s":[71.429,27.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":26,"s":[71.429,71.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":70,"s":[71.429,71.429,100],"e":[71.429,27.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":73,"s":[71.429,27.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":76,"s":[71.429,71.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":131,"s":[71.429,71.429,100],"e":[71.429,27.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":134,"s":[71.429,27.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":137,"s":[71.429,71.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":142,"s":[71.429,71.429,100],"e":[71.429,27.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":145,"s":[71.429,27.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":148,"s":[71.429,71.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":172,"s":[71.429,71.429,100],"e":[71.429,27.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":175,"s":[71.429,27.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":178,"s":[71.429,71.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":260,"s":[71.429,71.429,100],"e":[71.429,71.429,100]},{"t":299.00001217852}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[56,56],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-86,42],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":305.000012422905,"st":0,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"chap3","parent":11,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":0.667},"o":{"x":1,"y":1},"n":"0p667_0p667_1_1","t":179,"s":[-16.437,88.782,0],"e":[-16.437,88.782,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.505,"y":1},"o":{"x":0.506,"y":0},"n":"0p505_1_0p506_0","t":180,"s":[-16.437,88.782,0],"e":[-16.437,31.782,0],"to":[0,-9.5,0],"ti":[0,9.5,0]},{"i":{"x":0.505,"y":0.505},"o":{"x":0.333,"y":0.333},"n":"0p505_0p505_0p333_0p333","t":195,"s":[-16.437,31.782,0],"e":[-16.437,31.782,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"n":"0p667_1_0p333_0","t":210,"s":[-16.437,31.782,0],"e":[-16.437,88.782,0],"to":[0,9.5,0],"ti":[0,-9.5,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.506,"y":0.506},"n":"0p667_0p667_0p506_0p506","t":231,"s":[-16.437,88.782,0],"e":[-16.437,88.782,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.506,"y":0},"n":"0p667_1_0p506_0","t":240,"s":[-16.437,88.782,0],"e":[-16.437,200,0],"to":[0,18.53639793396,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.506,"y":0},"n":"0p667_1_0p506_0","t":260,"s":[-16.437,200,0],"e":[-16.437,88.782,0],"to":[0,0,0],"ti":[0,18.53639793396,0]},{"t":299.00001217852}],"ix":2},"a":{"a":0,"k":[-86,42,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":0,"s":[71.429,71.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":20,"s":[71.429,71.429,100],"e":[71.429,27.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":23,"s":[71.429,27.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":26,"s":[71.429,71.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":70,"s":[71.429,71.429,100],"e":[71.429,27.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":73,"s":[71.429,27.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":76,"s":[71.429,71.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":131,"s":[71.429,71.429,100],"e":[71.429,27.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":134,"s":[71.429,27.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":137,"s":[71.429,71.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":142,"s":[71.429,71.429,100],"e":[71.429,27.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":145,"s":[71.429,27.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":148,"s":[71.429,71.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":172,"s":[71.429,71.429,100],"e":[71.429,27.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":175,"s":[71.429,27.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":178,"s":[71.429,71.429,100],"e":[71.429,71.429,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":260,"s":[71.429,71.429,100],"e":[71.429,71.429,100]},{"t":299.00001217852}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[56,56],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.9647058823529412,0.9647058823529412,0.9647058823529412,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-86,42],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":305.000012422905,"st":0,"bm":0},{"ddd":0,"ind":11,"ty":4,"nm":"face","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.321],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p321_1_0p167_0"],"t":0,"s":[0],"e":[0]},{"i":{"x":[0.321],"y":[1]},"o":{"x":[0.508],"y":[0]},"n":["0p321_1_0p508_0"],"t":30,"s":[0],"e":[19]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p833_1_0p333_0"],"t":60,"s":[19],"e":[19]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p833_1_0p167_0"],"t":85,"s":[19],"e":[0]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p833_1_0p167_0"],"t":108,"s":[0],"e":[0]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p833_1_0p167_0"],"t":261,"s":[0],"e":[0]},{"t":299.00001217852}],"ix":10},"p":{"a":0,"k":[797.701,478.16099999999994,0],"ix":2},"a":{"a":0,"k":[71.264,114.943,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[409.195,409.195],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.9647058823529412,0.9647058823529412,0.9647058823529412,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":8,"ix":5},"lc":1,"lj":1,"ml":4,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.20784313725490197,0.48627450980392156,0.9019607843137255,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[71.264,114.943],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[94.157,94.157],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":305.000012422905,"st":0,"bm":0},{"ddd":0,"ind":12,"ty":4,"nm":"shadow","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[800,400,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[380,26],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.9647058823529412,0.9647058823529412,0.9647058823529412,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-4,329],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[74.737,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":300.00001221925,"st":0,"bm":0}]} \ No newline at end of file diff --git a/src/components/basicUIElements/index.js b/src/components/basicUIElements/index.js index 5e4c700e9..91f72be8f 100644 --- a/src/components/basicUIElements/index.js +++ b/src/components/basicUIElements/index.js @@ -11,6 +11,7 @@ import UserListItem from './view/userListItem/userListItem'; import WalletLineItem from './view/walletLineItem/walletLineItemView'; import CommunityListItem from './view/communityListItem/communityListItem'; import Separator from './view/separator/separatorView'; +import EmptyScreen from './view/emptyScreen/emptyScreenView'; // Placeholders import ListItemPlaceHolder from './view/placeHolder/listItemPlaceHolderView'; @@ -48,4 +49,5 @@ export { WalletUnclaimedPlaceHolder, CommunitiesPlaceHolder, Separator, + EmptyScreen, }; diff --git a/src/components/basicUIElements/view/emptyScreen/emptyScreenView.js b/src/components/basicUIElements/view/emptyScreen/emptyScreenView.js new file mode 100644 index 000000000..3747d066b --- /dev/null +++ b/src/components/basicUIElements/view/emptyScreen/emptyScreenView.js @@ -0,0 +1,18 @@ +import React from 'react'; +import { View, Text } from 'react-native'; +import LottieView from 'lottie-react-native'; +import globalStyles from '../../../../globalStyles'; + +const EmptyScreenView = ({ style, textStyle }) => ( + + + Nothing found! + +); + +export default EmptyScreenView; diff --git a/src/components/communitiesList/view/communitiesList.js b/src/components/communitiesList/view/communitiesList.js index 26ecf9d51..e48b87981 100644 --- a/src/components/communitiesList/view/communitiesList.js +++ b/src/components/communitiesList/view/communitiesList.js @@ -15,6 +15,7 @@ const CommunitiesList = ({ handleSubscribeButtonPress, isLoggedIn, noResult, + screen, }) => { const _renderItem = ({ item, index }) => { return ( @@ -37,6 +38,7 @@ const CommunitiesList = ({ subscribingCommunities.hasOwnProperty(item.name) && subscribingCommunities[item.name].loading } + screen={screen} /> ); }; @@ -60,7 +62,7 @@ const CommunitiesList = ({ {!noResult && ( item.id && item.id.toString()} + keyExtractor={(item, index) => index} renderItem={_renderItem} ListEmptyComponent={_renderEmptyContent} /> diff --git a/src/components/communitiesList/view/communitiesListItem/index.js b/src/components/communitiesList/view/communitiesListItem/index.js index 41d065f4e..3f85e9387 100644 --- a/src/components/communitiesList/view/communitiesListItem/index.js +++ b/src/components/communitiesList/view/communitiesListItem/index.js @@ -1,4 +1,3 @@ -import CommunitiesList from '../../../../screens/searchResult/screen/tabs/communities/communitiesList'; import CommunitiesListItem from './view/CommunitiesListItem'; export default CommunitiesListItem; diff --git a/src/components/communitiesList/view/communitiesListItem/view/CommunitiesListItem.js b/src/components/communitiesList/view/communitiesListItem/view/CommunitiesListItem.js index ada99dfdd..7669ff6a8 100644 --- a/src/components/communitiesList/view/communitiesListItem/view/CommunitiesListItem.js +++ b/src/components/communitiesList/view/communitiesListItem/view/CommunitiesListItem.js @@ -23,14 +23,12 @@ const CommunitiesListItem = ({ isSubscribed, isLoggedIn, loading, + screen, }) => { const intl = useIntl(); const _handleSubscribeButtonPress = () => { - handleSubscribeButtonPress( - { isSubscribed: isSubscribed, communityId: name }, - 'communitiesScreenDiscoverTab', - ); + handleSubscribeButtonPress({ isSubscribed: isSubscribed, communityId: name }, screen); }; return ( diff --git a/src/components/index.js b/src/components/index.js index d05d1833c..f78a105f2 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -105,6 +105,7 @@ import { WalletLineItem, WalletUnclaimedPlaceHolder, Separator, + EmptyScreen, } from './basicUIElements'; export { @@ -207,6 +208,7 @@ export { WalletLineItem, WalletUnclaimedPlaceHolder, Separator, + EmptyScreen, HorizontalIconList, PopoverWrapper, CommunitiesList, diff --git a/src/components/subscribedCommunitiesList/view/subscribedCommunitiesListView.js b/src/components/subscribedCommunitiesList/view/subscribedCommunitiesListView.js index aff21eec1..c3afb5bb6 100644 --- a/src/components/subscribedCommunitiesList/view/subscribedCommunitiesListView.js +++ b/src/components/subscribedCommunitiesList/view/subscribedCommunitiesListView.js @@ -3,7 +3,7 @@ import { View, FlatList, TouchableOpacity, Text, ActivityIndicator } from 'react import { useIntl } from 'react-intl'; import { Tag, UserAvatar } from '../../index'; -import { CommunitiesPlaceHolder } from '../../basicUIElements'; +import { ListPlaceHolder } from '../../basicUIElements'; import DEFAULT_IMAGE from '../../../assets/no_image.png'; @@ -20,9 +20,7 @@ const SubscribedCommunitiesListView = ({ const _renderEmptyContent = () => { return ( <> - - - + ); }; diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json index e494cf4a5..f148da9b3 100644 --- a/src/config/locales/en-US.json +++ b/src/config/locales/en-US.json @@ -549,7 +549,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", diff --git a/src/redux/reducers/communitiesReducer.js b/src/redux/reducers/communitiesReducer.js index 197983194..2c850659d 100644 --- a/src/redux/reducers/communitiesReducer.js +++ b/src/redux/reducers/communitiesReducer.js @@ -45,6 +45,13 @@ const initialState = { // error: false, //} }, + subscribingCommunitiesInSearchResultsScreen: { + //['name']: { + // isSubscribed: false, + // loading: false, + // error: false, + //} + }, }; export default function (state = initialState, action) { @@ -141,6 +148,18 @@ export default function (state = initialState, action) { }, }, }; + case 'searchResultsScreen': + return { + ...state, + subscribingCommunitiesInSearchResultsScreen: { + ...state.subscribingCommunitiesInSearchResultsScreen, + [action.payload.communityId]: { + isSubscribed: false, + loading: true, + error: false, + }, + }, + }; default: return state; } @@ -182,6 +201,18 @@ export default function (state = initialState, action) { }, }, }; + case 'searchResultsScreen': + return { + ...state, + subscribingCommunitiesInSearchResultsScreen: { + ...state.subscribingCommunitiesInSearchResultsScreen, + [action.payload.communityId]: { + isSubscribed: true, + loading: false, + error: false, + }, + }, + }; default: return state; } @@ -223,6 +254,18 @@ export default function (state = initialState, action) { }, }, }; + case 'searchResultsScreen': + return { + ...state, + subscribingCommunitiesInSearchResultsScreen: { + ...state.subscribingCommunitiesInSearchResultsScreen, + [action.payload.communityId]: { + isSubscribed: false, + loading: false, + error: true, + }, + }, + }; default: return state; } @@ -264,6 +307,18 @@ export default function (state = initialState, action) { }, }, }; + case 'searchResultsScreen': + return { + ...state, + subscribingCommunitiesInSearchResultsScreen: { + ...state.subscribingCommunitiesInSearchResultsScreen, + [action.payload.communityId]: { + isSubscribed: true, + loading: true, + error: false, + }, + }, + }; default: return state; } @@ -305,6 +360,18 @@ export default function (state = initialState, action) { }, }, }; + case 'searchResultsScreen': + return { + ...state, + subscribingCommunitiesInSearchResultsScreen: { + ...state.subscribingCommunitiesInSearchResultsScreen, + [action.payload.communityId]: { + isSubscribed: false, + loading: false, + error: false, + }, + }, + }; default: return state; } @@ -346,6 +413,18 @@ export default function (state = initialState, action) { }, }, }; + case 'searchResultsScreen': + return { + ...state, + subscribingCommunitiesInSearchResultsScreen: { + ...state.subscribingCommunitiesInSearchResultsScreen, + [action.payload.communityId]: { + isSubscribed: true, + loading: false, + error: true, + }, + }, + }; default: return state; } diff --git a/src/screens/communities/view/communitiesScreen.js b/src/screens/communities/view/communitiesScreen.js index 409d62299..4d95259ff 100644 --- a/src/screens/communities/view/communitiesScreen.js +++ b/src/screens/communities/view/communitiesScreen.js @@ -56,7 +56,6 @@ const CommunitiesScreen = ({ navigation, searchValue }) => { subscribingCommunitiesInDiscoverTab, subscribingCommunitiesInJoinedTab, }) => { - console.log(subscriptions, discovers); return ( @@ -92,6 +91,7 @@ const CommunitiesScreen = ({ navigation, searchValue }) => { handleSubscribeButtonPress={handleSubscribeButtonPress} isLoggedIn={true} noResult={discovers.length === 0} + screen="communitiesScreenDiscoverTab" /> diff --git a/src/screens/community/screen/communityScreen.js b/src/screens/community/screen/communityScreen.js index 1af6dc00e..f319f669f 100644 --- a/src/screens/community/screen/communityScreen.js +++ b/src/screens/community/screen/communityScreen.js @@ -13,7 +13,7 @@ import styles from './communityStyles'; import { GLOBAL_POST_FILTERS, GLOBAL_POST_FILTERS_VALUE } from '../../../constants/options/filters'; -const TagResultScreen = ({ navigation }) => { +const CommunityScreen = ({ navigation }) => { const tag = navigation.getParam('tag', ''); const filter = navigation.getParam('filter', ''); @@ -114,4 +114,4 @@ const TagResultScreen = ({ navigation }) => { ); }; -export default TagResultScreen; +export default CommunityScreen; diff --git a/src/screens/searchResult/container/communitiesContainer.js b/src/screens/searchResult/container/communitiesContainer.js deleted file mode 100644 index 91afb9ba4..000000000 --- a/src/screens/searchResult/container/communitiesContainer.js +++ /dev/null @@ -1,77 +0,0 @@ -import { useState, useEffect } from 'react'; -import { withNavigation } from 'react-navigation'; -import { connect } from 'react-redux'; -import isEmpty from 'lodash/isEmpty'; - -import ROUTES from '../../../constants/routeNames'; - -import { - getCommunities, - getSubscriptions, - subscribeCommunity, -} from '../../../providers/hive/dhive'; - -const DEFAULT_COMMUNITIES = [ - 'hive-125125', - 'hive-174301', - 'hive-140217', - 'hive-179017', - 'hive-160545', - 'hive-194913', - 'hive-166847', - 'hive-176853', - 'hive-183196', - 'hive-163772', - 'hive-106444', -]; - -const CommunitiesContainer = ({ - children, - navigation, - searchValue, - currentAccount, - pinCode, - isLoggedIn, -}) => { - const [data, setData] = useState(DEFAULT_COMMUNITIES); - const [allSubscriptions, setAllSubscriptions] = useState([]); - - useEffect(() => { - if (searchValue !== '') { - getCommunities('', 100, searchValue, 'rank').then(setData); - } - }, [searchValue]); - - // Component Functions - const _handleOnPress = (name) => { - navigation.navigate({ - routeName: ROUTES.SCREENS.COMMUNITY, - params: { - tag: name, - }, - }); - }; - - const _handleSubscribeButtonPress = (_data) => { - return subscribeCommunity(currentAccount, pinCode, _data); - }; - - return ( - children && - children({ - data, - allSubscriptions, - handleOnPress: _handleOnPress, - handleSubscribeButtonPress: _handleSubscribeButtonPress, - isLoggedIn, - }) - ); -}; - -const mapStateToProps = (state) => ({ - currentAccount: state.account.currentAccount, - pinCode: state.application.pin, - isLoggedIn: state.application.isLoggedIn, -}); - -export default connect(mapStateToProps)(withNavigation(CommunitiesContainer)); diff --git a/src/screens/searchResult/screen/searchResultScreen.js b/src/screens/searchResult/screen/searchResultScreen.js index 11032f86b..7f388cc3a 100644 --- a/src/screens/searchResult/screen/searchResultScreen.js +++ b/src/screens/searchResult/screen/searchResultScreen.js @@ -5,11 +5,11 @@ import { useIntl } from 'react-intl'; import { debounce } from 'lodash'; // Components -import { SearchInput, TabBar } from '../../../components'; -import Communities from './tabs/communities/communities'; -import PostsResults from './tabs/best/postsResults'; -import TopicsResults from './tabs/topics/topicsResults'; -import PeopleResults from './tabs/people/peopleResults'; +import { SearchInput, TabBar, IconButton } from '../../../components'; +import Communities from './tabs/communities/view/communitiesResults'; +import PostsResults from './tabs/best/view/postsResults'; +import TopicsResults from './tabs/topics/view/topicsResults'; +import PeopleResults from './tabs/people/view/peopleResults'; // Styles import styles from './searchResultStyles'; @@ -17,17 +17,8 @@ import globalStyles from '../../../globalStyles'; const SearchResultScreen = ({ navigation }) => { const [searchValue, setSearchValue] = useState(''); - const [text, setText] = useState(''); const intl = useIntl(); - useEffect(() => { - const delayDebounceFn = setTimeout(() => { - setSearchValue(text); - }, 100); - - return () => clearTimeout(delayDebounceFn); - }, [text]); - const _navigationGoBack = () => { navigation.goBack(); }; @@ -42,14 +33,30 @@ const SearchResultScreen = ({ navigation }) => { /> ); + const _handleChangeText = debounce((value) => { + setSearchValue(value); + }, 250); + return ( - + + + + + + + + { const [data, setData] = useState([]); const [sort, setSort] = useState('relevance'); const [scrollId, setScrollId] = useState(''); + const [noResult, setNoResult] = useState(false); useEffect(() => { + setNoResult(false); setData([]); if (searchValue) { @@ -21,34 +23,48 @@ const PostsResultsContainer = ({ children, navigation, searchValue, currentAccou .then((res) => { setScrollId(res.scroll_id); setData(res.results); + if (res.results.length === 0) { + setNoResult(true); + } }) .catch((err) => console.log(err, 'search error')); } else { - getInitialPosts().then((res) => { - console.log(res, 'res'); - // setData(res); - }); + getInitialPosts(); } - }, [searchValue, sort]); + }, [searchValue]); const getInitialPosts = async () => { - const promoteds = await getPromotePosts(); + // const promoteds = await getPromotePosts(); + // return await Promise.all( + // promoteds.map(async (item) => { + // const post = await getPost( + // get(item, 'author'), + // get(item, 'permlink'), + // currentAccountUsername, + // true, + // ); + // post.author_rep = post.author_reputation; + // post.body = (post.summary && post.summary.substring(0, 130)) || ''; + // // return await call to your function + // return post; + // }), + // ); + try { + const options = { + observer: currentAccountUsername, + account: 'ecency', + limit: 7, + sort: 'blog', + }; + const _data = await getAccountPosts(options); - return await Promise.all( - promoteds.map(async (item) => { - const post = await getPost( - get(item, 'author'), - get(item, 'permlink'), - currentAccountUsername, - true, - ); - - post.author_rep = post.author_reputation; - post.body = (post.summary && post.summary.substring(0, 130)) || ''; - // return await call to your function - return post; - }), - ); + if (_data.length === 0) { + setNoResult(true); + } + setData(_data); + } catch (err) { + console.log(err); + } }; // Component Functions @@ -78,6 +94,7 @@ const PostsResultsContainer = ({ children, navigation, searchValue, currentAccou data, handleOnPress: _handleOnPress, loadMore: _loadMore, + noResult, }) ); }; diff --git a/src/screens/searchResult/screen/tabs/best/postsResults.js b/src/screens/searchResult/screen/tabs/best/view/postsResults.js similarity index 72% rename from src/screens/searchResult/screen/tabs/best/postsResults.js rename to src/screens/searchResult/screen/tabs/best/view/postsResults.js index a1eee25a2..79ec9f11b 100644 --- a/src/screens/searchResult/screen/tabs/best/postsResults.js +++ b/src/screens/searchResult/screen/tabs/best/view/postsResults.js @@ -6,15 +6,19 @@ import FastImage from 'react-native-fast-image'; import { useIntl } from 'react-intl'; // Components -import { PostHeaderDescription, FilterBar } from '../../../../../components'; -import { TextWithIcon, CommunitiesPlaceHolder } from '../../../../../components/basicUIElements'; -import PostsResultsContainer from '../../../container/postsResultsContainer'; +import { PostHeaderDescription, FilterBar } from '../../../../../../components'; +import { + TextWithIcon, + CommunitiesPlaceHolder, + EmptyScreen, +} from '../../../../../../components/basicUIElements'; +import PostsResultsContainer from '../container/postsResultsContainer'; -import { getTimeFromNow } from '../../../../../utils/time'; +import { getTimeFromNow } from '../../../../../../utils/time'; import styles from './postsResultsStyles'; -import DEFAULT_IMAGE from '../../../../../assets/no_image.png'; +import DEFAULT_IMAGE from '../../../../../../assets/no_image.png'; const filterOptions = ['relevance', 'popularity', 'newest']; @@ -79,20 +83,24 @@ const PostsResults = ({ navigation, searchValue }) => { return ( - {({ data, handleOnPress, loadMore }) => ( + {({ data, handleOnPress, loadMore, noResult }) => ( - item.id && item.id.toString()} - renderItem={({ item, index }) => ( - handleOnPress(item)}> - {_renderItem(item, index)} - - )} - onEndReached={loadMore} - ListEmptyComponent={_renderEmptyContent} - ListFooterComponent={} - /> + {noResult ? ( + + ) : ( + index} + renderItem={({ item, index }) => ( + handleOnPress(item)}> + {_renderItem(item, index)} + + )} + onEndReached={loadMore} + ListEmptyComponent={_renderEmptyContent} + ListFooterComponent={} + /> + )} )} diff --git a/src/screens/searchResult/screen/tabs/best/postsResultsStyles.js b/src/screens/searchResult/screen/tabs/best/view/postsResultsStyles.js similarity index 100% rename from src/screens/searchResult/screen/tabs/best/postsResultsStyles.js rename to src/screens/searchResult/screen/tabs/best/view/postsResultsStyles.js diff --git a/src/screens/searchResult/screen/tabs/communities/CommunitiesListItem.js b/src/screens/searchResult/screen/tabs/communities/CommunitiesListItem.js deleted file mode 100644 index 10de0c140..000000000 --- a/src/screens/searchResult/screen/tabs/communities/CommunitiesListItem.js +++ /dev/null @@ -1,80 +0,0 @@ -import React, { useState } from 'react'; -import { View, Text, TouchableOpacity } from 'react-native'; -import { useIntl } from 'react-intl'; - -import styles from './communitiesListItemStyles'; - -import { Tag } from '../../../../../components/basicUIElements'; - -const UserListItem = ({ - index, - handleOnPress, - handleOnLongPress, - title, - about, - admins, - id, - authors, - posts, - subscribers, - isNsfw, - name, - handleSubscribeButtonPress, - isSubscribed, - isLoggedIn, -}) => { - const [subscribed, setSubscribed] = useState(isSubscribed); - const intl = useIntl(); - - const _handleSubscribeButtonPress = () => { - handleSubscribeButtonPress({ subscribed: !subscribed, communityId: name }).then(() => { - setSubscribed(!subscribed); - }); - }; - - return ( - handleOnLongPress && handleOnLongPress()} - onPress={() => handleOnPress && handleOnPress(name)} - > - - - - {title} - {isLoggedIn && ( - - )} - - {!!about && {about}} - - - {`${subscribers.toString()} ${intl.formatMessage({ - id: 'search_result.communities.subscribers', - })} • ${authors.toString()} ${intl.formatMessage({ - id: 'search_result.communities.posters', - })} • ${posts} ${intl.formatMessage({ - id: 'search_result.communities.posts', - })}`} - - - - - ); -}; - -export default UserListItem; diff --git a/src/screens/searchResult/screen/tabs/communities/communities.js b/src/screens/searchResult/screen/tabs/communities/communities.js deleted file mode 100644 index df6d582f1..000000000 --- a/src/screens/searchResult/screen/tabs/communities/communities.js +++ /dev/null @@ -1,52 +0,0 @@ -import React from 'react'; -import { useIntl } from 'react-intl'; -import { FlatList, View, Text, TouchableOpacity } from 'react-native'; -import get from 'lodash/get'; - -// Components -import { FilterBar, UserAvatar } from '../../../../../components'; -import CommunitiesList from './communitiesList'; -import { CommunitiesPlaceHolder } from '../../../../../components/basicUIElements'; - -//import CommunitiesContainer from '../../../container/communitiesContainer'; -import styles from '../topics/topicsResultsStyles'; -import DEFAULT_IMAGE from '../../../../../assets/no_image.png'; -import Tag from '../../../../../components/basicUIElements/view/tag/tagView'; - -const filterOptions = ['my', 'rank', 'subs', 'new']; - -const CommunitiesScreen = ({ navigation, searchValue }) => { - const intl = useIntl(); - - const activeVotes = get(navigation, 'state.params.activeVotes'); - - const _renderEmptyContent = () => { - return ( - <> - - - - - ); - }; - - return ( - // - // {({ data, allSubscriptions, handleOnPress, handleSubscribeButtonPress, isLoggedIn }) => ( - // <> - // {/* */} - // - // )} - // - <> - ); -}; - -export default CommunitiesScreen; diff --git a/src/screens/searchResult/screen/tabs/communities/communitiesList.js b/src/screens/searchResult/screen/tabs/communities/communitiesList.js deleted file mode 100644 index da58020ab..000000000 --- a/src/screens/searchResult/screen/tabs/communities/communitiesList.js +++ /dev/null @@ -1,70 +0,0 @@ -import React from 'react'; -import { SafeAreaView, FlatList } from 'react-native'; - -// Components -import { CommunityListItem } from '../../../../../components/basicUIElements'; -import { CommunitiesPlaceHolder } from '../../../../../components/basicUIElements'; - -// Styles -import styles from './communitiesListStyles'; - -const CommunitiesList = ({ - votes, - handleOnPress, - handleSubscribeButtonPress, - allSubscriptions, - isLoggedIn, - noResult, -}) => { - const _renderItem = ({ item, index }) => { - const isSubscribed = allSubscriptions.some((sub) => sub[0] === item.name); - - return ( - - ); - }; - - const _renderEmptyContent = () => { - return ( - <> - - - - - - - - - ); - }; - - return ( - - {!noResult && ( - item.id && item.id.toString()} - renderItem={_renderItem} - ListEmptyComponent={_renderEmptyContent} - /> - )} - - ); -}; - -export default CommunitiesList; diff --git a/src/screens/searchResult/screen/tabs/communities/communitiesListItemStyles.js b/src/screens/searchResult/screen/tabs/communities/communitiesListItemStyles.js deleted file mode 100644 index 19880705c..000000000 --- a/src/screens/searchResult/screen/tabs/communities/communitiesListItemStyles.js +++ /dev/null @@ -1,62 +0,0 @@ -import EStyleSheet from 'react-native-extended-stylesheet'; - -export default EStyleSheet.create({ - container: { - padding: 8, - flexDirection: 'row', - }, - content: { - flexDirection: 'column', - marginLeft: 8, - width: '100%', - }, - itemWrapper: { - alignItems: 'center', - padding: 16, - borderRadius: 8, - flexDirection: 'row', - backgroundColor: '$primaryBackgroundColor', - }, - itemWrapperGray: { - backgroundColor: '$primaryLightBackground', - }, - title: { - color: '$primaryBlue', - fontSize: 17, - fontWeight: 'bold', - fontFamily: '$primaryFont', - }, - about: { - fontSize: 14, - fontFamily: '$primaryFont', - marginTop: 5, - paddingTop: 10, - color: '$primaryBlack', - }, - separator: { - width: 100, - alignSelf: 'center', - backgroundColor: '$primaryDarkGray', - height: 1, - marginVertical: 10, - }, - stats: { - fontSize: 14, - fontFamily: '$primaryFont', - color: '$primaryDarkGray', - paddingBottom: 10, - }, - subscribeButton: { - borderWidth: 1, - maxWidth: 75, - borderColor: '$primaryBlue', - }, - subscribeButtonText: { - textAlign: 'center', - color: '$primaryBlue', - }, - header: { - flexDirection: 'row', - justifyContent: 'space-between', - }, -}); diff --git a/src/screens/searchResult/screen/tabs/communities/communitiesListStyles.js b/src/screens/searchResult/screen/tabs/communities/communitiesListStyles.js deleted file mode 100644 index 8423a2e5e..000000000 --- a/src/screens/searchResult/screen/tabs/communities/communitiesListStyles.js +++ /dev/null @@ -1,16 +0,0 @@ -import EStyleSheet from 'react-native-extended-stylesheet'; - -export default EStyleSheet.create({ - container: { - flex: 1, - padding: 8, - marginBottom: 40, - flexDirection: 'row', - backgroundColor: '$primaryBackgroundColor', - }, - text: { - color: '$iconColor', - fontSize: 12, - fontFamily: '$primaryFont', - }, -}); diff --git a/src/screens/searchResult/screen/tabs/communities/container/communitiesResultsContainer.js b/src/screens/searchResult/screen/tabs/communities/container/communitiesResultsContainer.js new file mode 100644 index 000000000..9e9587294 --- /dev/null +++ b/src/screens/searchResult/screen/tabs/communities/container/communitiesResultsContainer.js @@ -0,0 +1,144 @@ +import { useState, useEffect } from 'react'; +import { withNavigation } from 'react-navigation'; +import { useSelector, useDispatch } from 'react-redux'; +import { useIntl } from 'react-intl'; + +import ROUTES from '../../../../../../constants/routeNames'; + +import { getCommunities, getSubscriptions } from '../../../../../../providers/hive/dhive'; + +import { + subscribeCommunity, + leaveCommunity, +} from '../../../../../../redux/actions/communitiesAction'; + +// const DEFAULT_COMMUNITIES = [ +// 'hive-125125', +// 'hive-174301', +// 'hive-140217', +// 'hive-179017', +// 'hive-160545', +// 'hive-194913', +// 'hive-166847', +// 'hive-176853', +// 'hive-183196', +// 'hive-163772', +// 'hive-106444', +// ]; + +const CommunitiesResultsContainer = ({ children, navigation, searchValue }) => { + const intl = useIntl(); + const dispatch = useDispatch(); + + const [data, setData] = useState([]); + const [noResult, setNoResult] = useState(false); + + const pinCode = useSelector((state) => state.application.pin); + const currentAccount = useSelector((state) => state.account.currentAccount); + const isLoggedIn = useSelector((state) => state.application.isLoggedIn); + const subscribingCommunities = useSelector( + (state) => state.communities.subscribingCommunitiesInSearchResultsScreen, + ); + + useEffect(() => { + setData([]); + setNoResult(false); + + getSubscriptions(currentAccount.username).then((subs) => { + getCommunities('', searchValue ? 100 : 20, searchValue, 'rank').then((communities) => { + communities.forEach((community) => + Object.assign(community, { + isSubscribed: subs.some( + (subscribedCommunity) => subscribedCommunity[0] === community.name, + ), + }), + ); + + setData(communities); + if (communities.length === 0) { + setNoResult(true); + } + }); + }); + }, [searchValue]); + + useEffect(() => { + const communitiesData = [...data]; + + Object.keys(subscribingCommunities).map((communityId) => { + if (!subscribingCommunities[communityId].loading) { + if (!subscribingCommunities[communityId].error) { + if (subscribingCommunities[communityId].isSubscribed) { + communitiesData.forEach((item) => { + if (item.name === communityId) { + item.isSubscribed = true; + } + }); + } else { + communitiesData.forEach((item) => { + if (item.name === communityId) { + item.isSubscribed = false; + } + }); + } + } + } + }); + + setData(communitiesData); + }, [subscribingCommunities]); + + // Component Functions + const _handleOnPress = (name) => { + navigation.navigate({ + routeName: ROUTES.SCREENS.COMMUNITY, + params: { + tag: name, + }, + }); + }; + + const _handleSubscribeButtonPress = (_data, screen) => { + let subscribeAction; + let successToastText = ''; + let failToastText = ''; + + if (!_data.isSubscribed) { + subscribeAction = subscribeCommunity; + + successToastText = intl.formatMessage({ + id: 'alert.success_subscribe', + }); + failToastText = intl.formatMessage({ + id: 'alert.fail_subscribe', + }); + } else { + subscribeAction = leaveCommunity; + + successToastText = intl.formatMessage({ + id: 'alert.success_leave', + }); + failToastText = intl.formatMessage({ + id: 'alert.fail_leave', + }); + } + + dispatch( + subscribeAction(currentAccount, pinCode, _data, successToastText, failToastText, screen), + ); + }; + + return ( + children && + children({ + data, + subscribingCommunities, + handleOnPress: _handleOnPress, + handleSubscribeButtonPress: _handleSubscribeButtonPress, + isLoggedIn, + noResult, + }) + ); +}; + +export default withNavigation(CommunitiesResultsContainer); diff --git a/src/screens/searchResult/screen/tabs/communities/view/communitiesResults.js b/src/screens/searchResult/screen/tabs/communities/view/communitiesResults.js new file mode 100644 index 000000000..c1af842cd --- /dev/null +++ b/src/screens/searchResult/screen/tabs/communities/view/communitiesResults.js @@ -0,0 +1,40 @@ +import React from 'react'; +import get from 'lodash/get'; + +// Components +import { CommunitiesList, EmptyScreen } from '../../../../../../components'; + +import CommunitiesResultsContainer from '../container/communitiesResultsContainer'; + +const CommunitiesResultsScreen = ({ navigation, searchValue }) => { + const activeVotes = get(navigation, 'state.params.activeVotes'); + + return ( + + {({ + data, + subscribingCommunities, + handleOnPress, + handleSubscribeButtonPress, + isLoggedIn, + noResult, + }) => + noResult ? ( + + ) : ( + + ) + } + + ); +}; + +export default CommunitiesResultsScreen; diff --git a/src/screens/searchResult/container/peopleResultsContainer.js b/src/screens/searchResult/screen/tabs/people/container/peopleResultsContainer.js similarity index 72% rename from src/screens/searchResult/container/peopleResultsContainer.js rename to src/screens/searchResult/screen/tabs/people/container/peopleResultsContainer.js index 9960fb5ea..2edc0fd76 100644 --- a/src/screens/searchResult/container/peopleResultsContainer.js +++ b/src/screens/searchResult/screen/tabs/people/container/peopleResultsContainer.js @@ -3,26 +3,34 @@ import get from 'lodash/get'; import { withNavigation } from 'react-navigation'; import { connect } from 'react-redux'; -import ROUTES from '../../../constants/routeNames'; +import ROUTES from '../../../../../../constants/routeNames'; -import { lookupAccounts } from '../../../providers/hive/dhive'; -import { getLeaderboard } from '../../../providers/ecency/ecency'; +import { lookupAccounts } from '../../../../../../providers/hive/dhive'; +import { getLeaderboard } from '../../../../../../providers/ecency/ecency'; const PeopleResultsContainer = (props) => { const [users, setUsers] = useState([]); + const [noResult, setNoResult] = useState(false); const { children, navigation, searchValue, username } = props; useEffect(() => { + setNoResult(false); setUsers([]); if (searchValue) { lookupAccounts(searchValue).then((res) => { + if (res.length === 0) { + setNoResult(true); + } setUsers(res); }); } else { getLeaderboard().then((result) => { const sos = result.map((item) => item._id); + if (sos.length === 0) { + setNoResult(true); + } setUsers(sos); }); } @@ -45,6 +53,7 @@ const PeopleResultsContainer = (props) => { children({ users, handleOnPress: _handleOnPress, + noResult, }) ); }; diff --git a/src/screens/searchResult/screen/tabs/people/peopleResults.js b/src/screens/searchResult/screen/tabs/people/view/peopleResults.js similarity index 63% rename from src/screens/searchResult/screen/tabs/people/peopleResults.js rename to src/screens/searchResult/screen/tabs/people/view/peopleResults.js index 03170e182..5dfb4f962 100644 --- a/src/screens/searchResult/screen/tabs/people/peopleResults.js +++ b/src/screens/searchResult/screen/tabs/people/view/peopleResults.js @@ -3,8 +3,12 @@ import { SafeAreaView, FlatList } from 'react-native'; import { useIntl } from 'react-intl'; // Components -import { CommunitiesPlaceHolder, UserListItem } from '../../../../../components/basicUIElements'; -import PeopleResultsContainer from '../../../container/peopleResultsContainer'; +import { + ListPlaceHolder, + EmptyScreen, + UserListItem, +} from '../../../../../../components/basicUIElements'; +import PeopleResultsContainer from '../container/peopleResultsContainer'; import styles from './peopleResultsStyles'; @@ -14,25 +18,21 @@ const PeopleResults = ({ navigation, searchValue }) => { const _renderEmptyContent = () => { return ( <> - - - - - - - + ); }; return ( - {({ users, handleOnPress }) => ( + {({ users, handleOnPress, noResult }) => ( - {users && ( + {noResult ? ( + + ) : ( `${item}-${ind}`} + keyExtractor={(item, index) => index} renderItem={({ item, index }) => ( handleOnPress(item)} diff --git a/src/screens/searchResult/screen/tabs/people/peopleResultsStyles.js b/src/screens/searchResult/screen/tabs/people/view/peopleResultsStyles.js similarity index 100% rename from src/screens/searchResult/screen/tabs/people/peopleResultsStyles.js rename to src/screens/searchResult/screen/tabs/people/view/peopleResultsStyles.js diff --git a/src/screens/searchResult/container/topicsResultsContainer.js b/src/screens/searchResult/screen/tabs/topics/container/topicsResultsContainer.js similarity index 55% rename from src/screens/searchResult/container/topicsResultsContainer.js rename to src/screens/searchResult/screen/tabs/topics/container/topicsResultsContainer.js index 6c2e49d02..03b4e4830 100644 --- a/src/screens/searchResult/container/topicsResultsContainer.js +++ b/src/screens/searchResult/screen/tabs/topics/container/topicsResultsContainer.js @@ -3,25 +3,33 @@ import get from 'lodash/get'; import { withNavigation } from 'react-navigation'; import { connect } from 'react-redux'; -import ROUTES from '../../../constants/routeNames'; +import ROUTES from '../../../../../../constants/routeNames'; -import { getTrendingTags } from '../../../providers/hive/dhive'; -import { getLeaderboard } from '../../../providers/ecency/ecency'; -import { isCommunity } from '../../../utils/communityValidation'; +import { getTrendingTags } from '../../../../../../providers/hive/dhive'; +import { getLeaderboard } from '../../../../../../providers/ecency/ecency'; +import { isCommunity } from '../../../../../../utils/communityValidation'; const OtherResultContainer = (props) => { const [tags, setTags] = useState([]); + const [noResult, setNoResult] = useState(false); const { children, navigation, searchValue, username } = props; useEffect(() => { + setNoResult(false); setTags([]); - getTrendingTags(searchValue).then((res) => { - const data = res.filter((item) => !isCommunity(item.name)); - console.log(data, 'data'); - setTags(data); - }); + if (searchValue.length > 10) { + setNoResult(true); + } else { + getTrendingTags(searchValue.trim()).then((res) => { + const data = res?.filter((item) => !isCommunity(item.name)); + if (data.length === 0) { + setNoResult(true); + } + setTags(data); + }); + } }, [searchValue]); // Component Functions @@ -40,6 +48,7 @@ const OtherResultContainer = (props) => { children({ tags, handleOnPress: _handleOnPress, + noResult, }) ); }; diff --git a/src/screens/searchResult/screen/tabs/topics/topicsResults.js b/src/screens/searchResult/screen/tabs/topics/view/topicsResults.js similarity index 66% rename from src/screens/searchResult/screen/tabs/topics/topicsResults.js rename to src/screens/searchResult/screen/tabs/topics/view/topicsResults.js index 8e5ca37e1..a4f34a6a9 100644 --- a/src/screens/searchResult/screen/tabs/topics/topicsResults.js +++ b/src/screens/searchResult/screen/tabs/topics/view/topicsResults.js @@ -3,9 +3,8 @@ import { SafeAreaView, FlatList, View, Text, TouchableOpacity } from 'react-nati import { useIntl } from 'react-intl'; // Components -import { FilterBar, UserAvatar } from '../../../../../components'; -import { CommunitiesPlaceHolder, UserListItem } from '../../../../../components/basicUIElements'; -import TopicsResultsContainer from '../../../container/topicsResultsContainer'; +import { ListPlaceHolder, EmptyScreen } from '../../../../../../components/basicUIElements'; +import TopicsResultsContainer from '../container/topicsResultsContainer'; import styles from './topicsResultsStyles'; @@ -23,25 +22,21 @@ const TopicsResults = ({ navigation, searchValue }) => { const _renderEmptyContent = () => { return ( <> - - - - - - - + ); }; return ( - {({ tags, handleOnPress }) => ( + {({ tags, handleOnPress, noResult }) => ( - {tags && ( + {noResult ? ( + + ) : ( item.id} + keyExtractor={(item, index) => index} renderItem={({ item, index }) => ( handleOnPress(item)}> {_renderTagItem(item, index)} diff --git a/src/screens/searchResult/screen/tabs/topics/topicsResultsStyles.js b/src/screens/searchResult/screen/tabs/topics/view/topicsResultsStyles.js similarity index 100% rename from src/screens/searchResult/screen/tabs/topics/topicsResultsStyles.js rename to src/screens/searchResult/screen/tabs/topics/view/topicsResultsStyles.js From cc89b2ffe6e83b691243e682d8fedcf0b5dde14a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Mon, 18 Jan 2021 22:30:13 +0300 Subject: [PATCH 050/362] Fixed github comments --- .../communitiesList/view/communitiesList.js | 2 +- .../view/subscribedCommunitiesListView.js | 2 +- src/config/locales/en-US.json | 2 +- src/providers/hive/dhive.js | 4 ++-- .../tabs/best/container/postsResultsContainer.js | 2 +- .../screen/tabs/best/view/postsResults.js | 7 +++++-- .../container/communitiesResultsContainer.js | 2 +- .../screen/tabs/people/view/peopleResults.js | 2 +- .../tabs/topics/container/topicsResultsContainer.js | 13 +++++-------- .../screen/tabs/topics/view/topicsResults.js | 2 +- src/utils/communityValidation.js | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/components/communitiesList/view/communitiesList.js b/src/components/communitiesList/view/communitiesList.js index e48b87981..155dab441 100644 --- a/src/components/communitiesList/view/communitiesList.js +++ b/src/components/communitiesList/view/communitiesList.js @@ -62,7 +62,7 @@ const CommunitiesList = ({ {!noResult && ( index} + keyExtractor={(item, index) => index.toString()} renderItem={_renderItem} ListEmptyComponent={_renderEmptyContent} /> diff --git a/src/components/subscribedCommunitiesList/view/subscribedCommunitiesListView.js b/src/components/subscribedCommunitiesList/view/subscribedCommunitiesListView.js index c3afb5bb6..43b7aef8d 100644 --- a/src/components/subscribedCommunitiesList/view/subscribedCommunitiesListView.js +++ b/src/components/subscribedCommunitiesList/view/subscribedCommunitiesListView.js @@ -28,7 +28,7 @@ const SubscribedCommunitiesListView = ({ return ( ind} + keyExtractor={(item, index) => index.toString()} renderItem={({ item, index }) => ( diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json index 2f47c56f4..7bd7a12c4 100644 --- a/src/config/locales/en-US.json +++ b/src/config/locales/en-US.json @@ -583,7 +583,7 @@ "unfollow": "Unfollow" }, "communities": { - "joined": "Joined", + "joined": "Membership", "discover": "Discover" } } diff --git a/src/providers/hive/dhive.js b/src/providers/hive/dhive.js index 273ef2a11..d236d1392 100644 --- a/src/providers/hive/dhive.js +++ b/src/providers/hive/dhive.js @@ -1138,9 +1138,9 @@ export const lookupAccounts = async (username) => { } }; -export const getTrendingTags = async (tag) => { +export const getTrendingTags = async (tag, number = 20) => { try { - const tags = await client.database.call('get_trending_tags', [tag, 20]); + const tags = await client.database.call('get_trending_tags', [tag, number]); return tags; } catch (error) { return []; diff --git a/src/screens/searchResult/screen/tabs/best/container/postsResultsContainer.js b/src/screens/searchResult/screen/tabs/best/container/postsResultsContainer.js index 24944f7cc..5f779e940 100644 --- a/src/screens/searchResult/screen/tabs/best/container/postsResultsContainer.js +++ b/src/screens/searchResult/screen/tabs/best/container/postsResultsContainer.js @@ -10,7 +10,7 @@ import { getPost, getAccountPosts } from '../../../../../../providers/hive/dhive const PostsResultsContainer = ({ children, navigation, searchValue, currentAccountUsername }) => { const [data, setData] = useState([]); - const [sort, setSort] = useState('relevance'); + const [sort, setSort] = useState('newest'); const [scrollId, setScrollId] = useState(''); const [noResult, setNoResult] = useState(false); diff --git a/src/screens/searchResult/screen/tabs/best/view/postsResults.js b/src/screens/searchResult/screen/tabs/best/view/postsResults.js index 79ec9f11b..9045546b6 100644 --- a/src/screens/searchResult/screen/tabs/best/view/postsResults.js +++ b/src/screens/searchResult/screen/tabs/best/view/postsResults.js @@ -26,12 +26,15 @@ const PostsResults = ({ navigation, searchValue }) => { const intl = useIntl(); const _renderItem = (item, index) => { + const reputation = + get(item, 'author_rep', undefined) || get(item, 'author_reputation', undefined); + return ( @@ -90,7 +93,7 @@ const PostsResults = ({ navigation, searchValue }) => { ) : ( index} + keyExtractor={(item, index) => index.toString()} renderItem={({ item, index }) => ( handleOnPress(item)}> {_renderItem(item, index)} diff --git a/src/screens/searchResult/screen/tabs/communities/container/communitiesResultsContainer.js b/src/screens/searchResult/screen/tabs/communities/container/communitiesResultsContainer.js index 9e9587294..fdc82b322 100644 --- a/src/screens/searchResult/screen/tabs/communities/container/communitiesResultsContainer.js +++ b/src/screens/searchResult/screen/tabs/communities/container/communitiesResultsContainer.js @@ -45,7 +45,7 @@ const CommunitiesResultsContainer = ({ children, navigation, searchValue }) => { setNoResult(false); getSubscriptions(currentAccount.username).then((subs) => { - getCommunities('', searchValue ? 100 : 20, searchValue, 'rank').then((communities) => { + getCommunities('', searchValue ? 250 : 20, searchValue, 'rank').then((communities) => { communities.forEach((community) => Object.assign(community, { isSubscribed: subs.some( diff --git a/src/screens/searchResult/screen/tabs/people/view/peopleResults.js b/src/screens/searchResult/screen/tabs/people/view/peopleResults.js index 5dfb4f962..5268b44d8 100644 --- a/src/screens/searchResult/screen/tabs/people/view/peopleResults.js +++ b/src/screens/searchResult/screen/tabs/people/view/peopleResults.js @@ -32,7 +32,7 @@ const PeopleResults = ({ navigation, searchValue }) => { ) : ( index} + keyExtractor={(item, index) => index.toString()} renderItem={({ item, index }) => ( handleOnPress(item)} diff --git a/src/screens/searchResult/screen/tabs/topics/container/topicsResultsContainer.js b/src/screens/searchResult/screen/tabs/topics/container/topicsResultsContainer.js index 03b4e4830..5b3c45517 100644 --- a/src/screens/searchResult/screen/tabs/topics/container/topicsResultsContainer.js +++ b/src/screens/searchResult/screen/tabs/topics/container/topicsResultsContainer.js @@ -13,16 +13,13 @@ const OtherResultContainer = (props) => { const [tags, setTags] = useState([]); const [noResult, setNoResult] = useState(false); - const { children, navigation, searchValue, username } = props; + const { children, navigation, searchValue } = props; useEffect(() => { - setNoResult(false); - setTags([]); - - if (searchValue.length > 10) { - setNoResult(true); - } else { - getTrendingTags(searchValue.trim()).then((res) => { + if (searchValue.length <= 10) { + setNoResult(false); + setTags([]); + getTrendingTags(searchValue.trim(), 100).then((res) => { const data = res?.filter((item) => !isCommunity(item.name)); if (data.length === 0) { setNoResult(true); diff --git a/src/screens/searchResult/screen/tabs/topics/view/topicsResults.js b/src/screens/searchResult/screen/tabs/topics/view/topicsResults.js index a4f34a6a9..39d0844ed 100644 --- a/src/screens/searchResult/screen/tabs/topics/view/topicsResults.js +++ b/src/screens/searchResult/screen/tabs/topics/view/topicsResults.js @@ -36,7 +36,7 @@ const TopicsResults = ({ navigation, searchValue }) => { ) : ( index} + keyExtractor={(item, index) => index.toString()} renderItem={({ item, index }) => ( handleOnPress(item)}> {_renderTagItem(item, index)} diff --git a/src/utils/communityValidation.js b/src/utils/communityValidation.js index 11faf4e8f..d8c57c688 100644 --- a/src/utils/communityValidation.js +++ b/src/utils/communityValidation.js @@ -1,7 +1,7 @@ import { isNumber } from 'lodash'; export const isCommunity = (text) => { - if (/^hive-\d+/.test(text) && text.length === 11 && isNumber(Number(text.split('-')[1]))) { + if (/hive-[1-3]\d{4,6}$/.test(text) && isNumber(Number(text.split('-')[1]))) { return true; } From 09a608adc423d763cdc66e1c4b917d944d18694e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Mon, 18 Jan 2021 22:35:11 +0300 Subject: [PATCH 051/362] Shuffle communities in initial state --- .../communities/container/communitiesResultsContainer.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/screens/searchResult/screen/tabs/communities/container/communitiesResultsContainer.js b/src/screens/searchResult/screen/tabs/communities/container/communitiesResultsContainer.js index fdc82b322..83fb08b11 100644 --- a/src/screens/searchResult/screen/tabs/communities/container/communitiesResultsContainer.js +++ b/src/screens/searchResult/screen/tabs/communities/container/communitiesResultsContainer.js @@ -2,6 +2,7 @@ import { useState, useEffect } from 'react'; import { withNavigation } from 'react-navigation'; import { useSelector, useDispatch } from 'react-redux'; import { useIntl } from 'react-intl'; +import { shuffle } from 'lodash'; import ROUTES from '../../../../../../constants/routeNames'; @@ -54,7 +55,12 @@ const CommunitiesResultsContainer = ({ children, navigation, searchValue }) => { }), ); - setData(communities); + if (searchValue) { + setData(communities); + } else { + setData(shuffle(communities)); + } + if (communities.length === 0) { setNoResult(true); } From 12499889833e636efa5af2f5bb95715f168d610c Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 18 Jan 2021 22:06:22 +0200 Subject: [PATCH 052/362] fix promise error --- ios/Podfile.lock | 2 +- src/providers/hive/dhive.js | 3 ++- .../tabs/communities/container/communitiesResultsContainer.js | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 907f97435..f9be9b3d3 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -715,4 +715,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 1f30c7da5061dbc47185442a6ab4a3c95ac48c04 -COCOAPODS: 1.10.0 +COCOAPODS: 1.9.3 diff --git a/src/providers/hive/dhive.js b/src/providers/hive/dhive.js index d236d1392..4f719deee 100644 --- a/src/providers/hive/dhive.js +++ b/src/providers/hive/dhive.js @@ -314,7 +314,8 @@ export const getCommunities = async ( resolve({}); } } catch (error) { - reject(error); + console.log(error); + resolve({}); } }); diff --git a/src/screens/searchResult/screen/tabs/communities/container/communitiesResultsContainer.js b/src/screens/searchResult/screen/tabs/communities/container/communitiesResultsContainer.js index 83fb08b11..d1373f3f5 100644 --- a/src/screens/searchResult/screen/tabs/communities/container/communitiesResultsContainer.js +++ b/src/screens/searchResult/screen/tabs/communities/container/communitiesResultsContainer.js @@ -46,7 +46,7 @@ const CommunitiesResultsContainer = ({ children, navigation, searchValue }) => { setNoResult(false); getSubscriptions(currentAccount.username).then((subs) => { - getCommunities('', searchValue ? 250 : 20, searchValue, 'rank').then((communities) => { + getCommunities('', searchValue ? 100 : 20, searchValue, 'rank').then((communities) => { communities.forEach((community) => Object.assign(community, { isSubscribed: subs.some( From 0752d04a1f96e406c4aad3bfb8d69ce4044b1fef Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 18 Jan 2021 22:17:58 +0200 Subject: [PATCH 053/362] search only posts --- .../screen/tabs/best/container/postsResultsContainer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/screens/searchResult/screen/tabs/best/container/postsResultsContainer.js b/src/screens/searchResult/screen/tabs/best/container/postsResultsContainer.js index 5f779e940..26692c24e 100644 --- a/src/screens/searchResult/screen/tabs/best/container/postsResultsContainer.js +++ b/src/screens/searchResult/screen/tabs/best/container/postsResultsContainer.js @@ -19,7 +19,7 @@ const PostsResultsContainer = ({ children, navigation, searchValue, currentAccou setData([]); if (searchValue) { - search({ q: searchValue, sort }) + search({ q: `${searchValue} type:post`, sort }) .then((res) => { setScrollId(res.scroll_id); setData(res.results); @@ -82,7 +82,7 @@ const PostsResultsContainer = ({ children, navigation, searchValue, currentAccou const _loadMore = (index, value) => { if (scrollId) { - search({ q: searchValue, sort, scroll_id: scrollId }).then((res) => { + search({ q: `${searchValue} type:post`, sort, scroll_id: scrollId }).then((res) => { setData([...data, ...res.results]); }); } From 3bde5054ffa30df34e2f708a6ceafde985a2b6fd Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 18 Jan 2021 22:19:26 +0200 Subject: [PATCH 054/362] update android gradle --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 16571d741..a34caeec6 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -27,7 +27,7 @@ buildscript { jcenter() } dependencies { - classpath('com.android.tools.build:gradle:3.5.2') + classpath('com.android.tools.build:gradle:4.0.1') classpath 'com.google.gms:google-services:4.3.3' classpath 'com.bugsnag:bugsnag-android-gradle-plugin:4.+' From 6e48a8c7ff1c3c3befc8dd0b2c49a68f4d0f8475 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:24:54 +0200 Subject: [PATCH 055/362] New translations en-US.json (Bengali) --- src/config/locales/bn-BD.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/bn-BD.json b/src/config/locales/bn-BD.json index 8e33bdbef..105a3804a 100644 --- a/src/config/locales/bn-BD.json +++ b/src/config/locales/bn-BD.json @@ -252,6 +252,7 @@ "schedules": "সময়সূচীসমূহ", "gallery": "গ্যালারি", "settings": "সেটিংস", + "communities": "Communities", "add_account": "একাউন্ট যোগ করুন", "logout": "লগআউট", "cancel": "বাতিল করুন", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "কমিউনিটি", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 13ee2f44e8bf332a2c3bcb46812d82bda8423b72 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:24:56 +0200 Subject: [PATCH 056/362] New translations en-US.json (Estonian) --- src/config/locales/et-EE.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/et-EE.json b/src/config/locales/et-EE.json index 9196d4e33..3649e9a2a 100644 --- a/src/config/locales/et-EE.json +++ b/src/config/locales/et-EE.json @@ -252,6 +252,7 @@ "schedules": "Ajakavad", "gallery": "Galerii", "settings": "Seaded", + "communities": "Communities", "add_account": "Lisa konto", "logout": "Logi välja", "cancel": "Tühista", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Jälgi", "unfollow": "Lõpeta jälgimine" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 8ee38886c2460a2e23b057dd8d56d1fd18e009a4 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:24:57 +0200 Subject: [PATCH 057/362] New translations en-US.json (Filipino) --- src/config/locales/fil-PH.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/fil-PH.json b/src/config/locales/fil-PH.json index 9a8a6c5dd..824f41782 100644 --- a/src/config/locales/fil-PH.json +++ b/src/config/locales/fil-PH.json @@ -252,6 +252,7 @@ "schedules": "Mga Iskedyul", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Magdagdag ng Account", "logout": "Mag-logout", "cancel": "Kansel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Mga pamayanan", + "title": "Groups", "subscribe": "Sumali", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 17f250e8f563bf1b9e793e3b9268f63cdc4427d7 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:24:59 +0200 Subject: [PATCH 058/362] New translations en-US.json (Esperanto) --- src/config/locales/eo-UY.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/eo-UY.json b/src/config/locales/eo-UY.json index 9d397c23e..1080a4727 100644 --- a/src/config/locales/eo-UY.json +++ b/src/config/locales/eo-UY.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From cc0dbcd7702ca8b3c590af52651c4faf52273610 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:01 +0200 Subject: [PATCH 059/362] New translations en-US.json (Malay) --- src/config/locales/ms-MY.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ms-MY.json b/src/config/locales/ms-MY.json index 424ea81e3..f9462a5d9 100644 --- a/src/config/locales/ms-MY.json +++ b/src/config/locales/ms-MY.json @@ -252,6 +252,7 @@ "schedules": "Jadual", "gallery": "Galeri", "settings": "Tetapan", + "communities": "Communities", "add_account": "Tambah akaun", "logout": "Log Keluar", "cancel": "Batal", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 0583ddbf1968027d7e9d40a64ed321cbca2afbdf Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:03 +0200 Subject: [PATCH 060/362] New translations en-US.json (Kyrgyz) --- src/config/locales/ky-KG.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ky-KG.json b/src/config/locales/ky-KG.json index 41b739de9..8e8a376eb 100644 --- a/src/config/locales/ky-KG.json +++ b/src/config/locales/ky-KG.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Галерея", "settings": "Орнотуулар", + "communities": "Communities", "add_account": "Add Account", "logout": "Чыгуу", "cancel": "Токтотуу", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 114d7150c037c2e3166afe09dde13d296ada4e48 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:05 +0200 Subject: [PATCH 061/362] New translations en-US.json (Azerbaijani) --- src/config/locales/az-AZ.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/az-AZ.json b/src/config/locales/az-AZ.json index fcc7c9c4e..80871e066 100644 --- a/src/config/locales/az-AZ.json +++ b/src/config/locales/az-AZ.json @@ -252,6 +252,7 @@ "schedules": "Cədvəllər", "gallery": "Qalereya", "settings": "Tənzimləmələr", + "communities": "Communities", "add_account": "Hesab Əlavə et", "logout": "Çıxış", "cancel": "İmtina", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From de0fd30be0116aa7434c3c15daeb9d01d5f561d3 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:07 +0200 Subject: [PATCH 062/362] New translations en-US.json (Latvian) --- src/config/locales/lv-LV.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/lv-LV.json b/src/config/locales/lv-LV.json index 9d397c23e..1080a4727 100644 --- a/src/config/locales/lv-LV.json +++ b/src/config/locales/lv-LV.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From c3520b9dcd64244a05ba8ca9898b74ed8b82bd7e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:08 +0200 Subject: [PATCH 063/362] New translations en-US.json (Kazakh) --- src/config/locales/kk-KZ.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/kk-KZ.json b/src/config/locales/kk-KZ.json index 9d397c23e..1080a4727 100644 --- a/src/config/locales/kk-KZ.json +++ b/src/config/locales/kk-KZ.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 05022b87539de485a3e2ba01f32a48d916830bda Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:10 +0200 Subject: [PATCH 064/362] New translations en-US.json (Bosnian) --- src/config/locales/bs-BA.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/bs-BA.json b/src/config/locales/bs-BA.json index 9d397c23e..1080a4727 100644 --- a/src/config/locales/bs-BA.json +++ b/src/config/locales/bs-BA.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 119fe8333c950b81d1dea11acb6bed8d0e16fb6f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:12 +0200 Subject: [PATCH 065/362] New translations en-US.json (Croatian) --- src/config/locales/hr-HR.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/hr-HR.json b/src/config/locales/hr-HR.json index ad36ce2af..f5d309d3b 100644 --- a/src/config/locales/hr-HR.json +++ b/src/config/locales/hr-HR.json @@ -252,6 +252,7 @@ "schedules": "Rasporedi", "gallery": "Galerija", "settings": "Postavke", + "communities": "Communities", "add_account": "Dodaj Profil", "logout": "Odjava", "cancel": "Poništi", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 1befd672efec21bfca707fb66a18a9cfad945dd7 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:14 +0200 Subject: [PATCH 066/362] New translations en-US.json (Thai) --- src/config/locales/th-TH.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/th-TH.json b/src/config/locales/th-TH.json index 9d397c23e..1080a4727 100644 --- a/src/config/locales/th-TH.json +++ b/src/config/locales/th-TH.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 197eff444dad6bc35141a9245fd43e1084ba6641 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:15 +0200 Subject: [PATCH 067/362] New translations en-US.json (Tamil) --- src/config/locales/ta-IN.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ta-IN.json b/src/config/locales/ta-IN.json index 4ec3ca8ce..17d7e4199 100644 --- a/src/config/locales/ta-IN.json +++ b/src/config/locales/ta-IN.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 0304107c07f2a5fecf1a44a307f8c8e11aba1c96 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:17 +0200 Subject: [PATCH 068/362] New translations en-US.json (Persian) --- src/config/locales/fa-IR.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json index abec37ff4..c51e98c4c 100644 --- a/src/config/locales/fa-IR.json +++ b/src/config/locales/fa-IR.json @@ -252,6 +252,7 @@ "schedules": "جدول زمانی", "gallery": "گالری", "settings": "تنظیمات", + "communities": "Communities", "add_account": "اضافه کردن حساب کاربری", "logout": "خروج از حساب", "cancel": "صرف نظر", @@ -549,7 +550,7 @@ "title": "موضوعات" }, "communities": { - "title": "انجمن ها", + "title": "Groups", "subscribe": "\"پیوستن\"", "unsubscribe": "ترک کردن", "subscribers": "اعضاء", @@ -580,5 +581,9 @@ "user": { "follow": "دنبال کردن", "unfollow": "عدم دنبال کردن" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 936e6d5a2d63d6f0b590f4fd9ab5789c88dc31b1 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:19 +0200 Subject: [PATCH 069/362] New translations en-US.json (Indonesian) --- src/config/locales/id-ID.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/id-ID.json b/src/config/locales/id-ID.json index 26b248085..43b19cd89 100644 --- a/src/config/locales/id-ID.json +++ b/src/config/locales/id-ID.json @@ -252,6 +252,7 @@ "schedules": "Daftar jadwal", "gallery": "Album", "settings": "Pengaturan", + "communities": "Communities", "add_account": "Tambahkan Akun", "logout": "Keluar", "cancel": "Batal", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 508796ebef3d533ad809e9d2bddc1d38e19d4694 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:21 +0200 Subject: [PATCH 070/362] New translations en-US.json (Icelandic) --- src/config/locales/is-IS.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/is-IS.json b/src/config/locales/is-IS.json index 9d397c23e..1080a4727 100644 --- a/src/config/locales/is-IS.json +++ b/src/config/locales/is-IS.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 1f554270c5d4bf69fab36d496edb6e52997b54cc Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:23 +0200 Subject: [PATCH 071/362] New translations en-US.json (Galician) --- src/config/locales/gl-ES.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/gl-ES.json b/src/config/locales/gl-ES.json index 9d397c23e..1080a4727 100644 --- a/src/config/locales/gl-ES.json +++ b/src/config/locales/gl-ES.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 44e8d028c2829e827d4fe93ff3a2e5e181f474eb Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:25 +0200 Subject: [PATCH 072/362] New translations en-US.json (Tibetan) --- src/config/locales/bo-BT.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/bo-BT.json b/src/config/locales/bo-BT.json index 9d397c23e..1080a4727 100644 --- a/src/config/locales/bo-BT.json +++ b/src/config/locales/bo-BT.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From f5fe06833c531600a3d2e3bd700baa2c9af7a6dd Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:27 +0200 Subject: [PATCH 073/362] New translations en-US.json (Uzbek) --- src/config/locales/uz-UZ.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/uz-UZ.json b/src/config/locales/uz-UZ.json index 9d397c23e..1080a4727 100644 --- a/src/config/locales/uz-UZ.json +++ b/src/config/locales/uz-UZ.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 80a9e521aebff290770959270b607538d32fe876 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:28 +0200 Subject: [PATCH 074/362] New translations en-US.json (Urdu (Pakistan)) --- src/config/locales/ur-PK.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ur-PK.json b/src/config/locales/ur-PK.json index bcf1120b3..5cbe49517 100644 --- a/src/config/locales/ur-PK.json +++ b/src/config/locales/ur-PK.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 04c87f31f44ab24b4fc8d37444732f40a94aa9f6 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:30 +0200 Subject: [PATCH 075/362] New translations en-US.json (Sanskrit) --- src/config/locales/sa-IN.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/sa-IN.json b/src/config/locales/sa-IN.json index 9d397c23e..1080a4727 100644 --- a/src/config/locales/sa-IN.json +++ b/src/config/locales/sa-IN.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From c1a28c00e8a1b18b8353d8df53d30707467a60b7 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:32 +0200 Subject: [PATCH 076/362] New translations en-US.json (Spanish, Argentina) --- src/config/locales/es-AR.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/es-AR.json b/src/config/locales/es-AR.json index fa301490e..7bd7a12c4 100644 --- a/src/config/locales/es-AR.json +++ b/src/config/locales/es-AR.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 58e0395153b54fee1bd701435a00ad5d35f0e678 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:34 +0200 Subject: [PATCH 077/362] New translations en-US.json (Acehnese) --- src/config/locales/ac-ace.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ac-ace.json b/src/config/locales/ac-ace.json index 00a6094ec..b1304fc37 100644 --- a/src/config/locales/ac-ace.json +++ b/src/config/locales/ac-ace.json @@ -252,6 +252,7 @@ "schedules": "Jaduwal", "gallery": "Album", "settings": "Peungaturan", + "communities": "Communities", "add_account": "Tamah akun", "logout": "Teubit", "cancel": "Batëu", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From c69017723f73fafa8b2408985512ebd17ce86c60 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:36 +0200 Subject: [PATCH 078/362] New translations en-US.json (Urdu (India)) --- src/config/locales/ur-IN.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ur-IN.json b/src/config/locales/ur-IN.json index bcf1120b3..5cbe49517 100644 --- a/src/config/locales/ur-IN.json +++ b/src/config/locales/ur-IN.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 58d4ccf2e038988261eb33e05d6a7f6dae229e73 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:37 +0200 Subject: [PATCH 079/362] New translations en-US.json (Kabyle) --- src/config/locales/kab-KAB.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/kab-KAB.json b/src/config/locales/kab-KAB.json index 65b016b78..b2a7a800f 100644 --- a/src/config/locales/kab-KAB.json +++ b/src/config/locales/kab-KAB.json @@ -252,6 +252,7 @@ "schedules": "Isɣiwas", "gallery": "Gallery", "settings": "Iɣewwaṛen", + "communities": "Communities", "add_account": "Rnu amiḍan", "logout": "Tuffɣa", "cancel": "Sefsex", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From a07f7b7980dee51fde069b1d5fed317adf6f7c61 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:39 +0200 Subject: [PATCH 080/362] New translations en-US.json (Gothic) --- src/config/locales/got-DE.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/got-DE.json b/src/config/locales/got-DE.json index 67c3309bb..38468d2b9 100644 --- a/src/config/locales/got-DE.json +++ b/src/config/locales/got-DE.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Frisahteis", "settings": "Lageinos", + "communities": "Communities", "add_account": "Anaaiauk rahnein", "logout": "Afleiþ", "cancel": "Fraqiþ", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 012c1ce33de6692f23b47d814b1d90a94304b119 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:41 +0200 Subject: [PATCH 081/362] New translations en-US.json (Nigerian Pidgin) --- src/config/locales/pcm-NG.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/pcm-NG.json b/src/config/locales/pcm-NG.json index ffab094d0..e8cc8fec3 100644 --- a/src/config/locales/pcm-NG.json +++ b/src/config/locales/pcm-NG.json @@ -252,6 +252,7 @@ "schedules": "Tori Wey You Time", "gallery": "Picture", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Una areas", + "title": "Groups", "subscribe": "Enta", "unsubscribe": "Comot", "subscribers": "Dem people wey dey area", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From f77d9a14f2348f3cf602ab81acf1cac2fbb6b7fa Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:43 +0200 Subject: [PATCH 082/362] New translations en-US.json (Turkmen) --- src/config/locales/tk-TM.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/tk-TM.json b/src/config/locales/tk-TM.json index 9d397c23e..1080a4727 100644 --- a/src/config/locales/tk-TM.json +++ b/src/config/locales/tk-TM.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 49c45217743785ee518d76ac82b634c691ab4338 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:45 +0200 Subject: [PATCH 083/362] New translations en-US.json (Assamese) --- src/config/locales/as-IN.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/as-IN.json b/src/config/locales/as-IN.json index 9d397c23e..1080a4727 100644 --- a/src/config/locales/as-IN.json +++ b/src/config/locales/as-IN.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 3bc25f6bbb8ca37762185e8ca47703cd9adcdab9 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:47 +0200 Subject: [PATCH 084/362] New translations en-US.json (Kashmiri) --- src/config/locales/ks-IN.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ks-IN.json b/src/config/locales/ks-IN.json index 9d397c23e..1080a4727 100644 --- a/src/config/locales/ks-IN.json +++ b/src/config/locales/ks-IN.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From c4d8c8e79f0a8cce7fcdcf6f2935e2fecbbe0edd Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:48 +0200 Subject: [PATCH 085/362] New translations en-US.json (Cebuano) --- src/config/locales/ceb-PH.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ceb-PH.json b/src/config/locales/ceb-PH.json index 9d397c23e..1080a4727 100644 --- a/src/config/locales/ceb-PH.json +++ b/src/config/locales/ceb-PH.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 5dc552bcce44c39cc35b8d7dbde9205d1c778144 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:50 +0200 Subject: [PATCH 086/362] New translations en-US.json (Yoruba) --- src/config/locales/yo-NG.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/yo-NG.json b/src/config/locales/yo-NG.json index 161b84939..36aad5668 100644 --- a/src/config/locales/yo-NG.json +++ b/src/config/locales/yo-NG.json @@ -252,6 +252,7 @@ "schedules": "Awon Iṣeto", "gallery": "Ibi isafihan aworan", "settings": "Eto", + "communities": "Communities", "add_account": "Se afikun oruko akọọlẹ", "logout": "Jade kuro", "cancel": "Fa igi le", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 5ae5e93b5bf6e1a9f59d16bb40037dc1fb7886ac Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:52 +0200 Subject: [PATCH 087/362] New translations en-US.json (Tajik) --- src/config/locales/tg-TJ.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/tg-TJ.json b/src/config/locales/tg-TJ.json index 9d397c23e..1080a4727 100644 --- a/src/config/locales/tg-TJ.json +++ b/src/config/locales/tg-TJ.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 5d0e69628fdd2a882a34d2f168919f4a4ddf695d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:54 +0200 Subject: [PATCH 088/362] New translations en-US.json (Nepali) --- src/config/locales/ne-NP.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ne-NP.json b/src/config/locales/ne-NP.json index 9d397c23e..1080a4727 100644 --- a/src/config/locales/ne-NP.json +++ b/src/config/locales/ne-NP.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 5f7f39a9ed67f17b1b8f27f652e6cb316fee2507 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:56 +0200 Subject: [PATCH 089/362] New translations en-US.json (Serbian (Latin)) --- src/config/locales/sr-CS.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/sr-CS.json b/src/config/locales/sr-CS.json index 8e42b5ebe..a2adc5c92 100644 --- a/src/config/locales/sr-CS.json +++ b/src/config/locales/sr-CS.json @@ -252,6 +252,7 @@ "schedules": "Rasporedi", "gallery": "Galerija", "settings": "Podešavanja", + "communities": "Communities", "add_account": "Dodaj Nalog", "logout": "Odjavi se", "cancel": "Otkaži", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Zajednice", + "title": "Groups", "subscribe": "Pridruži se", "unsubscribe": "Napusti", "subscribers": "Članovi", @@ -580,5 +581,9 @@ "user": { "follow": "Prati", "unfollow": "Prestani da pratiš" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 173a6880b9d1579817f15d0c364a4396735d274f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:25:58 +0200 Subject: [PATCH 090/362] New translations en-US.json (Swahili) --- src/config/locales/sw-KE.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/sw-KE.json b/src/config/locales/sw-KE.json index 9d397c23e..1080a4727 100644 --- a/src/config/locales/sw-KE.json +++ b/src/config/locales/sw-KE.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 514f9c41795ed9d30a136ecefa7a10c6897c65b8 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:00 +0200 Subject: [PATCH 091/362] New translations en-US.json (Vietnamese) --- src/config/locales/vi-VN.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/vi-VN.json b/src/config/locales/vi-VN.json index 4f318f93c..a067eb02b 100644 --- a/src/config/locales/vi-VN.json +++ b/src/config/locales/vi-VN.json @@ -252,6 +252,7 @@ "schedules": "Lịch trình", "gallery": "Bộ sưu tập", "settings": "Cài đặt", + "communities": "Communities", "add_account": "Thêm tài khoản", "logout": "Đăng xuất", "cancel": "Huỷ", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 141b0915802c067e50d77a7331030e1b1a1809e7 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:02 +0200 Subject: [PATCH 092/362] New translations en-US.json (Chinese Traditional) --- src/config/locales/zh-TW.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/zh-TW.json b/src/config/locales/zh-TW.json index 1f9973e04..367b9301e 100644 --- a/src/config/locales/zh-TW.json +++ b/src/config/locales/zh-TW.json @@ -252,6 +252,7 @@ "schedules": "定時發佈", "gallery": "圖庫", "settings": "設定", + "communities": "Communities", "add_account": "添加帳號", "logout": "登出", "cancel": "取消", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 10a246394e413f57a0529d04c69eacb2bee44224 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:04 +0200 Subject: [PATCH 093/362] New translations en-US.json (Hindi) --- src/config/locales/hi-IN.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/hi-IN.json b/src/config/locales/hi-IN.json index f37566d81..7ead8a7bf 100644 --- a/src/config/locales/hi-IN.json +++ b/src/config/locales/hi-IN.json @@ -252,6 +252,7 @@ "schedules": "निर्धारित", "gallery": "चित्रशाला", "settings": "समायोजन", + "communities": "Communities", "add_account": "खता जोड़ें", "logout": "बहार जाएँ", "cancel": "रद्द करें", @@ -549,7 +550,7 @@ "title": "विषयों" }, "communities": { - "title": "समुदाय", + "title": "Groups", "subscribe": "शामिल हों", "unsubscribe": "छोड़ें", "subscribers": "सदस्य", @@ -580,5 +581,9 @@ "user": { "follow": "फॉलो करें", "unfollow": "अनफॉलो करें" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From b7b8869c668b8a09e07bfe13a84b255ac874a3ae Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:06 +0200 Subject: [PATCH 094/362] New translations en-US.json (German) --- src/config/locales/de-DE.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/de-DE.json b/src/config/locales/de-DE.json index bf0327315..6c731f9d4 100644 --- a/src/config/locales/de-DE.json +++ b/src/config/locales/de-DE.json @@ -252,6 +252,7 @@ "schedules": "Zeitpläne", "gallery": "Galerie", "settings": "Einstellungen", + "communities": "Communities", "add_account": "Konto hinzufügen", "logout": "Abmelden", "cancel": "Abbrechen", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Beitreten", "unsubscribe": "Austreten", "subscribers": "Mitglieder", @@ -580,5 +581,9 @@ "user": { "follow": "Folgen", "unfollow": "Nicht mehr folgen" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 607317a4aac074a72c3e24d19f496c732d8ec4b1 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:08 +0200 Subject: [PATCH 095/362] New translations en-US.json (Armenian) --- src/config/locales/hy-AM.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/hy-AM.json b/src/config/locales/hy-AM.json index a951761bf..7612c6ef4 100644 --- a/src/config/locales/hy-AM.json +++ b/src/config/locales/hy-AM.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From bc1aaada1c8b293c602cb449322d11b72ea08a83 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:09 +0200 Subject: [PATCH 096/362] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index 995c5c6cc..f287db175 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -252,6 +252,7 @@ "schedules": "Időzítések", "gallery": "Galéria", "settings": "Beállítások", + "communities": "Communities", "add_account": "Fiók Hozzáadása", "logout": "Kijelentkezés", "cancel": "Elvet", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Közösségek", + "title": "Groups", "subscribe": "Csatlakozz", "unsubscribe": "Kilépés", "subscribers": "Tagok", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From ff6e158cc884775bc36d9e57a8ac0265976b6b46 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:11 +0200 Subject: [PATCH 097/362] New translations en-US.json (Hebrew) --- src/config/locales/he-IL.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/he-IL.json b/src/config/locales/he-IL.json index 50a954cd2..655f74e17 100644 --- a/src/config/locales/he-IL.json +++ b/src/config/locales/he-IL.json @@ -252,6 +252,7 @@ "schedules": "לוחות זמנים", "gallery": "גלריה", "settings": "הגדרות", + "communities": "Communities", "add_account": "הוסף/י חשבון", "logout": "התנתק/י", "cancel": "ביטול", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 2376f60b554a8e563293d4b55c5fe5c7af6f2389 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:13 +0200 Subject: [PATCH 098/362] New translations en-US.json (Irish) --- src/config/locales/ga-IE.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ga-IE.json b/src/config/locales/ga-IE.json index 9d397c23e..1080a4727 100644 --- a/src/config/locales/ga-IE.json +++ b/src/config/locales/ga-IE.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 74f1f51d178fd4e00658ad6ac06035941d56e353 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:15 +0200 Subject: [PATCH 099/362] New translations en-US.json (Finnish) --- src/config/locales/fi-FI.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/fi-FI.json b/src/config/locales/fi-FI.json index c813ec7cc..c9299dfad 100644 --- a/src/config/locales/fi-FI.json +++ b/src/config/locales/fi-FI.json @@ -252,6 +252,7 @@ "schedules": "Ajastetut", "gallery": "Galleria", "settings": "Asetukset", + "communities": "Communities", "add_account": "Lisää tili", "logout": "Kirjaudu ulos", "cancel": "Peruuta", @@ -549,7 +550,7 @@ "title": "Aiheet" }, "communities": { - "title": "Yhteisöt", + "title": "Groups", "subscribe": "Liity", "unsubscribe": "Poistu", "subscribers": "Jäsenet", @@ -580,5 +581,9 @@ "user": { "follow": "Seuraa", "unfollow": "Älä seuraa" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 1b3abc77c6918925f7d0f2a8d67d79f1914b61b8 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:16 +0200 Subject: [PATCH 100/362] New translations en-US.json (Greek) --- src/config/locales/el-GR.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/el-GR.json b/src/config/locales/el-GR.json index 9d397c23e..1080a4727 100644 --- a/src/config/locales/el-GR.json +++ b/src/config/locales/el-GR.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From f1f3003358abd276fc906162bba237e50211afe4 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:18 +0200 Subject: [PATCH 101/362] New translations en-US.json (Danish) --- src/config/locales/da-DK.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/da-DK.json b/src/config/locales/da-DK.json index 9d397c23e..1080a4727 100644 --- a/src/config/locales/da-DK.json +++ b/src/config/locales/da-DK.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From b294753e3e81a4c61b22140fd36dfde731fb9e9e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:20 +0200 Subject: [PATCH 102/362] New translations en-US.json (Japanese) --- src/config/locales/ja-JP.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ja-JP.json b/src/config/locales/ja-JP.json index 4196c6673..cc55d5dfa 100644 --- a/src/config/locales/ja-JP.json +++ b/src/config/locales/ja-JP.json @@ -252,6 +252,7 @@ "schedules": "スケジュール", "gallery": "ギャラリー", "settings": "設定", + "communities": "Communities", "add_account": "アカウントを追加", "logout": "ログアウト", "cancel": "キャンセル", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 1931f6f61ae471bbb25e8b534e96ad001e7e9e3d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:22 +0200 Subject: [PATCH 103/362] New translations en-US.json (Czech) --- src/config/locales/cs-CZ.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/cs-CZ.json b/src/config/locales/cs-CZ.json index 9d397c23e..1080a4727 100644 --- a/src/config/locales/cs-CZ.json +++ b/src/config/locales/cs-CZ.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From f124a8257cd04fc4186ae85d0652aad4ece82742 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:24 +0200 Subject: [PATCH 104/362] New translations en-US.json (Catalan) --- src/config/locales/ca-ES.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ca-ES.json b/src/config/locales/ca-ES.json index 9d397c23e..1080a4727 100644 --- a/src/config/locales/ca-ES.json +++ b/src/config/locales/ca-ES.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 53cc4bf000bfcdbaf08af01512ae11c351fbadde Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:25 +0200 Subject: [PATCH 105/362] New translations en-US.json (Bulgarian) --- src/config/locales/bg-BG.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/bg-BG.json b/src/config/locales/bg-BG.json index a01fc2ad8..00f6f1c10 100644 --- a/src/config/locales/bg-BG.json +++ b/src/config/locales/bg-BG.json @@ -252,6 +252,7 @@ "schedules": "Графици", "gallery": "Галерия", "settings": "Настройки", + "communities": "Communities", "add_account": "Добавяне на профил", "logout": "Изход", "cancel": "Отказ", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Общности", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 05cc3be539ec33610a3afb15bfc519b2ebc4b987 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:27 +0200 Subject: [PATCH 106/362] New translations en-US.json (Arabic) --- src/config/locales/ar-SA.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ar-SA.json b/src/config/locales/ar-SA.json index 28bb6c5d8..fe0a573a4 100644 --- a/src/config/locales/ar-SA.json +++ b/src/config/locales/ar-SA.json @@ -252,6 +252,7 @@ "schedules": "جداول زمنية", "gallery": "معرض الصور", "settings": "إعدادات", + "communities": "Communities", "add_account": "إضافة حساب", "logout": "تسجيل الخروج", "cancel": "إلغاء", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From a0e3331ddd3397db41e673983669e2bc8f207f11 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:29 +0200 Subject: [PATCH 107/362] New translations en-US.json (Spanish) --- src/config/locales/es-ES.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/es-ES.json b/src/config/locales/es-ES.json index 14ac832fd..f6e024fa8 100644 --- a/src/config/locales/es-ES.json +++ b/src/config/locales/es-ES.json @@ -252,6 +252,7 @@ "schedules": "Horarios", "gallery": "Galería", "settings": "Ajustes", + "communities": "Communities", "add_account": "Agregar cuenta", "logout": "Cerrar sesión", "cancel": "Cancelar", @@ -549,7 +550,7 @@ "title": "Temas" }, "communities": { - "title": "Comunidades", + "title": "Groups", "subscribe": "Unirse", "unsubscribe": "Salir", "subscribers": "Participantes", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 0b9f5af565917643145452e0ff459be6460b777d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:31 +0200 Subject: [PATCH 108/362] New translations en-US.json (Romanian) --- src/config/locales/ro-RO.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ro-RO.json b/src/config/locales/ro-RO.json index 4b632438e..936c9f7d6 100644 --- a/src/config/locales/ro-RO.json +++ b/src/config/locales/ro-RO.json @@ -252,6 +252,7 @@ "schedules": "Programate", "gallery": "Galerie", "settings": "Setări", + "communities": "Communities", "add_account": "Adaugare Cont", "logout": "Deconectare", "cancel": "Anulează", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From a9d1639c46a845334c90f7cf831a009b01005c79 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:33 +0200 Subject: [PATCH 109/362] New translations en-US.json (French) --- src/config/locales/fr-FR.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/fr-FR.json b/src/config/locales/fr-FR.json index a1b4a25e2..d37b48178 100644 --- a/src/config/locales/fr-FR.json +++ b/src/config/locales/fr-FR.json @@ -252,6 +252,7 @@ "schedules": "Planifications", "gallery": "Gallerie", "settings": "Réglages", + "communities": "Communities", "add_account": "Ajouter un compte", "logout": "Déconnexion", "cancel": "Annuler", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communautés", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 9e30cebe3b26e867de8cd8f1b6780c892f38a0e6 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:35 +0200 Subject: [PATCH 110/362] New translations en-US.json (Italian) --- src/config/locales/it-IT.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/it-IT.json b/src/config/locales/it-IT.json index b4aa4005a..6ddb147e4 100644 --- a/src/config/locales/it-IT.json +++ b/src/config/locales/it-IT.json @@ -252,6 +252,7 @@ "schedules": "Pianificazioni", "gallery": "Galleria", "settings": "Impostazioni", + "communities": "Communities", "add_account": "Aggiungi Account", "logout": "Disconnettiti", "cancel": "Cancella", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 3a443c2d2f22c045b31741d8feaa6a3d0e4cc000 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:37 +0200 Subject: [PATCH 111/362] New translations en-US.json (Georgian) --- src/config/locales/ka-GE.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ka-GE.json b/src/config/locales/ka-GE.json index 9d397c23e..1080a4727 100644 --- a/src/config/locales/ka-GE.json +++ b/src/config/locales/ka-GE.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From d1cf4b95c444f82643842e3f274b2f7d8d0ff5fa Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:39 +0200 Subject: [PATCH 112/362] New translations en-US.json (Chinese Simplified) --- src/config/locales/zh-CN.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/zh-CN.json b/src/config/locales/zh-CN.json index 5de130024..5e021ae88 100644 --- a/src/config/locales/zh-CN.json +++ b/src/config/locales/zh-CN.json @@ -252,6 +252,7 @@ "schedules": "定时发布", "gallery": "图库", "settings": "设置", + "communities": "Communities", "add_account": "添加帐户", "logout": "退出", "cancel": "取消", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From fc90f87485d0618dbab300c45ce947ae0bbe0a6f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:41 +0200 Subject: [PATCH 113/362] New translations en-US.json (Portuguese) --- src/config/locales/pt-PT.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/pt-PT.json b/src/config/locales/pt-PT.json index bc2d18ed3..7cff5ee78 100644 --- a/src/config/locales/pt-PT.json +++ b/src/config/locales/pt-PT.json @@ -252,6 +252,7 @@ "schedules": "Agendar", "gallery": "Galeria", "settings": "Configurações", + "communities": "Communities", "add_account": "Adicionar conta", "logout": "Sair", "cancel": "Cancelar", @@ -549,7 +550,7 @@ "title": "Tópicos" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Aderir", "unsubscribe": "Sair", "subscribers": "Membros", @@ -580,5 +581,9 @@ "user": { "follow": "Seguir", "unfollow": "Deixar de seguir" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 0be7730df572f6203b045b947819a3630387f8e1 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:42 +0200 Subject: [PATCH 114/362] New translations en-US.json (Ukrainian) --- src/config/locales/uk-UA.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/uk-UA.json b/src/config/locales/uk-UA.json index a24984eac..7b23f3370 100644 --- a/src/config/locales/uk-UA.json +++ b/src/config/locales/uk-UA.json @@ -252,6 +252,7 @@ "schedules": "Розклади", "gallery": "Галерея", "settings": "Налаштування", + "communities": "Communities", "add_account": "Додати обліковий запис", "logout": "Вийти", "cancel": "Скасувати", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Спільноти", + "title": "Groups", "subscribe": "Приєднатися", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Слідкувати", "unfollow": "Не слідкувати" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 501a8b73089d0deafd55e78d8a09f7631fc31a99 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:44 +0200 Subject: [PATCH 115/362] New translations en-US.json (Turkish) --- src/config/locales/tr-TR.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/tr-TR.json b/src/config/locales/tr-TR.json index 014986200..088da26fb 100644 --- a/src/config/locales/tr-TR.json +++ b/src/config/locales/tr-TR.json @@ -252,6 +252,7 @@ "schedules": "Yapılacaklar", "gallery": "Galeri", "settings": "Ayarlar", + "communities": "Communities", "add_account": "Hesap Ekle", "logout": "Çık", "cancel": "Vazgeç", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From d4a9a9087aba14afca0f71099ee5772ea97e5061 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:46 +0200 Subject: [PATCH 116/362] New translations en-US.json (Swedish) --- src/config/locales/sv-SE.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/sv-SE.json b/src/config/locales/sv-SE.json index 9d397c23e..1080a4727 100644 --- a/src/config/locales/sv-SE.json +++ b/src/config/locales/sv-SE.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 1991ad6e40fc600295f7b444f64019c3c6d9c8dd Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:48 +0200 Subject: [PATCH 117/362] New translations en-US.json (Albanian) --- src/config/locales/sq-AL.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/sq-AL.json b/src/config/locales/sq-AL.json index a951761bf..7612c6ef4 100644 --- a/src/config/locales/sq-AL.json +++ b/src/config/locales/sq-AL.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From f26003a8df628550d2523357a24c46437ed88c76 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:50 +0200 Subject: [PATCH 118/362] New translations en-US.json (Slovenian) --- src/config/locales/sl-SI.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/sl-SI.json b/src/config/locales/sl-SI.json index 46cadc625..a52352497 100644 --- a/src/config/locales/sl-SI.json +++ b/src/config/locales/sl-SI.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 2656789fd36c77cd1712ca41f98fb83904e6c1cb Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:52 +0200 Subject: [PATCH 119/362] New translations en-US.json (Slovak) --- src/config/locales/sk-SK.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/sk-SK.json b/src/config/locales/sk-SK.json index 9d397c23e..1080a4727 100644 --- a/src/config/locales/sk-SK.json +++ b/src/config/locales/sk-SK.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 2f584a97e3d8689f47391825b4eb80d1fdfc0463 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:53 +0200 Subject: [PATCH 120/362] New translations en-US.json (Russian) --- src/config/locales/ru-RU.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ru-RU.json b/src/config/locales/ru-RU.json index d3bebe56b..a624eb8f0 100644 --- a/src/config/locales/ru-RU.json +++ b/src/config/locales/ru-RU.json @@ -252,6 +252,7 @@ "schedules": "Отложенное", "gallery": "Галлерея", "settings": "Настройки", + "communities": "Communities", "add_account": "Добавить аккаунт", "logout": "Выйти", "cancel": "Отмена", @@ -549,7 +550,7 @@ "title": "Темы" }, "communities": { - "title": "Сообщества", + "title": "Groups", "subscribe": "Присоединиться", "unsubscribe": "Покинуть", "subscribers": "Участники", @@ -580,5 +581,9 @@ "user": { "follow": "Подписаться", "unfollow": "Отписаться" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 967d00bc0803fc67cedce03039dade5eb8cb348b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:55 +0200 Subject: [PATCH 121/362] New translations en-US.json (Polish) --- src/config/locales/pl-PL.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/pl-PL.json b/src/config/locales/pl-PL.json index 8a3368186..8991f9c74 100644 --- a/src/config/locales/pl-PL.json +++ b/src/config/locales/pl-PL.json @@ -252,6 +252,7 @@ "schedules": "Harmonogramy", "gallery": "Galeria", "settings": "Ustawienia", + "communities": "Communities", "add_account": "Dodaj konto", "logout": "Wyloguj", "cancel": "Anuluj", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Społeczność", + "title": "Groups", "subscribe": "Przyłącz się", "unsubscribe": "Opuść", "subscribers": "Członkowie", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 087c885bd05ef9d95e451f7a1bfde3d5e82da207 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:57 +0200 Subject: [PATCH 122/362] New translations en-US.json (Korean) --- src/config/locales/ko-KR.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ko-KR.json b/src/config/locales/ko-KR.json index e556f255b..371941d14 100644 --- a/src/config/locales/ko-KR.json +++ b/src/config/locales/ko-KR.json @@ -252,6 +252,7 @@ "schedules": "일정", "gallery": "갤러리", "settings": "설정", + "communities": "Communities", "add_account": "계정 추가", "logout": "로그아웃", "cancel": "취소", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "커뮤니티", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From f1cf3d09efcd07ef22b09e587feeaf0d262c2929 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:26:59 +0200 Subject: [PATCH 123/362] New translations en-US.json (Punjabi) --- src/config/locales/pa-IN.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/pa-IN.json b/src/config/locales/pa-IN.json index 9d397c23e..1080a4727 100644 --- a/src/config/locales/pa-IN.json +++ b/src/config/locales/pa-IN.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 6fcf70e3e4a0aa7baf23120e42f9dc7efd83ff61 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:27:01 +0200 Subject: [PATCH 124/362] New translations en-US.json (Norwegian) --- src/config/locales/no-NO.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/no-NO.json b/src/config/locales/no-NO.json index 9d397c23e..1080a4727 100644 --- a/src/config/locales/no-NO.json +++ b/src/config/locales/no-NO.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 54f394aab1bca87dfbd10ee3ce79ca3947e92967 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:27:03 +0200 Subject: [PATCH 125/362] New translations en-US.json (Dutch) --- src/config/locales/nl-NL.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/nl-NL.json b/src/config/locales/nl-NL.json index 0f0335a32..0d51eaecd 100644 --- a/src/config/locales/nl-NL.json +++ b/src/config/locales/nl-NL.json @@ -252,6 +252,7 @@ "schedules": "Schema’s", "gallery": "Gallerij", "settings": "Instellingen", + "communities": "Communities", "add_account": "Account toevoegen", "logout": "Uitloggen", "cancel": "Annuleren", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 7efee411bf3f3dad7e928e4627278e65a8c0a85a Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:27:04 +0200 Subject: [PATCH 126/362] New translations en-US.json (Mongolian) --- src/config/locales/mn-MN.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/mn-MN.json b/src/config/locales/mn-MN.json index 9d397c23e..1080a4727 100644 --- a/src/config/locales/mn-MN.json +++ b/src/config/locales/mn-MN.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 86fd752185c2c4c6435f61fd1ddaf5f0151d73f5 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:27:06 +0200 Subject: [PATCH 127/362] New translations en-US.json (Macedonian) --- src/config/locales/mk-MK.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/mk-MK.json b/src/config/locales/mk-MK.json index 9d397c23e..1080a4727 100644 --- a/src/config/locales/mk-MK.json +++ b/src/config/locales/mk-MK.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 9cfbff212cf059bfcfc71f84e7ad5862e948d35a Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:27:08 +0200 Subject: [PATCH 128/362] New translations en-US.json (Lithuanian) --- src/config/locales/lt-LT.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/lt-LT.json b/src/config/locales/lt-LT.json index 615158e97..d03173a2f 100644 --- a/src/config/locales/lt-LT.json +++ b/src/config/locales/lt-LT.json @@ -252,6 +252,7 @@ "schedules": "Suplanuota", "gallery": "Galerija", "settings": "Nustatymai", + "communities": "Communities", "add_account": "Pridėti paskyrą", "logout": "Atsijungti", "cancel": "Atšaukti", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 11889685cccb9a552273d3237e19583db6e1a718 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:27:10 +0200 Subject: [PATCH 129/362] New translations en-US.json (Kurdish) --- src/config/locales/ku-TR.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ku-TR.json b/src/config/locales/ku-TR.json index bfa9863df..4b861af12 100644 --- a/src/config/locales/ku-TR.json +++ b/src/config/locales/ku-TR.json @@ -252,6 +252,7 @@ "schedules": "Karûbarên Te", "gallery": "Pêşangeh", "settings": "Sazkarî", + "communities": "Communities", "add_account": "Ajimêr Tevlî Bike", "logout": "Derkeve", "cancel": "Betal", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From eb09ca2b95fe1feb9d69a77082b09c678c9d6306 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:27:12 +0200 Subject: [PATCH 130/362] New translations en-US.json (Spanish, Mexico) --- src/config/locales/es-MX.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/es-MX.json b/src/config/locales/es-MX.json index fa301490e..7bd7a12c4 100644 --- a/src/config/locales/es-MX.json +++ b/src/config/locales/es-MX.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 6d81101de5e60c2c2d316dee186eb51f3878cbc2 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 22:35:00 +0200 Subject: [PATCH 131/362] Update source file en-US.json --- src/config/locales/en-US.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json index fa301490e..7bd7a12c4 100644 --- a/src/config/locales/en-US.json +++ b/src/config/locales/en-US.json @@ -252,6 +252,7 @@ "schedules": "Schedules", "gallery": "Gallery", "settings": "Settings", + "communities": "Communities", "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", @@ -549,7 +550,7 @@ "title": "Topics" }, "communities": { - "title": "Communities", + "title": "Groups", "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", @@ -580,5 +581,9 @@ "user": { "follow": "Follow", "unfollow": "Unfollow" + }, + "communities": { + "joined": "Membership", + "discover": "Discover" } } From 4ce2d32860bbf90cfae997470fa311126d6ac1f5 Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 18 Jan 2021 22:49:37 +0200 Subject: [PATCH 132/362] gradle dist url update --- android/gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index e0c4de36d..4e1cc9db6 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 8067aa12275f9d2a86f702af487271be3896c9dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Tue, 19 Jan 2021 00:15:56 +0300 Subject: [PATCH 133/362] Finish AccountsBottomSheet --- .../container/accountsBottomSheetContainer.js | 77 ++++++-- .../view/accountsBottomSheetView.js | 172 ++++++++---------- 2 files changed, 141 insertions(+), 108 deletions(-) diff --git a/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js b/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js index 5d2f872c2..010566cea 100644 --- a/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js +++ b/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js @@ -1,16 +1,26 @@ import React, { useEffect, useRef } from 'react'; -import { View } from 'react-native'; -import { useSelector } from 'react-redux'; +import { useSelector, useDispatch } from 'react-redux'; + +import { navigate } from '../../../navigation/service'; + +import { updateCurrentAccount } from '../../../redux/actions/accountAction'; +import { isRenderRequired } from '../../../redux/actions/applicationActions'; + +import { getUserDataWithUsername } from '../../../realm/realm'; +import { switchAccount } from '../../../providers/hive/auth'; import { AccountContainer } from '../../../containers'; import AccountsBottomSheet from '../view/accountsBottomSheetView'; const AccountsBottomSheetContainer = ({ navigation }) => { + const dispatch = useDispatch(); const accountsBottomSheetRef = useRef(); const isVisibleAccountsBottomSheet = useSelector( (state) => state.ui.isVisibleAccountsBottomSheet, ); + const currentAccount = useSelector((state) => state.account.currentAccount); + const accounts = useSelector((state) => state.account.otherAccounts); useEffect(() => { if (isVisibleAccountsBottomSheet) { @@ -18,23 +28,60 @@ const AccountsBottomSheetContainer = ({ navigation }) => { } }, [isVisibleAccountsBottomSheet]); - const _navigateToRoute = (route = null) => { - if (route) { - //navigation.navigate(route); + const _navigateToRoute = (routeName = null) => { + if (routeName) { + accountsBottomSheetRef.current?.closeAccountsBottomSheet(); + navigate({ routeName }); } }; + const _switchAccount = async (switchingAccount = {}) => { + accountsBottomSheetRef.current?.closeAccountsBottomSheet(); + + //TODO: Remove setTimeout + const timeout = setTimeout(async () => { + if (switchingAccount.username !== currentAccount.name) { + const accountData = accounts.filter( + (account) => account.username === switchingAccount.username, + )[0]; + + // control user persist whole data or just username + if (accountData.name) { + accountData.username = accountData.name; + + dispatch(updateCurrentAccount(accountData)); + dispatch(isRenderRequired(true)); + + const upToDateCurrentAccount = await switchAccount(accountData.name); + const realmData = await getUserDataWithUsername(accountData.name); + + upToDateCurrentAccount.username = upToDateCurrentAccount.name; + upToDateCurrentAccount.local = realmData[0]; + + dispatch(updateCurrentAccount(upToDateCurrentAccount)); + } else { + const _currentAccount = await switchAccount(accountData.username); + const realmData = await getUserDataWithUsername(accountData.username); + + _currentAccount.username = _currentAccount.name; + _currentAccount.local = realmData[0]; + + dispatch(updateCurrentAccount(_currentAccount)); + dispatch(isRenderRequired(true)); + } + } + }, 750); + clearTimeout(timeout); + }; + return ( - - {({ accounts, currentAccount, isLoggedIn, isLoginDone, username }) => ( - - )} - + ); }; diff --git a/src/components/accountsBottomSheet/view/accountsBottomSheetView.js b/src/components/accountsBottomSheet/view/accountsBottomSheetView.js index 3d7e01f97..68d9752aa 100644 --- a/src/components/accountsBottomSheet/view/accountsBottomSheetView.js +++ b/src/components/accountsBottomSheet/view/accountsBottomSheetView.js @@ -16,108 +16,94 @@ import { UserAvatar, Icon, TextButton, Separator } from '../../index'; import { default as ROUTES } from '../../../constants/routeNames'; import styles from './accountsBottomSheetStyles'; +import { switchAccount } from '../../../providers/hive/auth'; -const data = [ - { - name: 'example', - username: 'furkankilic', - isCurrentAccount: true, - }, - { - name: 'example', - username: 'furkankilic', - }, - { - name: 'example', - username: 'furkankilic', - }, - { - name: 'example', - username: 'furkankilic', - }, -]; +const AccountsBottomSheet = forwardRef( + ({ accounts, currentAccount, navigateToRoute, switchAccount }, ref) => { + const dispatch = useDispatch(); + const bottomSheetModalRef = useRef(); + const insets = useSafeAreaInsets(); + const intl = useIntl(); -const AccountsBottomSheet = forwardRef(({ accounts, currentAccount, navigateToRoute }, ref) => { - const dispatch = useDispatch(); - const bottomSheetModalRef = useRef(); - const insets = useSafeAreaInsets(); - const intl = useIntl(); + const snapPoints = useMemo(() => [accounts.length <= 4 ? accounts.length * 60 + 150 : 405], []); - const snapPoints = useMemo(() => [data.length <= 4 ? data.length * 60 + 150 : 405], []); + useImperativeHandle(ref, () => ({ + showAccountsBottomSheet() { + bottomSheetModalRef.current?.present(); + }, + closeAccountsBottomSheet() { + bottomSheetModalRef.current?.dismiss(); + }, + })); - useImperativeHandle(ref, () => ({ - showAccountsBottomSheet() { - bottomSheetModalRef.current?.present(); - }, - })); + const _handleDismissBottomSheet = () => { + bottomSheetModalRef.current?.dismiss(); + dispatch(toggleAccountsBottomSheet()); + }; - const _handleDismissBottomSheet = () => { - bottomSheetModalRef.current?.dismiss(); - dispatch(toggleAccountsBottomSheet()); - }; - - //_handlePressAccountTile(item) - const _renderAccountTile = (item) => ( - {}}> - - - - {item.displayName && {item.displayName}} - {item.name} + //_handlePressAccountTile(item) + const _renderAccountTile = (item) => ( + switchAccount(item)}> + + + + {item.displayName && {item.displayName}} + {`@${item.name}`} + - - {item.isCurrentAccount && ( - - )} - - ); - - return ( - - ( - + {currentAccount.name === item.name && ( + )} - ref={bottomSheetModalRef} - index={0} - snapPoints={snapPoints} - onDismiss={_handleDismissBottomSheet} - shouldMeasureContentHeight={true} - > - item.name} - renderItem={({ item }) => _renderAccountTile(item)} - //contentContainerStyle={styles.contentContainer} - /> - - - - navigateToRoute(ROUTES.SCREENS.REGISTER)} + + ); + + return ( + + ( + - + )} + ref={bottomSheetModalRef} + index={0} + snapPoints={snapPoints} + onDismiss={_handleDismissBottomSheet} + shouldMeasureContentHeight={true} + > + item.name} + renderItem={({ item }) => _renderAccountTile(item)} + //contentContainerStyle={styles.contentContainer} + /> - - navigateToRoute(ROUTES.SCREENS.LOGIN)} - /> + + + navigateToRoute(ROUTES.SCREENS.REGISTER)} + /> + + + + navigateToRoute(ROUTES.SCREENS.LOGIN)} + /> + + - - - - - ); -}); + + + ); + }, +); export default AccountsBottomSheet; From 1f363f09fe21dce539dda00fb0e99748892b6b1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Tue, 19 Jan 2021 00:26:27 +0300 Subject: [PATCH 134/362] install pods --- ios/Podfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index afcb83b21..f75c4ba50 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -721,4 +721,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 1f30c7da5061dbc47185442a6ab4a3c95ac48c04 -COCOAPODS: 1.9.3 +COCOAPODS: 1.10.0 From 0bd38a0b48c576d759bdf3e5ad8138afd3e382cb Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 18 Jan 2021 23:44:19 +0200 Subject: [PATCH 135/362] New translations en-US.json (Finnish) --- src/config/locales/fi-FI.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/config/locales/fi-FI.json b/src/config/locales/fi-FI.json index c9299dfad..b92804eb3 100644 --- a/src/config/locales/fi-FI.json +++ b/src/config/locales/fi-FI.json @@ -252,7 +252,7 @@ "schedules": "Ajastetut", "gallery": "Galleria", "settings": "Asetukset", - "communities": "Communities", + "communities": "Yhteisöt", "add_account": "Lisää tili", "logout": "Kirjaudu ulos", "cancel": "Peruuta", @@ -550,7 +550,7 @@ "title": "Aiheet" }, "communities": { - "title": "Groups", + "title": "Ryhmät", "subscribe": "Liity", "unsubscribe": "Poistu", "subscribers": "Jäsenet", @@ -583,7 +583,7 @@ "unfollow": "Älä seuraa" }, "communities": { - "joined": "Membership", - "discover": "Discover" + "joined": "Jäsenyys", + "discover": "Löydä uutta" } } From 1eac511602a310a53b41ecfa686f695eb2c1ca6c Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 19 Jan 2021 04:23:40 +0200 Subject: [PATCH 136/362] New translations en-US.json (Spanish) --- src/config/locales/es-ES.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/config/locales/es-ES.json b/src/config/locales/es-ES.json index f6e024fa8..3ae0f7c21 100644 --- a/src/config/locales/es-ES.json +++ b/src/config/locales/es-ES.json @@ -252,7 +252,7 @@ "schedules": "Horarios", "gallery": "Galería", "settings": "Ajustes", - "communities": "Communities", + "communities": "Comunidades", "add_account": "Agregar cuenta", "logout": "Cerrar sesión", "cancel": "Cancelar", @@ -550,7 +550,7 @@ "title": "Temas" }, "communities": { - "title": "Groups", + "title": "Grupos", "subscribe": "Unirse", "unsubscribe": "Salir", "subscribers": "Participantes", @@ -583,7 +583,7 @@ "unfollow": "Unfollow" }, "communities": { - "joined": "Membership", - "discover": "Discover" + "joined": "Membresía", + "discover": "Descubrir" } } From c41926b93e323f6275932bb73acc393484027653 Mon Sep 17 00:00:00 2001 From: feruz Date: Tue, 19 Jan 2021 12:57:26 +0200 Subject: [PATCH 137/362] remove unnecessary get_community calls --- .../basicUIElements/view/tag/tagContainer.js | 30 +++++++++---------- .../postCard/container/postCardContainer.js | 30 +++++++++++-------- src/components/postCard/view/postCardView.js | 2 +- .../view/postHeaderDescription.js | 11 +++++++ .../posts/container/postsContainer.js | 4 +-- src/providers/hive/dhive.js | 2 +- 6 files changed, 46 insertions(+), 33 deletions(-) diff --git a/src/components/basicUIElements/view/tag/tagContainer.js b/src/components/basicUIElements/view/tag/tagContainer.js index ddc6fb519..c019243e9 100644 --- a/src/components/basicUIElements/view/tag/tagContainer.js +++ b/src/components/basicUIElements/view/tag/tagContainer.js @@ -28,35 +28,33 @@ const TagContainer = ({ style, textStyle, disabled, + communityTitle, }) => { const [label, setLabel] = useState(value); const [isCommunity, setIsCommunity] = useState(false); - + console.log(value, communityTitle); useEffect(() => { - let isCancelled = false; - if (value && /^hive-\d+/.test(value)) { - getCommunityTitle(value) - .then((r) => { - if (!isCancelled) { + if (value && /hive-[1-3]\d{4,6}$/.test(value)) { + if (communityTitle) { + setLabel(communityTitle); + setIsCommunity(true); + } else { + getCommunityTitle(value) + .then((r) => { setLabel(r); setIsCommunity(value !== r); return r; - } - }) - .catch((e) => { - if (!isCancelled) { + }) + .catch((e) => { setLabel(value); - setIsCommunity(/^hive-\d+/.test(value)); + setIsCommunity(/hive-[1-3]\d{4,6}$/.test(value)); return value; - } - }); + }); + } } else { setLabel(value); setIsCommunity(false); } - return () => { - isCancelled = true; - }; }); // Component Functions diff --git a/src/components/postCard/container/postCardContainer.js b/src/components/postCard/container/postCardContainer.js index 7db89c5a4..2f221996a 100644 --- a/src/components/postCard/container/postCardContainer.js +++ b/src/components/postCard/container/postCardContainer.js @@ -39,25 +39,25 @@ const PostCardContainer = ({ }, [isRefresh]); useEffect(() => { - if (content) { - setActiveVotes(get(content, 'active_votes', [])); + if (_content) { + setActiveVotes(get(_content, 'active_votes', [])); - getPostReblogs(content).then((result) => { + getPostReblogs(_content).then((result) => { setReblogs(result); }); - setContent(content); + setContent(_content); } - }, [content]); + }, [_content]); const _handleOnUserPress = () => { - if (content && get(currentAccount, 'name') !== get(content, 'author')) { + if (_content && get(currentAccount, 'name') !== get(_content, 'author')) { navigation.navigate({ routeName: ROUTES.SCREENS.PROFILE, params: { - username: get(content, 'author'), - reputation: get(content, 'author_reputation'), + username: get(_content, 'author'), + reputation: get(_content, 'author_reputation'), }, - key: get(content, 'author'), + key: get(_content, 'author'), }); } }; @@ -79,9 +79,9 @@ const PostCardContainer = ({ routeName: ROUTES.SCREENS.VOTERS, params: { activeVotes, - content, + content: _content, }, - key: get(content, 'permlink'), + key: get(_content, 'permlink'), }); }; @@ -91,12 +91,16 @@ const PostCardContainer = ({ params: { reblogs, }, - key: get(content, 'permlink', get(content, 'author', '')), + key: get(_content, 'permlink', get(_content, 'author', '')), }); }; const _fetchPost = async () => { - await getPost(get(content, 'author'), get(content, 'permlink'), get(currentAccount, 'username')) + await getPost( + get(_content, 'author'), + get(_content, 'permlink'), + get(currentAccount, 'username'), + ) .then((result) => { if (result) { setContent(result); diff --git a/src/components/postCard/view/postCardView.js b/src/components/postCard/view/postCardView.js index e220c0c8d..108182b21 100644 --- a/src/components/postCard/view/postCardView.js +++ b/src/components/postCard/view/postCardView.js @@ -102,7 +102,7 @@ const PostCardView = ({ profileOnPress={_handleOnUserPress} reputation={get(content, 'author_reputation')} size={36} - tag={content.category} + content={content} rebloggedBy={rebloggedBy} isPromoted={get(content, 'is_promoted')} /> diff --git a/src/components/postElements/headerDescription/view/postHeaderDescription.js b/src/components/postElements/headerDescription/view/postHeaderDescription.js index a5fd40ecf..618eae62b 100644 --- a/src/components/postElements/headerDescription/view/postHeaderDescription.js +++ b/src/components/postElements/headerDescription/view/postHeaderDescription.js @@ -46,6 +46,7 @@ class PostHeaderDescription extends PureComponent { reputation, size, tag, + content, tagOnPress, isShowOwnerIndicator, isPromoted, @@ -90,6 +91,16 @@ class PostHeaderDescription extends PureComponent { + {!!content && ( + tagOnPress && tagOnPress()}> + + + )} {!!tag && ( tagOnPress && tagOnPress()}> diff --git a/src/components/posts/container/postsContainer.js b/src/components/posts/container/postsContainer.js index 6437f3341..adb9d8f45 100644 --- a/src/components/posts/container/postsContainer.js +++ b/src/components/posts/container/postsContainer.js @@ -255,7 +255,7 @@ const PostsContainer = ({ const filter = type || selectedFilterValue; const subfilter = selectedFeedSubfilterValue; let options = {}; - const limit = 7; + const limit = 5; let func = null; if ( @@ -319,7 +319,7 @@ const PostsContainer = ({ _posts = unionBy(posts, _posts, 'permlink'); } } - if (posts.length <= 7 && pageType !== 'profiles') { + if (posts.length <= 5 && pageType !== 'profiles') { _setFeedPosts(_posts); } diff --git a/src/providers/hive/dhive.js b/src/providers/hive/dhive.js index 4f719deee..5a0ca33c8 100644 --- a/src/providers/hive/dhive.js +++ b/src/providers/hive/dhive.js @@ -456,7 +456,7 @@ export const getActiveVotes = (author, permlink) => export const getRankedPosts = async (query, currentUserName, filterNsfw) => { try { let posts = await client.call('bridge', 'get_ranked_posts', query); - + console.log(posts); if (posts) { posts = parsePosts(posts, currentUserName); From 6c0509e37fd4fdb09c3595a188719a7ed28bbe84 Mon Sep 17 00:00:00 2001 From: feruz Date: Tue, 19 Jan 2021 13:08:28 +0200 Subject: [PATCH 138/362] logs clear, some fixes --- src/components/basicUIElements/view/tag/tagContainer.js | 2 +- .../selectCommunityModal/view/selectCommunityModalView.js | 2 +- src/components/postView/view/postDisplayView.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/basicUIElements/view/tag/tagContainer.js b/src/components/basicUIElements/view/tag/tagContainer.js index c019243e9..feb871041 100644 --- a/src/components/basicUIElements/view/tag/tagContainer.js +++ b/src/components/basicUIElements/view/tag/tagContainer.js @@ -32,7 +32,7 @@ const TagContainer = ({ }) => { const [label, setLabel] = useState(value); const [isCommunity, setIsCommunity] = useState(false); - console.log(value, communityTitle); + useEffect(() => { if (value && /hive-[1-3]\d{4,6}$/.test(value)) { if (communityTitle) { diff --git a/src/components/editorElements/selectCommunityModal/view/selectCommunityModalView.js b/src/components/editorElements/selectCommunityModal/view/selectCommunityModalView.js index 28951533c..f41d73e2d 100644 --- a/src/components/editorElements/selectCommunityModal/view/selectCommunityModalView.js +++ b/src/components/editorElements/selectCommunityModal/view/selectCommunityModalView.js @@ -37,7 +37,7 @@ const SelectCommunityModalView = ({ renderItem={({ item, index, separators }) => ( diff --git a/src/components/postView/view/postDisplayView.js b/src/components/postView/view/postDisplayView.js index 6bfc628b1..cc7a44b06 100644 --- a/src/components/postView/view/postDisplayView.js +++ b/src/components/postView/view/postDisplayView.js @@ -198,7 +198,7 @@ const PostDisplayView = ({ name={author || post.author} currentAccountUsername={name} reputation={post.author_reputation} - tag={post.category} + content={post} size={36} /> From e599880394564a3f5eebdc9c994358a46b0d4b6c Mon Sep 17 00:00:00 2001 From: feruz Date: Tue, 19 Jan 2021 13:19:53 +0200 Subject: [PATCH 139/362] log clear --- src/providers/hive/dhive.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/providers/hive/dhive.js b/src/providers/hive/dhive.js index 5a0ca33c8..4f719deee 100644 --- a/src/providers/hive/dhive.js +++ b/src/providers/hive/dhive.js @@ -456,7 +456,7 @@ export const getActiveVotes = (author, permlink) => export const getRankedPosts = async (query, currentUserName, filterNsfw) => { try { let posts = await client.call('bridge', 'get_ranked_posts', query); - console.log(posts); + if (posts) { posts = parsePosts(posts, currentUserName); From 082ef2f87e91704df25459364aaab777acb0ce1f Mon Sep 17 00:00:00 2001 From: feruz Date: Tue, 19 Jan 2021 14:11:21 +0200 Subject: [PATCH 140/362] thumbnail size ratio from smaller image --- src/components/postCard/view/postCardView.js | 4 ++-- src/components/postListItem/view/postListItemView.js | 2 +- src/utils/image.js | 2 +- src/utils/postParser.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/postCard/view/postCardView.js b/src/components/postCard/view/postCardView.js index 108182b21..281550ade 100644 --- a/src/components/postCard/view/postCardView.js +++ b/src/components/postCard/view/postCardView.js @@ -66,12 +66,12 @@ const PostCardView = ({ }; const _getPostImage = (content, isNsfwPost) => { - if (content && content.image) { + if (content && content.thumbnail) { if (isNsfwPost && content.nsfw) { return { image: NSFW_IMAGE, thumbnail: NSFW_IMAGE }; } //console.log(content) - ImageSize.getSize(content.image).then((size) => { + ImageSize.getSize(content.thumbnail).then((size) => { setCalcImgHeight((size.height / size.width) * dim.width); }); return { image: content.image, thumbnail: content.thumbnail }; diff --git a/src/components/postListItem/view/postListItemView.js b/src/components/postListItem/view/postListItemView.js index cfe1fff07..0a4d70dd8 100644 --- a/src/components/postListItem/view/postListItemView.js +++ b/src/components/postListItem/view/postListItemView.js @@ -43,7 +43,7 @@ const PostListItemView = ({ let _isMounted = false; if (image) { if (!_isMounted) { - ImageSize.getSize(image.uri).then((size) => { + ImageSize.getSize(thumbnail.uri).then((size) => { setCalcImgHeight((size.height / size.width) * dim.width); }); } diff --git a/src/utils/image.js b/src/utils/image.js index a9f91540a..1a89a8787 100644 --- a/src/utils/image.js +++ b/src/utils/image.js @@ -70,7 +70,7 @@ export const catchDraftImage = (body, format = 'match', thumbnail = false) => { if (body && imgRegex.test(body)) { const imageMatch = body.match(imgRegex); if (thumbnail) { - return proxifyImageSrc(imageMatch[0], 60, 50, format); + return proxifyImageSrc(imageMatch[0], 6, 5, format); } return proxifyImageSrc(imageMatch[0], 600, 500, format); } diff --git a/src/utils/postParser.js b/src/utils/postParser.js index 8aad0576d..7b4b31877 100644 --- a/src/utils/postParser.js +++ b/src/utils/postParser.js @@ -33,7 +33,7 @@ export const parsePost = (post, currentUserName, isPromoted, isList = false) => post.json_metadata = {}; } post.image = catchPostImage(post.body, 600, 500, webp ? 'webp' : 'match'); - post.thumbnail = catchPostImage(post.body, 60, 50, webp ? 'webp' : 'match'); + post.thumbnail = catchPostImage(post.body, 6, 5, webp ? 'webp' : 'match'); post.author_reputation = getReputation(post.author_reputation); post.avatar = getResizedAvatar(get(post, 'author')); if (!isList) { From c097e429f2db5552b7f3ebd571df053a9ab680fc Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 19 Jan 2021 16:38:05 +0200 Subject: [PATCH 141/362] New translations en-US.json (Hindi) --- src/config/locales/hi-IN.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/config/locales/hi-IN.json b/src/config/locales/hi-IN.json index 7ead8a7bf..a33f341bc 100644 --- a/src/config/locales/hi-IN.json +++ b/src/config/locales/hi-IN.json @@ -252,7 +252,7 @@ "schedules": "निर्धारित", "gallery": "चित्रशाला", "settings": "समायोजन", - "communities": "Communities", + "communities": "समुदाय", "add_account": "खता जोड़ें", "logout": "बहार जाएँ", "cancel": "रद्द करें", @@ -550,7 +550,7 @@ "title": "विषयों" }, "communities": { - "title": "Groups", + "title": "समूह", "subscribe": "शामिल हों", "unsubscribe": "छोड़ें", "subscribers": "सदस्य", @@ -583,7 +583,7 @@ "unfollow": "अनफॉलो करें" }, "communities": { - "joined": "Membership", - "discover": "Discover" + "joined": "सदस्यता", + "discover": "खोजिए" } } From df17f1636dd59cd3be22083fd9eaf2423e8d10e6 Mon Sep 17 00:00:00 2001 From: feruz Date: Wed, 20 Jan 2021 16:19:36 +0200 Subject: [PATCH 142/362] space filter fix attempt --- src/components/filterBar/view/filterBarStyles.js | 1 + src/components/progressiveImage/index.js | 2 ++ src/utils/manaBar.js | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/filterBar/view/filterBarStyles.js b/src/components/filterBar/view/filterBarStyles.js index 1cdaf3e3f..14f869893 100644 --- a/src/components/filterBar/view/filterBarStyles.js +++ b/src/components/filterBar/view/filterBarStyles.js @@ -23,6 +23,7 @@ export default EStyleSheet.create({ flex: 6, }, filterBarWrapper: { + flex: 1, flexDirection: 'row', alignItems: 'center', justifyContent: 'space-between', diff --git a/src/components/progressiveImage/index.js b/src/components/progressiveImage/index.js index 734fc9afa..4d8c2c02e 100644 --- a/src/components/progressiveImage/index.js +++ b/src/components/progressiveImage/index.js @@ -8,9 +8,11 @@ const styles = StyleSheet.create({ right: 0, bottom: 0, top: 0, + borderRadius: 8, }, container: { backgroundColor: '#f6f6f6', + borderRadius: 8, }, }); diff --git a/src/utils/manaBar.js b/src/utils/manaBar.js index 8baf5e712..1f5d34ba3 100644 --- a/src/utils/manaBar.js +++ b/src/utils/manaBar.js @@ -6,13 +6,13 @@ const PERIOD = 432000; export const getVotingPower = (account) => { const { vp_manabar } = account; const { percentage } = vp_manabar; - return percentage / 100; + return percentage / 100 || 0; }; export const getRcPower = (account) => { const { rc_manabar } = account; const { percentage } = rc_manabar; - return percentage / 100; + return percentage / 100 || 0; }; export const getDownVotingPower = (account) => { From ae66107df94b5dc049e5012d5e3c704ba81ee2fb Mon Sep 17 00:00:00 2001 From: feruz Date: Wed, 20 Jan 2021 20:41:01 +0200 Subject: [PATCH 143/362] correct width according to marginhorizontal --- src/components/postCard/view/postCardView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/postCard/view/postCardView.js b/src/components/postCard/view/postCardView.js index 281550ade..3b2a2e3aa 100644 --- a/src/components/postCard/view/postCardView.js +++ b/src/components/postCard/view/postCardView.js @@ -118,7 +118,7 @@ const PostCardView = ({ thumbnailSource={{ uri: _image.thumbnail }} style={[ styles.thumbnail, - { width: dim.width - 16, height: Math.min(calcImgHeight, dim.height) }, + { width: dim.width - 18, height: Math.min(calcImgHeight, dim.height) }, ]} /> )} From 167fdf546d4addd119ab16d546a293347dfd353b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Wed, 20 Jan 2021 22:32:56 +0300 Subject: [PATCH 144/362] Fix CommunitiesScreen and AccountsBottomSheet bugs --- .../container/accountsBottomSheetContainer.js | 69 ++++++++++-------- .../view/accountsBottomSheetView.js | 15 ++-- .../view/communitiesListStyles.js | 1 - src/globalStyles.js | 1 + .../communities/view/communitiesScreen.js | 72 +++++++++---------- 5 files changed, 85 insertions(+), 73 deletions(-) diff --git a/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js b/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js index 010566cea..2925e036d 100644 --- a/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js +++ b/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js @@ -1,4 +1,4 @@ -import React, { useEffect, useRef } from 'react'; +import React, { useEffect, useRef, useState } from 'react'; import { useSelector, useDispatch } from 'react-redux'; import { navigate } from '../../../navigation/service'; @@ -16,6 +16,9 @@ const AccountsBottomSheetContainer = ({ navigation }) => { const dispatch = useDispatch(); const accountsBottomSheetRef = useRef(); + const [pressSwitch, setPressSwitch] = useState(false); + const [switchingAccount, setSwitchingAccount] = useState({}); + const isVisibleAccountsBottomSheet = useSelector( (state) => state.ui.isVisibleAccountsBottomSheet, ); @@ -28,6 +31,12 @@ const AccountsBottomSheetContainer = ({ navigation }) => { } }, [isVisibleAccountsBottomSheet]); + useEffect(() => { + if (pressSwitch && switchingAccount.name && !isVisibleAccountsBottomSheet) { + _handleSwitch(); + } + }, [pressSwitch, isVisibleAccountsBottomSheet, switchingAccount]); + const _navigateToRoute = (routeName = null) => { if (routeName) { accountsBottomSheetRef.current?.closeAccountsBottomSheet(); @@ -35,43 +44,47 @@ const AccountsBottomSheetContainer = ({ navigation }) => { } }; - const _switchAccount = async (switchingAccount = {}) => { + const _switchAccount = async (account = {}) => { accountsBottomSheetRef.current?.closeAccountsBottomSheet(); - //TODO: Remove setTimeout - const timeout = setTimeout(async () => { - if (switchingAccount.username !== currentAccount.name) { - const accountData = accounts.filter( - (account) => account.username === switchingAccount.username, - )[0]; + setPressSwitch(true); + setSwitchingAccount(account); + }; - // control user persist whole data or just username - if (accountData.name) { - accountData.username = accountData.name; + const _handleSwitch = async () => { + setPressSwitch(false); + setSwitchingAccount({}); - dispatch(updateCurrentAccount(accountData)); - dispatch(isRenderRequired(true)); + if (switchingAccount.username !== currentAccount.name) { + const accountData = accounts.filter( + (account) => account.username === switchingAccount.username, + )[0]; - const upToDateCurrentAccount = await switchAccount(accountData.name); - const realmData = await getUserDataWithUsername(accountData.name); + // control user persist whole data or just username + if (accountData.name) { + accountData.username = accountData.name; - upToDateCurrentAccount.username = upToDateCurrentAccount.name; - upToDateCurrentAccount.local = realmData[0]; + dispatch(updateCurrentAccount(accountData)); + dispatch(isRenderRequired(true)); - dispatch(updateCurrentAccount(upToDateCurrentAccount)); - } else { - const _currentAccount = await switchAccount(accountData.username); - const realmData = await getUserDataWithUsername(accountData.username); + const upToDateCurrentAccount = await switchAccount(accountData.name); + const realmData = await getUserDataWithUsername(accountData.name); - _currentAccount.username = _currentAccount.name; - _currentAccount.local = realmData[0]; + upToDateCurrentAccount.username = upToDateCurrentAccount.name; + upToDateCurrentAccount.local = realmData[0]; - dispatch(updateCurrentAccount(_currentAccount)); - dispatch(isRenderRequired(true)); - } + dispatch(updateCurrentAccount(upToDateCurrentAccount)); + } else { + const _currentAccount = await switchAccount(accountData.username); + const realmData = await getUserDataWithUsername(accountData.username); + + _currentAccount.username = _currentAccount.name; + _currentAccount.local = realmData[0]; + + dispatch(updateCurrentAccount(_currentAccount)); + dispatch(isRenderRequired(true)); } - }, 750); - clearTimeout(timeout); + } }; return ( diff --git a/src/components/accountsBottomSheet/view/accountsBottomSheetView.js b/src/components/accountsBottomSheet/view/accountsBottomSheetView.js index 68d9752aa..fb3fd6fb3 100644 --- a/src/components/accountsBottomSheet/view/accountsBottomSheetView.js +++ b/src/components/accountsBottomSheet/view/accountsBottomSheetView.js @@ -32,12 +32,15 @@ const AccountsBottomSheet = forwardRef( bottomSheetModalRef.current?.present(); }, closeAccountsBottomSheet() { - bottomSheetModalRef.current?.dismiss(); + _handleCloseBottomSheet(); }, })); - const _handleDismissBottomSheet = () => { + const _handleCloseBottomSheet = () => { bottomSheetModalRef.current?.dismiss(); + }; + + const _handleDispatchDismissBottomSheet = () => { dispatch(toggleAccountsBottomSheet()); }; @@ -47,8 +50,7 @@ const AccountsBottomSheet = forwardRef( - {item.displayName && {item.displayName}} - {`@${item.name}`} + {`@${item.username}`} {currentAccount.name === item.name && ( @@ -64,14 +66,13 @@ const AccountsBottomSheet = forwardRef( )} ref={bottomSheetModalRef} index={0} snapPoints={snapPoints} - onDismiss={_handleDismissBottomSheet} + onDismiss={_handleDispatchDismissBottomSheet} shouldMeasureContentHeight={true} > { }) => { return ( - - - + + - - - - - - - - + + + + + + ); }} From 0e14a83fc7376ba56c64ee3986e290c4e7ae3659 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Wed, 20 Jan 2021 23:11:43 +0300 Subject: [PATCH 145/362] Fix postsResultsContainer bug --- .../best/container/postsResultsContainer.js | 59 ++++++++----------- 1 file changed, 26 insertions(+), 33 deletions(-) diff --git a/src/screens/searchResult/screen/tabs/best/container/postsResultsContainer.js b/src/screens/searchResult/screen/tabs/best/container/postsResultsContainer.js index 26692c24e..8860d58c9 100644 --- a/src/screens/searchResult/screen/tabs/best/container/postsResultsContainer.js +++ b/src/screens/searchResult/screen/tabs/best/container/postsResultsContainer.js @@ -1,35 +1,40 @@ import { useState, useEffect } from 'react'; import get from 'lodash/get'; import { withNavigation } from 'react-navigation'; -import { connect } from 'react-redux'; +import { useSelector } from 'react-redux'; import ROUTES from '../../../../../../constants/routeNames'; import { search, getPromotePosts } from '../../../../../../providers/ecency/ecency'; import { getPost, getAccountPosts } from '../../../../../../providers/hive/dhive'; -const PostsResultsContainer = ({ children, navigation, searchValue, currentAccountUsername }) => { +const PostsResultsContainer = ({ children, navigation, searchValue }) => { const [data, setData] = useState([]); const [sort, setSort] = useState('newest'); const [scrollId, setScrollId] = useState(''); const [noResult, setNoResult] = useState(false); + const currentAccountUsername = useSelector((state) => state.account.currentAccount.username); + useEffect(() => { setNoResult(false); setData([]); if (searchValue) { - search({ q: `${searchValue} type:post`, sort }) - .then((res) => { - setScrollId(res.scroll_id); - setData(res.results); - if (res.results.length === 0) { - setNoResult(true); - } - }) - .catch((err) => console.log(err, 'search error')); + search({ q: `${searchValue} type:post`, sort }).then((res) => { + setScrollId(res.scroll_id); + setData(res.results); + if (res.results.length === 0) { + setNoResult(true); + } + }); } else { - getInitialPosts(); + getInitialPosts().then((res) => { + if (res.length === 0) { + setNoResult(true); + } + setData(res); + }); } }, [searchValue]); @@ -49,22 +54,14 @@ const PostsResultsContainer = ({ children, navigation, searchValue, currentAccou // return post; // }), // ); - try { - const options = { - observer: currentAccountUsername, - account: 'ecency', - limit: 7, - sort: 'blog', - }; - const _data = await getAccountPosts(options); + const options = { + observer: currentAccountUsername, + account: 'ecency', + limit: 7, + sort: 'blog', + }; - if (_data.length === 0) { - setNoResult(true); - } - setData(_data); - } catch (err) { - console.log(err); - } + return await getAccountPosts(options); }; // Component Functions @@ -81,7 +78,7 @@ const PostsResultsContainer = ({ children, navigation, searchValue, currentAccou }; const _loadMore = (index, value) => { - if (scrollId) { + if (scrollId && searchValue) { search({ q: `${searchValue} type:post`, sort, scroll_id: scrollId }).then((res) => { setData([...data, ...res.results]); }); @@ -99,8 +96,4 @@ const PostsResultsContainer = ({ children, navigation, searchValue, currentAccou ); }; -const mapStateToProps = (state) => ({ - currentAccountUsername: state.account.currentAccount.username, -}); - -export default connect(mapStateToProps)(withNavigation(PostsResultsContainer)); +export default withNavigation(PostsResultsContainer); From b0a7b7912b4b23566b8b751ce745fd1b733acfe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Wed, 20 Jan 2021 23:32:40 +0300 Subject: [PATCH 146/362] Add seachAccount and searchTag --- src/providers/ecency/ecency.js | 34 +++++++++++++++++++ .../container/peopleResultsContainer.js | 4 +-- .../container/topicsResultsContainer.js | 13 ++++--- .../screen/tabs/topics/view/topicsResults.js | 2 +- 4 files changed, 43 insertions(+), 10 deletions(-) diff --git a/src/providers/ecency/ecency.js b/src/providers/ecency/ecency.js index 9fa12ebc3..4a655aa35 100644 --- a/src/providers/ecency/ecency.js +++ b/src/providers/ecency/ecency.js @@ -296,6 +296,40 @@ export const searchPath = (q) => }); }); +export const searchAccount = (q = '', limit = 20, random = 0) => + new Promise((resolve, reject) => { + searchApi + .post('/search-account', { + q, + limit, + random, + }) + .then((res) => { + resolve(res.data); + }) + .catch((error) => { + bugsnag.notify(error); + reject(error); + }); + }); + +export const searchTag = (q = '', limit = 20, random = 0) => + new Promise((resolve, reject) => { + searchApi + .post('/search-tag', { + q, + limit, + random, + }) + .then((res) => { + resolve(res.data); + }) + .catch((error) => { + bugsnag.notify(error); + reject(error); + }); + }); + // Schedule export const schedule = ( user, diff --git a/src/screens/searchResult/screen/tabs/people/container/peopleResultsContainer.js b/src/screens/searchResult/screen/tabs/people/container/peopleResultsContainer.js index 2edc0fd76..9b096f520 100644 --- a/src/screens/searchResult/screen/tabs/people/container/peopleResultsContainer.js +++ b/src/screens/searchResult/screen/tabs/people/container/peopleResultsContainer.js @@ -6,7 +6,7 @@ import { connect } from 'react-redux'; import ROUTES from '../../../../../../constants/routeNames'; import { lookupAccounts } from '../../../../../../providers/hive/dhive'; -import { getLeaderboard } from '../../../../../../providers/ecency/ecency'; +import { getLeaderboard, searchAccount } from '../../../../../../providers/ecency/ecency'; const PeopleResultsContainer = (props) => { const [users, setUsers] = useState([]); @@ -19,7 +19,7 @@ const PeopleResultsContainer = (props) => { setUsers([]); if (searchValue) { - lookupAccounts(searchValue).then((res) => { + searchAccount(searchValue).then((res) => { if (res.length === 0) { setNoResult(true); } diff --git a/src/screens/searchResult/screen/tabs/topics/container/topicsResultsContainer.js b/src/screens/searchResult/screen/tabs/topics/container/topicsResultsContainer.js index 5b3c45517..50c919aeb 100644 --- a/src/screens/searchResult/screen/tabs/topics/container/topicsResultsContainer.js +++ b/src/screens/searchResult/screen/tabs/topics/container/topicsResultsContainer.js @@ -5,8 +5,7 @@ import { connect } from 'react-redux'; import ROUTES from '../../../../../../constants/routeNames'; -import { getTrendingTags } from '../../../../../../providers/hive/dhive'; -import { getLeaderboard } from '../../../../../../providers/ecency/ecency'; +import { searchTag } from '../../../../../../providers/ecency/ecency'; import { isCommunity } from '../../../../../../utils/communityValidation'; const OtherResultContainer = (props) => { @@ -19,12 +18,12 @@ const OtherResultContainer = (props) => { if (searchValue.length <= 10) { setNoResult(false); setTags([]); - getTrendingTags(searchValue.trim(), 100).then((res) => { - const data = res?.filter((item) => !isCommunity(item.name)); - if (data.length === 0) { + + searchTag(searchValue.trim(), 20).then((res) => { + if (res.length === 0) { setNoResult(true); } - setTags(data); + setTags(res); }); } }, [searchValue]); @@ -35,7 +34,7 @@ const OtherResultContainer = (props) => { navigation.navigate({ routeName: ROUTES.SCREENS.TAG_RESULT, params: { - tag: get(item, 'name', ''), + tag: get(item, 'tag', ''), }, }); }; diff --git a/src/screens/searchResult/screen/tabs/topics/view/topicsResults.js b/src/screens/searchResult/screen/tabs/topics/view/topicsResults.js index 39d0844ed..9d831f575 100644 --- a/src/screens/searchResult/screen/tabs/topics/view/topicsResults.js +++ b/src/screens/searchResult/screen/tabs/topics/view/topicsResults.js @@ -15,7 +15,7 @@ const TopicsResults = ({ navigation, searchValue }) => { const _renderTagItem = (item, index) => ( - {`#${item.name}`} + {`#${item.tag}`} ); From a03b5ef0afeffa83b7c5bc19547d46e2c89b2c9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Thu, 21 Jan 2021 00:53:21 +0300 Subject: [PATCH 147/362] fix searchResults people bug and logout bug --- .../view/accountsBottomSheetView.js | 2 +- .../sideMenu/container/sideMenuContainer.js | 89 ++----------------- src/components/sideMenu/view/sideMenuView.js | 11 +-- .../container/peopleResultsContainer.js | 6 +- .../screen/tabs/people/view/peopleResults.js | 4 +- 5 files changed, 16 insertions(+), 96 deletions(-) diff --git a/src/components/accountsBottomSheet/view/accountsBottomSheetView.js b/src/components/accountsBottomSheet/view/accountsBottomSheetView.js index fb3fd6fb3..7c8dcab02 100644 --- a/src/components/accountsBottomSheet/view/accountsBottomSheetView.js +++ b/src/components/accountsBottomSheet/view/accountsBottomSheetView.js @@ -25,7 +25,7 @@ const AccountsBottomSheet = forwardRef( const insets = useSafeAreaInsets(); const intl = useIntl(); - const snapPoints = useMemo(() => [accounts.length <= 4 ? accounts.length * 60 + 150 : 405], []); + const snapPoints = [accounts.length <= 4 ? accounts.length * 60 + 150 : 405]; useImperativeHandle(ref, () => ({ showAccountsBottomSheet() { diff --git a/src/components/sideMenu/container/sideMenuContainer.js b/src/components/sideMenu/container/sideMenuContainer.js index 49ef88aef..6e85130da 100644 --- a/src/components/sideMenu/container/sideMenuContainer.js +++ b/src/components/sideMenu/container/sideMenuContainer.js @@ -2,12 +2,9 @@ import React, { Component } from 'react'; import { connect } from 'react-redux'; // Actions -import { getUserDataWithUsername } from '../../../realm/realm'; -import { switchAccount } from '../../../providers/hive/auth'; -import { updateCurrentAccount } from '../../../redux/actions/accountAction'; import { toggleAccountsBottomSheet } from '../../../redux/actions/uiAction'; -import { logout, isRenderRequired } from '../../../redux/actions/applicationActions'; +import { logout } from '../../../redux/actions/applicationActions'; // Component import SideMenuView from '../view/sideMenuView'; @@ -19,32 +16,6 @@ import SideMenuView from '../view/sideMenuView'; */ class SideMenuContainer extends Component { - constructor(props) { - super(props); - this.state = { - accounts: [], - }; - } - - // Component Life Cycle Functions - - _createUserList = (otherAccounts) => { - const { currentAccount } = this.props; - - const accounts = []; - - otherAccounts.forEach((element) => { - accounts.push({ - name: `@${element.username}`, - username: element.username, - id: element.username, - displayName: element.display_name, - isCurrentAccount: element.username === currentAccount.name, - }); - }); - this.setState({ accounts }); - }; - // Component Functions _navigateToRoute = (route = null) => { @@ -54,77 +25,28 @@ class SideMenuContainer extends Component { } }; - _switchAccount = async (switchingAccount = {}) => { - const { dispatch, currentAccount, navigation, otherAccounts } = this.props; - - if (switchingAccount.username !== currentAccount.name) { - navigation.closeDrawer(); - - const accountData = otherAccounts.filter( - (account) => account.username === switchingAccount.username, - )[0]; - - // control user persist whole data or just username - if (accountData.name) { - accountData.username = accountData.name; - - dispatch(updateCurrentAccount(accountData)); - dispatch(isRenderRequired(true)); - - const upToDateCurrentAccount = await switchAccount(accountData.name); - const realmData = await getUserDataWithUsername(accountData.name); - - upToDateCurrentAccount.username = upToDateCurrentAccount.name; - upToDateCurrentAccount.local = realmData[0]; - - dispatch(updateCurrentAccount(upToDateCurrentAccount)); - } else { - const _currentAccount = await switchAccount(accountData.username); - const realmData = await getUserDataWithUsername(accountData.username); - - _currentAccount.username = _currentAccount.name; - _currentAccount.local = realmData[0]; - - dispatch(updateCurrentAccount(_currentAccount)); - dispatch(isRenderRequired(true)); - } - } - }; - _handleLogout = () => { - const { dispatch } = this.props; + const { logout, navigation } = this.props; - dispatch(logout()); + navigation.closeDrawer(); + logout(); }; _handlePressOptions = () => { - const { navigation, toggleAccountsBottomSheet } = this.props; - - //navigation.closeDrawer(); + const { toggleAccountsBottomSheet } = this.props; toggleAccountsBottomSheet(); }; - UNSAFE_componentWillReceiveProps(nextProps) { - const { isLoggedIn } = this.props; - - if (isLoggedIn) { - this._createUserList(nextProps.otherAccounts); - } - } - render() { const { currentAccount, isLoggedIn } = this.props; - const { accounts } = this.state; return ( @@ -140,6 +62,7 @@ const mapStateToProps = (state) => ({ const mapDispatchToProps = { toggleAccountsBottomSheet, + logout, }; export default connect(mapStateToProps, mapDispatchToProps)(SideMenuContainer); diff --git a/src/components/sideMenu/view/sideMenuView.js b/src/components/sideMenu/view/sideMenuView.js index c12c803ad..174379dce 100644 --- a/src/components/sideMenu/view/sideMenuView.js +++ b/src/components/sideMenu/view/sideMenuView.js @@ -4,6 +4,7 @@ import { injectIntl, useIntl } from 'react-intl'; import LinearGradient from 'react-native-linear-gradient'; import ActionSheet from 'react-native-actionsheet'; import VersionNumber from 'react-native-version-number'; +import { isEmpty } from 'lodash'; import { getStorageType } from '../../../realm/realm'; // Components @@ -27,8 +28,6 @@ const SideMenuView = ({ currentAccount, isLoggedIn, handleLogout, - accounts, - switchAccount, navigateToRoute, handlePressOptions, }) => { @@ -55,7 +54,7 @@ const SideMenuView = ({ }, []); useEffect(() => { - if (isLoggedIn) { + if (isLoggedIn && !isEmpty(currentAccount)) { setUpower(getVotingPower(currentAccount).toFixed(1)); } }); @@ -106,12 +105,6 @@ const SideMenuView = ({ ); - const _handlePressAccountTile = (item) => { - if (!item.isCurrentAccount) { - switchAccount(item); - } - }; - return ( { }); } else { getLeaderboard().then((result) => { - const sos = result.map((item) => item._id); + const sos = result.map((item) => { + item.name = item._id; + + return item; + }); if (sos.length === 0) { setNoResult(true); } diff --git a/src/screens/searchResult/screen/tabs/people/view/peopleResults.js b/src/screens/searchResult/screen/tabs/people/view/peopleResults.js index 5268b44d8..da19fb654 100644 --- a/src/screens/searchResult/screen/tabs/people/view/peopleResults.js +++ b/src/screens/searchResult/screen/tabs/people/view/peopleResults.js @@ -1,5 +1,5 @@ import React from 'react'; -import { SafeAreaView, FlatList } from 'react-native'; +import { SafeAreaView, FlatList, Text } from 'react-native'; import { useIntl } from 'react-intl'; // Components @@ -37,7 +37,7 @@ const PeopleResults = ({ navigation, searchValue }) => { handleOnPress(item)} index={index} - username={item} + username={item.name} /> )} ListEmptyComponent={_renderEmptyContent} From e9f869aae2d6d16bd36567a499c5f92c75e29d85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Thu, 21 Jan 2021 23:03:01 +0300 Subject: [PATCH 148/362] fix reopen issue and add dark mode support to accountsBottomSheet --- .../container/accountsBottomSheetContainer.js | 79 +++++++++---------- .../view/accountsBottomSheetStyles.js | 17 +++- .../view/accountsBottomSheetView.js | 55 +++++++------ 3 files changed, 84 insertions(+), 67 deletions(-) diff --git a/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js b/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js index 2925e036d..57a1e4d88 100644 --- a/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js +++ b/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js @@ -9,15 +9,12 @@ import { isRenderRequired } from '../../../redux/actions/applicationActions'; import { getUserDataWithUsername } from '../../../realm/realm'; import { switchAccount } from '../../../providers/hive/auth'; -import { AccountContainer } from '../../../containers'; import AccountsBottomSheet from '../view/accountsBottomSheetView'; +import { toggleAccountsBottomSheet } from '../../../redux/actions/uiAction'; const AccountsBottomSheetContainer = ({ navigation }) => { const dispatch = useDispatch(); - const accountsBottomSheetRef = useRef(); - - const [pressSwitch, setPressSwitch] = useState(false); - const [switchingAccount, setSwitchingAccount] = useState({}); + const accountsBottomSheetViewRef = useRef(); const isVisibleAccountsBottomSheet = useSelector( (state) => state.ui.isVisibleAccountsBottomSheet, @@ -27,69 +24,65 @@ const AccountsBottomSheetContainer = ({ navigation }) => { useEffect(() => { if (isVisibleAccountsBottomSheet) { - accountsBottomSheetRef.current?.showAccountsBottomSheet(); + accountsBottomSheetViewRef.current?.showAccountsBottomSheet(); } }, [isVisibleAccountsBottomSheet]); - useEffect(() => { - if (pressSwitch && switchingAccount.name && !isVisibleAccountsBottomSheet) { - _handleSwitch(); - } - }, [pressSwitch, isVisibleAccountsBottomSheet, switchingAccount]); - const _navigateToRoute = (routeName = null) => { if (routeName) { - accountsBottomSheetRef.current?.closeAccountsBottomSheet(); + accountsBottomSheetViewRef.current?.closeAccountsBottomSheet(); navigate({ routeName }); } }; const _switchAccount = async (account = {}) => { - accountsBottomSheetRef.current?.closeAccountsBottomSheet(); - - setPressSwitch(true); - setSwitchingAccount(account); + if (account.username !== currentAccount.name) { + _handleSwitch(account); + } else { + accountsBottomSheetViewRef.current?.closeAccountsBottomSheet(); + } }; - const _handleSwitch = async () => { - setPressSwitch(false); - setSwitchingAccount({}); + const _handleSwitch = async (switchingAccount = {}) => { + // Call this dispatch because when we make request, onDismiss is not working + // ========================================================================= + accountsBottomSheetViewRef.current?.closeAccountsBottomSheet(); + dispatch(toggleAccountsBottomSheet()); + // ========================================================================= - if (switchingAccount.username !== currentAccount.name) { - const accountData = accounts.filter( - (account) => account.username === switchingAccount.username, - )[0]; + const accountData = accounts.filter( + (account) => account.username === switchingAccount.username, + )[0]; - // control user persist whole data or just username - if (accountData.name) { - accountData.username = accountData.name; + // control user persist whole data or just username + if (accountData.name) { + accountData.username = accountData.name; - dispatch(updateCurrentAccount(accountData)); - dispatch(isRenderRequired(true)); + dispatch(updateCurrentAccount(accountData)); + dispatch(isRenderRequired(true)); - const upToDateCurrentAccount = await switchAccount(accountData.name); - const realmData = await getUserDataWithUsername(accountData.name); + const upToDateCurrentAccount = await switchAccount(accountData.name); + const realmData = await getUserDataWithUsername(accountData.name); - upToDateCurrentAccount.username = upToDateCurrentAccount.name; - upToDateCurrentAccount.local = realmData[0]; + upToDateCurrentAccount.username = upToDateCurrentAccount.name; + upToDateCurrentAccount.local = realmData[0]; - dispatch(updateCurrentAccount(upToDateCurrentAccount)); - } else { - const _currentAccount = await switchAccount(accountData.username); - const realmData = await getUserDataWithUsername(accountData.username); + dispatch(updateCurrentAccount(upToDateCurrentAccount)); + } else { + const _currentAccount = await switchAccount(accountData.username); + const realmData = await getUserDataWithUsername(accountData.username); - _currentAccount.username = _currentAccount.name; - _currentAccount.local = realmData[0]; + _currentAccount.username = _currentAccount.name; + _currentAccount.local = realmData[0]; - dispatch(updateCurrentAccount(_currentAccount)); - dispatch(isRenderRequired(true)); - } + dispatch(updateCurrentAccount(_currentAccount)); + dispatch(isRenderRequired(true)); } }; return ( ); + const renderHandleComponent = () => ( + + + + ); + return ( - item.name} - renderItem={({ item }) => _renderAccountTile(item)} - //contentContainerStyle={styles.contentContainer} - /> - - - - navigateToRoute(ROUTES.SCREENS.REGISTER)} - /> - + + item.name} + renderItem={({ item }) => _renderAccountTile(item)} + //contentContainerStyle={styles.contentContainer} + /> - - navigateToRoute(ROUTES.SCREENS.LOGIN)} - /> + + + navigateToRoute(ROUTES.SCREENS.REGISTER)} + /> + + + + navigateToRoute(ROUTES.SCREENS.LOGIN)} + /> + + - From 09cdfb2d3eb5d99ffac725ec168168274f5da083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Thu, 21 Jan 2021 23:45:23 +0300 Subject: [PATCH 149/362] Add customization and dark mode support to empty screen view --- .../view/emptyScreen/emptyScreenStyles.js | 7 +++++ .../view/emptyScreen/emptyScreenView.js | 31 ++++++++++++------- src/config/locales/en-US.json | 3 ++ .../container/peopleResultsContainer.js | 3 +- 4 files changed, 32 insertions(+), 12 deletions(-) create mode 100644 src/components/basicUIElements/view/emptyScreen/emptyScreenStyles.js diff --git a/src/components/basicUIElements/view/emptyScreen/emptyScreenStyles.js b/src/components/basicUIElements/view/emptyScreen/emptyScreenStyles.js new file mode 100644 index 000000000..ec1588bdf --- /dev/null +++ b/src/components/basicUIElements/view/emptyScreen/emptyScreenStyles.js @@ -0,0 +1,7 @@ +import EStyleSheet from 'react-native-extended-stylesheet'; + +export default EStyleSheet.create({ + text: { + color: '$primaryBlack', + }, +}); diff --git a/src/components/basicUIElements/view/emptyScreen/emptyScreenView.js b/src/components/basicUIElements/view/emptyScreen/emptyScreenView.js index 3747d066b..b17313352 100644 --- a/src/components/basicUIElements/view/emptyScreen/emptyScreenView.js +++ b/src/components/basicUIElements/view/emptyScreen/emptyScreenView.js @@ -1,18 +1,27 @@ import React from 'react'; import { View, Text } from 'react-native'; import LottieView from 'lottie-react-native'; +import { useIntl } from 'react-intl'; + +import styles from './emptyScreenStyles'; import globalStyles from '../../../../globalStyles'; -const EmptyScreenView = ({ style, textStyle }) => ( - - - Nothing found! - -); +const EmptyScreenView = ({ style, textStyle, text }) => { + const intl = useIntl(); + + return ( + + + + {text || intl.formatMessage({ id: 'empty_screen.nothing_here' })} + + + ); +}; export default EmptyScreenView; diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json index 7bd7a12c4..eff206b86 100644 --- a/src/config/locales/en-US.json +++ b/src/config/locales/en-US.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } diff --git a/src/screens/searchResult/screen/tabs/people/container/peopleResultsContainer.js b/src/screens/searchResult/screen/tabs/people/container/peopleResultsContainer.js index d79713708..a8c81a7e4 100644 --- a/src/screens/searchResult/screen/tabs/people/container/peopleResultsContainer.js +++ b/src/screens/searchResult/screen/tabs/people/container/peopleResultsContainer.js @@ -19,7 +19,7 @@ const PeopleResultsContainer = (props) => { setUsers([]); if (searchValue) { - searchAccount(searchValue).then((res) => { + searchAccount(searchValue, 20, 1).then((res) => { if (res.length === 0) { setNoResult(true); } @@ -52,6 +52,7 @@ const PeopleResultsContainer = (props) => { }); }; + console.log(users, 'users'); return ( children && children({ From c46b699b62f01543d92b9cf15bfe1d1edbda98e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Fri, 22 Jan 2021 00:18:38 +0300 Subject: [PATCH 150/362] Change design of the peopleResultsView --- .../view/userListItem/userListItem.js | 3 ++- .../container/peopleResultsContainer.js | 27 +++++-------------- .../screen/tabs/people/view/peopleResults.js | 6 +++++ .../tabs/people/view/peopleResultsStyles.js | 5 ++++ 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/components/basicUIElements/view/userListItem/userListItem.js b/src/components/basicUIElements/view/userListItem/userListItem.js index 788fba381..ae615b773 100644 --- a/src/components/basicUIElements/view/userListItem/userListItem.js +++ b/src/components/basicUIElements/view/userListItem/userListItem.js @@ -8,6 +8,7 @@ import styles from './userListItemStyles'; const UserListItem = ({ rightText, description, + descriptionStyle, username, subRightText, index, @@ -44,7 +45,7 @@ const UserListItem = ({ {text || username} - {description && {description}} + {description && {description}} {middleText && ( diff --git a/src/screens/searchResult/screen/tabs/people/container/peopleResultsContainer.js b/src/screens/searchResult/screen/tabs/people/container/peopleResultsContainer.js index a8c81a7e4..2df9dd264 100644 --- a/src/screens/searchResult/screen/tabs/people/container/peopleResultsContainer.js +++ b/src/screens/searchResult/screen/tabs/people/container/peopleResultsContainer.js @@ -2,6 +2,7 @@ import { useState, useEffect } from 'react'; import get from 'lodash/get'; import { withNavigation } from 'react-navigation'; import { connect } from 'react-redux'; +import { shuffle } from 'lodash'; import ROUTES from '../../../../../../constants/routeNames'; @@ -18,26 +19,12 @@ const PeopleResultsContainer = (props) => { setNoResult(false); setUsers([]); - if (searchValue) { - searchAccount(searchValue, 20, 1).then((res) => { - if (res.length === 0) { - setNoResult(true); - } - setUsers(res); - }); - } else { - getLeaderboard().then((result) => { - const sos = result.map((item) => { - item.name = item._id; - - return item; - }); - if (sos.length === 0) { - setNoResult(true); - } - setUsers(sos); - }); - } + searchAccount(searchValue, 20, searchValue ? 0 : 1).then((res) => { + if (res.length === 0) { + setNoResult(true); + } + setUsers(res); + }); }, [searchValue]); // Component Functions diff --git a/src/screens/searchResult/screen/tabs/people/view/peopleResults.js b/src/screens/searchResult/screen/tabs/people/view/peopleResults.js index da19fb654..f9f76e50d 100644 --- a/src/screens/searchResult/screen/tabs/people/view/peopleResults.js +++ b/src/screens/searchResult/screen/tabs/people/view/peopleResults.js @@ -38,6 +38,12 @@ const PeopleResults = ({ navigation, searchValue }) => { handleOnPress={() => handleOnPress(item)} index={index} username={item.name} + text={`@${item.name} ${item.full_name}`} + description={item.about} + descriptionStyle={styles.descriptionStyle} + isHasRightItem + isLoggedIn + isLoadingRightAction={false} /> )} ListEmptyComponent={_renderEmptyContent} diff --git a/src/screens/searchResult/screen/tabs/people/view/peopleResultsStyles.js b/src/screens/searchResult/screen/tabs/people/view/peopleResultsStyles.js index 6fe3db675..8e20ee5a8 100644 --- a/src/screens/searchResult/screen/tabs/people/view/peopleResultsStyles.js +++ b/src/screens/searchResult/screen/tabs/people/view/peopleResultsStyles.js @@ -45,4 +45,9 @@ export default EStyleSheet.create({ marginLeft: 15, color: '$primaryBlack', }, + descriptionStyle: { + maxWidth: '$deviceWidth', + marginTop: 4, + marginRight: 24, + }, }); From 05611e5943e83600dd0aee64f7ed603a3e7d813b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Fri, 22 Jan 2021 00:22:57 +0300 Subject: [PATCH 151/362] Remove unnuecessary imports from peopleResults --- .../screen/tabs/people/container/peopleResultsContainer.js | 5 +---- .../searchResult/screen/tabs/people/view/peopleResults.js | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/screens/searchResult/screen/tabs/people/container/peopleResultsContainer.js b/src/screens/searchResult/screen/tabs/people/container/peopleResultsContainer.js index 2df9dd264..85f72ceb4 100644 --- a/src/screens/searchResult/screen/tabs/people/container/peopleResultsContainer.js +++ b/src/screens/searchResult/screen/tabs/people/container/peopleResultsContainer.js @@ -1,13 +1,10 @@ import { useState, useEffect } from 'react'; -import get from 'lodash/get'; import { withNavigation } from 'react-navigation'; import { connect } from 'react-redux'; -import { shuffle } from 'lodash'; import ROUTES from '../../../../../../constants/routeNames'; -import { lookupAccounts } from '../../../../../../providers/hive/dhive'; -import { getLeaderboard, searchAccount } from '../../../../../../providers/ecency/ecency'; +import { searchAccount } from '../../../../../../providers/ecency/ecency'; const PeopleResultsContainer = (props) => { const [users, setUsers] = useState([]); diff --git a/src/screens/searchResult/screen/tabs/people/view/peopleResults.js b/src/screens/searchResult/screen/tabs/people/view/peopleResults.js index f9f76e50d..7bd24512f 100644 --- a/src/screens/searchResult/screen/tabs/people/view/peopleResults.js +++ b/src/screens/searchResult/screen/tabs/people/view/peopleResults.js @@ -1,5 +1,5 @@ import React from 'react'; -import { SafeAreaView, FlatList, Text } from 'react-native'; +import { SafeAreaView, FlatList } from 'react-native'; import { useIntl } from 'react-intl'; // Components From c3edbd6d1d8fa87f1314f4eb1557e7ffa43c103d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Fri, 22 Jan 2021 00:23:44 +0300 Subject: [PATCH 152/362] Remove intl from peopleResults --- .../searchResult/screen/tabs/people/view/peopleResults.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/screens/searchResult/screen/tabs/people/view/peopleResults.js b/src/screens/searchResult/screen/tabs/people/view/peopleResults.js index 7bd24512f..15330f976 100644 --- a/src/screens/searchResult/screen/tabs/people/view/peopleResults.js +++ b/src/screens/searchResult/screen/tabs/people/view/peopleResults.js @@ -1,6 +1,5 @@ import React from 'react'; import { SafeAreaView, FlatList } from 'react-native'; -import { useIntl } from 'react-intl'; // Components import { @@ -12,9 +11,7 @@ import PeopleResultsContainer from '../container/peopleResultsContainer'; import styles from './peopleResultsStyles'; -const PeopleResults = ({ navigation, searchValue }) => { - const intl = useIntl(); - +const PeopleResults = ({ searchValue }) => { const _renderEmptyContent = () => { return ( <> From e1e5b4db55b80c2cae53e8f39797e73424988a29 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:27:10 +0200 Subject: [PATCH 153/362] New translations en-US.json (Bengali) --- src/config/locales/bn-BD.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/bn-BD.json b/src/config/locales/bn-BD.json index 105a3804a..712c8b075 100644 --- a/src/config/locales/bn-BD.json +++ b/src/config/locales/bn-BD.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 5a8ff605923bb3d4af4a518156cbc24c8a833fd5 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:27:12 +0200 Subject: [PATCH 154/362] New translations en-US.json (Estonian) --- src/config/locales/et-EE.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/et-EE.json b/src/config/locales/et-EE.json index 3649e9a2a..895f6ef1f 100644 --- a/src/config/locales/et-EE.json +++ b/src/config/locales/et-EE.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From e62fb7c738ef767565d8178cc78960c42625dfde Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:27:14 +0200 Subject: [PATCH 155/362] New translations en-US.json (Filipino) --- src/config/locales/fil-PH.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/fil-PH.json b/src/config/locales/fil-PH.json index 824f41782..9b8339f66 100644 --- a/src/config/locales/fil-PH.json +++ b/src/config/locales/fil-PH.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From f3c89d700b65e0094b58c88ec10076da35c6fe72 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:27:16 +0200 Subject: [PATCH 156/362] New translations en-US.json (Esperanto) --- src/config/locales/eo-UY.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/eo-UY.json b/src/config/locales/eo-UY.json index 1080a4727..df5eaa53e 100644 --- a/src/config/locales/eo-UY.json +++ b/src/config/locales/eo-UY.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 92186379e5b11a5a3fb8ad4e3c10987126ae6bc1 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:27:18 +0200 Subject: [PATCH 157/362] New translations en-US.json (Malay) --- src/config/locales/ms-MY.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/ms-MY.json b/src/config/locales/ms-MY.json index f9462a5d9..154595449 100644 --- a/src/config/locales/ms-MY.json +++ b/src/config/locales/ms-MY.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 43acc1628980b543fdb31690368984ed81ae8098 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:27:19 +0200 Subject: [PATCH 158/362] New translations en-US.json (Kyrgyz) --- src/config/locales/ky-KG.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/ky-KG.json b/src/config/locales/ky-KG.json index 8e8a376eb..4b58e6c5c 100644 --- a/src/config/locales/ky-KG.json +++ b/src/config/locales/ky-KG.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From ceeac481e4c0719aa9b5ed65ac597ec51cd6546b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:27:21 +0200 Subject: [PATCH 159/362] New translations en-US.json (Azerbaijani) --- src/config/locales/az-AZ.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/az-AZ.json b/src/config/locales/az-AZ.json index 80871e066..ea78e2272 100644 --- a/src/config/locales/az-AZ.json +++ b/src/config/locales/az-AZ.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 24d0f16b763aaa6f888bb4e98a74e12a4f5811f1 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:27:23 +0200 Subject: [PATCH 160/362] New translations en-US.json (Latvian) --- src/config/locales/lv-LV.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/lv-LV.json b/src/config/locales/lv-LV.json index 1080a4727..df5eaa53e 100644 --- a/src/config/locales/lv-LV.json +++ b/src/config/locales/lv-LV.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 28f97ab018d3aa3f5961d8359779c21fb3deb7a3 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:27:25 +0200 Subject: [PATCH 161/362] New translations en-US.json (Kazakh) --- src/config/locales/kk-KZ.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/kk-KZ.json b/src/config/locales/kk-KZ.json index 1080a4727..df5eaa53e 100644 --- a/src/config/locales/kk-KZ.json +++ b/src/config/locales/kk-KZ.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 9db8f7e4c26e6227c90ea268fb64b1e184e769aa Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:27:27 +0200 Subject: [PATCH 162/362] New translations en-US.json (Bosnian) --- src/config/locales/bs-BA.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/bs-BA.json b/src/config/locales/bs-BA.json index 1080a4727..df5eaa53e 100644 --- a/src/config/locales/bs-BA.json +++ b/src/config/locales/bs-BA.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 23a2cf4b66bbac256533d6253e4f367ad9196ea4 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:27:29 +0200 Subject: [PATCH 163/362] New translations en-US.json (Croatian) --- src/config/locales/hr-HR.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/hr-HR.json b/src/config/locales/hr-HR.json index f5d309d3b..9753d3a0c 100644 --- a/src/config/locales/hr-HR.json +++ b/src/config/locales/hr-HR.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 7f408d1605e2387012fecbc11bc74deb731f79fb Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:27:31 +0200 Subject: [PATCH 164/362] New translations en-US.json (Thai) --- src/config/locales/th-TH.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/th-TH.json b/src/config/locales/th-TH.json index 1080a4727..df5eaa53e 100644 --- a/src/config/locales/th-TH.json +++ b/src/config/locales/th-TH.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 18bd748c36dbdbde74fdf8fb75cc73e896811bf1 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:27:33 +0200 Subject: [PATCH 165/362] New translations en-US.json (Tamil) --- src/config/locales/ta-IN.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/ta-IN.json b/src/config/locales/ta-IN.json index 17d7e4199..a8704471a 100644 --- a/src/config/locales/ta-IN.json +++ b/src/config/locales/ta-IN.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 84f6a29eeb6269463bb183cdecf2d153e8e2ee87 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:27:35 +0200 Subject: [PATCH 166/362] New translations en-US.json (Persian) --- src/config/locales/fa-IR.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json index c51e98c4c..6840c6699 100644 --- a/src/config/locales/fa-IR.json +++ b/src/config/locales/fa-IR.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 82f7485df1b6dc2ecb74b7068c433e30ca67d94e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:27:37 +0200 Subject: [PATCH 167/362] New translations en-US.json (Indonesian) --- src/config/locales/id-ID.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/id-ID.json b/src/config/locales/id-ID.json index 43b19cd89..db96d0a50 100644 --- a/src/config/locales/id-ID.json +++ b/src/config/locales/id-ID.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 653fcbbe406f507aded06830f2aea71e5be70821 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:27:38 +0200 Subject: [PATCH 168/362] New translations en-US.json (Icelandic) --- src/config/locales/is-IS.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/is-IS.json b/src/config/locales/is-IS.json index 1080a4727..df5eaa53e 100644 --- a/src/config/locales/is-IS.json +++ b/src/config/locales/is-IS.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From d1006e1dd3398dbf81fcc7ab4c42312669ed8e56 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:27:40 +0200 Subject: [PATCH 169/362] New translations en-US.json (Galician) --- src/config/locales/gl-ES.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/gl-ES.json b/src/config/locales/gl-ES.json index 1080a4727..df5eaa53e 100644 --- a/src/config/locales/gl-ES.json +++ b/src/config/locales/gl-ES.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 7f49f10363d4ffdb1f7042c926720f00584d156b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:27:42 +0200 Subject: [PATCH 170/362] New translations en-US.json (Tibetan) --- src/config/locales/bo-BT.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/bo-BT.json b/src/config/locales/bo-BT.json index 1080a4727..df5eaa53e 100644 --- a/src/config/locales/bo-BT.json +++ b/src/config/locales/bo-BT.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 2188baac11f5d995b22980f72dedaf8264e77c2f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:27:45 +0200 Subject: [PATCH 171/362] New translations en-US.json (Uzbek) --- src/config/locales/uz-UZ.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/uz-UZ.json b/src/config/locales/uz-UZ.json index 1080a4727..df5eaa53e 100644 --- a/src/config/locales/uz-UZ.json +++ b/src/config/locales/uz-UZ.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 417ff58e89a3e52177afaa65f8abdac060f1a611 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:27:47 +0200 Subject: [PATCH 172/362] New translations en-US.json (Urdu (Pakistan)) --- src/config/locales/ur-PK.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/ur-PK.json b/src/config/locales/ur-PK.json index 5cbe49517..c58f8838f 100644 --- a/src/config/locales/ur-PK.json +++ b/src/config/locales/ur-PK.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From ff800dfa1502d4eefb19851823a4eff89ab498a2 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:27:49 +0200 Subject: [PATCH 173/362] New translations en-US.json (Sanskrit) --- src/config/locales/sa-IN.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/sa-IN.json b/src/config/locales/sa-IN.json index 1080a4727..df5eaa53e 100644 --- a/src/config/locales/sa-IN.json +++ b/src/config/locales/sa-IN.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 16f060ab40a0b66a98aacae89ab112208d459d0a Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:27:51 +0200 Subject: [PATCH 174/362] New translations en-US.json (Spanish, Argentina) --- src/config/locales/es-AR.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/es-AR.json b/src/config/locales/es-AR.json index 7bd7a12c4..eff206b86 100644 --- a/src/config/locales/es-AR.json +++ b/src/config/locales/es-AR.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 4d136feea1b93e861e187977d86e4cc79ca9404d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:27:53 +0200 Subject: [PATCH 175/362] New translations en-US.json (Acehnese) --- src/config/locales/ac-ace.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/ac-ace.json b/src/config/locales/ac-ace.json index b1304fc37..0d002219c 100644 --- a/src/config/locales/ac-ace.json +++ b/src/config/locales/ac-ace.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 9d183051bc68565d518d88c9df55e1f974e721a7 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:27:55 +0200 Subject: [PATCH 176/362] New translations en-US.json (Urdu (India)) --- src/config/locales/ur-IN.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/ur-IN.json b/src/config/locales/ur-IN.json index 5cbe49517..c58f8838f 100644 --- a/src/config/locales/ur-IN.json +++ b/src/config/locales/ur-IN.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 0c05c7faa95949dc3e92d4c64b362233e4d2d245 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:27:57 +0200 Subject: [PATCH 177/362] New translations en-US.json (Kabyle) --- src/config/locales/kab-KAB.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/kab-KAB.json b/src/config/locales/kab-KAB.json index b2a7a800f..fdb19013b 100644 --- a/src/config/locales/kab-KAB.json +++ b/src/config/locales/kab-KAB.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 43027a248994b2cdc8b547c2b8b98afa9ebcbbe3 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:27:59 +0200 Subject: [PATCH 178/362] New translations en-US.json (Gothic) --- src/config/locales/got-DE.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/got-DE.json b/src/config/locales/got-DE.json index 38468d2b9..8fd2e4ed9 100644 --- a/src/config/locales/got-DE.json +++ b/src/config/locales/got-DE.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 0c0eefc67bbffe60363b181ac336fbcf43a1131f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:28:01 +0200 Subject: [PATCH 179/362] New translations en-US.json (Nigerian Pidgin) --- src/config/locales/pcm-NG.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/pcm-NG.json b/src/config/locales/pcm-NG.json index e8cc8fec3..22e3c19b5 100644 --- a/src/config/locales/pcm-NG.json +++ b/src/config/locales/pcm-NG.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 0ec78d0d17b80344f7d8bddacc05b59c41c33bf3 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:28:03 +0200 Subject: [PATCH 180/362] New translations en-US.json (Turkmen) --- src/config/locales/tk-TM.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/tk-TM.json b/src/config/locales/tk-TM.json index 1080a4727..df5eaa53e 100644 --- a/src/config/locales/tk-TM.json +++ b/src/config/locales/tk-TM.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 123527d950034da8df375134f4b7a9484e223b00 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:28:05 +0200 Subject: [PATCH 181/362] New translations en-US.json (Assamese) --- src/config/locales/as-IN.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/as-IN.json b/src/config/locales/as-IN.json index 1080a4727..df5eaa53e 100644 --- a/src/config/locales/as-IN.json +++ b/src/config/locales/as-IN.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 80a0ebf1e2068a7266abb7b747b60a86d8a38cda Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:28:07 +0200 Subject: [PATCH 182/362] New translations en-US.json (Kashmiri) --- src/config/locales/ks-IN.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/ks-IN.json b/src/config/locales/ks-IN.json index 1080a4727..df5eaa53e 100644 --- a/src/config/locales/ks-IN.json +++ b/src/config/locales/ks-IN.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 874768abc7b088a1adc3ffe81b484402d8c15337 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:28:10 +0200 Subject: [PATCH 183/362] New translations en-US.json (Cebuano) --- src/config/locales/ceb-PH.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/ceb-PH.json b/src/config/locales/ceb-PH.json index 1080a4727..df5eaa53e 100644 --- a/src/config/locales/ceb-PH.json +++ b/src/config/locales/ceb-PH.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 5772b33fd58cfe5d128552646a1778f038cead3f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:28:12 +0200 Subject: [PATCH 184/362] New translations en-US.json (Yoruba) --- src/config/locales/yo-NG.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/yo-NG.json b/src/config/locales/yo-NG.json index 36aad5668..9b7c1e671 100644 --- a/src/config/locales/yo-NG.json +++ b/src/config/locales/yo-NG.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 4c7be96717dba69d38f9cf1cbcd5da1d1c48ea31 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:28:14 +0200 Subject: [PATCH 185/362] New translations en-US.json (Tajik) --- src/config/locales/tg-TJ.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/tg-TJ.json b/src/config/locales/tg-TJ.json index 1080a4727..df5eaa53e 100644 --- a/src/config/locales/tg-TJ.json +++ b/src/config/locales/tg-TJ.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From ebcc5e873fabbb02c36942345c2eb64f42fcaad1 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:28:16 +0200 Subject: [PATCH 186/362] New translations en-US.json (Nepali) --- src/config/locales/ne-NP.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/ne-NP.json b/src/config/locales/ne-NP.json index 1080a4727..df5eaa53e 100644 --- a/src/config/locales/ne-NP.json +++ b/src/config/locales/ne-NP.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From bf91ffa605315cf693fa5d4aad2ccaa14c8b0c6c Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:28:18 +0200 Subject: [PATCH 187/362] New translations en-US.json (Serbian (Latin)) --- src/config/locales/sr-CS.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/sr-CS.json b/src/config/locales/sr-CS.json index a2adc5c92..b439cdd8c 100644 --- a/src/config/locales/sr-CS.json +++ b/src/config/locales/sr-CS.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 1b73ada064f44fd84f00eb24d277f1681cb5fffe Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:28:20 +0200 Subject: [PATCH 188/362] New translations en-US.json (Swahili) --- src/config/locales/sw-KE.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/sw-KE.json b/src/config/locales/sw-KE.json index 1080a4727..df5eaa53e 100644 --- a/src/config/locales/sw-KE.json +++ b/src/config/locales/sw-KE.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 5353ceb44190d951f64fb852d690034c41dc90c6 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:28:22 +0200 Subject: [PATCH 189/362] New translations en-US.json (Vietnamese) --- src/config/locales/vi-VN.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/vi-VN.json b/src/config/locales/vi-VN.json index a067eb02b..2026a5395 100644 --- a/src/config/locales/vi-VN.json +++ b/src/config/locales/vi-VN.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 33141ba5d25138a3faa01f01887bcd592bc8c8dd Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:28:24 +0200 Subject: [PATCH 190/362] New translations en-US.json (Chinese Traditional) --- src/config/locales/zh-TW.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/zh-TW.json b/src/config/locales/zh-TW.json index 367b9301e..ff344b416 100644 --- a/src/config/locales/zh-TW.json +++ b/src/config/locales/zh-TW.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 4542e0130fe3d92966b21f29f965116e672e5337 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:28:25 +0200 Subject: [PATCH 191/362] New translations en-US.json (Hindi) --- src/config/locales/hi-IN.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/hi-IN.json b/src/config/locales/hi-IN.json index a33f341bc..f4d2cc629 100644 --- a/src/config/locales/hi-IN.json +++ b/src/config/locales/hi-IN.json @@ -585,5 +585,8 @@ "communities": { "joined": "सदस्यता", "discover": "खोजिए" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 51392c6ce766b1a9814bea04a4f10cead11a345e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:28:28 +0200 Subject: [PATCH 192/362] New translations en-US.json (German) --- src/config/locales/de-DE.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/de-DE.json b/src/config/locales/de-DE.json index 6c731f9d4..ca7a63b41 100644 --- a/src/config/locales/de-DE.json +++ b/src/config/locales/de-DE.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 89e11d85e66a1f00ba6c9ff69bcab042d55d2325 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:28:30 +0200 Subject: [PATCH 193/362] New translations en-US.json (Armenian) --- src/config/locales/hy-AM.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/hy-AM.json b/src/config/locales/hy-AM.json index 7612c6ef4..75dd49881 100644 --- a/src/config/locales/hy-AM.json +++ b/src/config/locales/hy-AM.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 8d421b3af59c488aae29986215a8a1fa77d7179b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:28:32 +0200 Subject: [PATCH 194/362] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index f287db175..749c249f7 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From cffb1e6feeee53b097b2fca14e98c93e5a88fd7e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:28:33 +0200 Subject: [PATCH 195/362] New translations en-US.json (Hebrew) --- src/config/locales/he-IL.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/he-IL.json b/src/config/locales/he-IL.json index 655f74e17..26a74d525 100644 --- a/src/config/locales/he-IL.json +++ b/src/config/locales/he-IL.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From a1d377037b8be818a9c4efd2adbbfe646f3b445e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:28:35 +0200 Subject: [PATCH 196/362] New translations en-US.json (Irish) --- src/config/locales/ga-IE.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/ga-IE.json b/src/config/locales/ga-IE.json index 1080a4727..df5eaa53e 100644 --- a/src/config/locales/ga-IE.json +++ b/src/config/locales/ga-IE.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 266919acf1848a431cfbe80c49f616c513de20a6 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:28:37 +0200 Subject: [PATCH 197/362] New translations en-US.json (Finnish) --- src/config/locales/fi-FI.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/fi-FI.json b/src/config/locales/fi-FI.json index b92804eb3..5b2caac33 100644 --- a/src/config/locales/fi-FI.json +++ b/src/config/locales/fi-FI.json @@ -585,5 +585,8 @@ "communities": { "joined": "Jäsenyys", "discover": "Löydä uutta" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From b47e9551126d47183b9a35777742ba43e7198b85 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:28:39 +0200 Subject: [PATCH 198/362] New translations en-US.json (Greek) --- src/config/locales/el-GR.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/el-GR.json b/src/config/locales/el-GR.json index 1080a4727..df5eaa53e 100644 --- a/src/config/locales/el-GR.json +++ b/src/config/locales/el-GR.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From e6167780a33bb0356537fcad69f993340689d7fe Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:28:41 +0200 Subject: [PATCH 199/362] New translations en-US.json (Danish) --- src/config/locales/da-DK.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/da-DK.json b/src/config/locales/da-DK.json index 1080a4727..df5eaa53e 100644 --- a/src/config/locales/da-DK.json +++ b/src/config/locales/da-DK.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From d3cd183dd026218ba5295607622bb1a11d2f31ef Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:28:43 +0200 Subject: [PATCH 200/362] New translations en-US.json (Japanese) --- src/config/locales/ja-JP.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/ja-JP.json b/src/config/locales/ja-JP.json index cc55d5dfa..d1a85ee44 100644 --- a/src/config/locales/ja-JP.json +++ b/src/config/locales/ja-JP.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 877c8d4c60b4befaafd7c2b2e1a2a843bb69b8e1 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:28:45 +0200 Subject: [PATCH 201/362] New translations en-US.json (Czech) --- src/config/locales/cs-CZ.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/cs-CZ.json b/src/config/locales/cs-CZ.json index 1080a4727..df5eaa53e 100644 --- a/src/config/locales/cs-CZ.json +++ b/src/config/locales/cs-CZ.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 1ec42511462fbc659a23151570f4ab837aa4bda3 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:28:47 +0200 Subject: [PATCH 202/362] New translations en-US.json (Catalan) --- src/config/locales/ca-ES.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/ca-ES.json b/src/config/locales/ca-ES.json index 1080a4727..df5eaa53e 100644 --- a/src/config/locales/ca-ES.json +++ b/src/config/locales/ca-ES.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From eeae7c412e6960410605dfd15756f69232bbb13a Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:28:49 +0200 Subject: [PATCH 203/362] New translations en-US.json (Bulgarian) --- src/config/locales/bg-BG.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/bg-BG.json b/src/config/locales/bg-BG.json index 00f6f1c10..276713b52 100644 --- a/src/config/locales/bg-BG.json +++ b/src/config/locales/bg-BG.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From f308a9e3cb5826ace969db3674671c3515b890ec Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:28:51 +0200 Subject: [PATCH 204/362] New translations en-US.json (Arabic) --- src/config/locales/ar-SA.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/ar-SA.json b/src/config/locales/ar-SA.json index fe0a573a4..b6a8c7e8c 100644 --- a/src/config/locales/ar-SA.json +++ b/src/config/locales/ar-SA.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 6931d7eba5a49c96ad89b462abdf44f95dcc9222 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:28:53 +0200 Subject: [PATCH 205/362] New translations en-US.json (Spanish) --- src/config/locales/es-ES.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/es-ES.json b/src/config/locales/es-ES.json index 3ae0f7c21..41b7536b1 100644 --- a/src/config/locales/es-ES.json +++ b/src/config/locales/es-ES.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membresía", "discover": "Descubrir" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 32ba20c7f85cd1e6222cf3345a9a399dd348d40d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:28:55 +0200 Subject: [PATCH 206/362] New translations en-US.json (Romanian) --- src/config/locales/ro-RO.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/ro-RO.json b/src/config/locales/ro-RO.json index 936c9f7d6..fb9a4b53b 100644 --- a/src/config/locales/ro-RO.json +++ b/src/config/locales/ro-RO.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 0143b0df72e638226701570ee2ddc01ca39b14e5 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:28:57 +0200 Subject: [PATCH 207/362] New translations en-US.json (French) --- src/config/locales/fr-FR.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/fr-FR.json b/src/config/locales/fr-FR.json index d37b48178..649def19b 100644 --- a/src/config/locales/fr-FR.json +++ b/src/config/locales/fr-FR.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From fe271be8d2d1d22d6c32f77b80b3d57886710dc9 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:28:59 +0200 Subject: [PATCH 208/362] New translations en-US.json (Italian) --- src/config/locales/it-IT.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/it-IT.json b/src/config/locales/it-IT.json index 6ddb147e4..653699f2c 100644 --- a/src/config/locales/it-IT.json +++ b/src/config/locales/it-IT.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 6778726d3841d212614a2f3542d76060a87b6e51 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:29:01 +0200 Subject: [PATCH 209/362] New translations en-US.json (Georgian) --- src/config/locales/ka-GE.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/ka-GE.json b/src/config/locales/ka-GE.json index 1080a4727..df5eaa53e 100644 --- a/src/config/locales/ka-GE.json +++ b/src/config/locales/ka-GE.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From d9ff416c8a56f7f5a779d0f053adf9ca7099c7b7 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:29:03 +0200 Subject: [PATCH 210/362] New translations en-US.json (Chinese Simplified) --- src/config/locales/zh-CN.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/zh-CN.json b/src/config/locales/zh-CN.json index 5e021ae88..56223543e 100644 --- a/src/config/locales/zh-CN.json +++ b/src/config/locales/zh-CN.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 5be156ee87b496f2f4dd6fa914050d2a75295711 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:29:05 +0200 Subject: [PATCH 211/362] New translations en-US.json (Portuguese) --- src/config/locales/pt-PT.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/pt-PT.json b/src/config/locales/pt-PT.json index 7cff5ee78..17b42c2b6 100644 --- a/src/config/locales/pt-PT.json +++ b/src/config/locales/pt-PT.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 16b7125986f8a4268f23bd1e164935835a5af1d3 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:29:07 +0200 Subject: [PATCH 212/362] New translations en-US.json (Ukrainian) --- src/config/locales/uk-UA.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/uk-UA.json b/src/config/locales/uk-UA.json index 7b23f3370..dc3719ffb 100644 --- a/src/config/locales/uk-UA.json +++ b/src/config/locales/uk-UA.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 5b8921511e0eed3f8d8c4242a264dcdd5ce417b8 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:29:09 +0200 Subject: [PATCH 213/362] New translations en-US.json (Turkish) --- src/config/locales/tr-TR.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/tr-TR.json b/src/config/locales/tr-TR.json index 088da26fb..3274a4458 100644 --- a/src/config/locales/tr-TR.json +++ b/src/config/locales/tr-TR.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From a52ea99906516fc0209e0b25498e1973e9764b93 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:29:11 +0200 Subject: [PATCH 214/362] New translations en-US.json (Swedish) --- src/config/locales/sv-SE.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/sv-SE.json b/src/config/locales/sv-SE.json index 1080a4727..df5eaa53e 100644 --- a/src/config/locales/sv-SE.json +++ b/src/config/locales/sv-SE.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From d283f10b1a8ac1fb230f35a9676d7ba40aace3e5 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:29:12 +0200 Subject: [PATCH 215/362] New translations en-US.json (Albanian) --- src/config/locales/sq-AL.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/sq-AL.json b/src/config/locales/sq-AL.json index 7612c6ef4..75dd49881 100644 --- a/src/config/locales/sq-AL.json +++ b/src/config/locales/sq-AL.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From da8578361fb7dec9f5342da043e4494d1e300c43 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:29:14 +0200 Subject: [PATCH 216/362] New translations en-US.json (Slovenian) --- src/config/locales/sl-SI.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/sl-SI.json b/src/config/locales/sl-SI.json index a52352497..de986149c 100644 --- a/src/config/locales/sl-SI.json +++ b/src/config/locales/sl-SI.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 34d5285cc1b3c0b796fe43adc2151d889a92c990 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:29:16 +0200 Subject: [PATCH 217/362] New translations en-US.json (Slovak) --- src/config/locales/sk-SK.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/sk-SK.json b/src/config/locales/sk-SK.json index 1080a4727..df5eaa53e 100644 --- a/src/config/locales/sk-SK.json +++ b/src/config/locales/sk-SK.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From ec2e3df60a6ca5980e70e9930dbcf01ca6e8cf10 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:29:18 +0200 Subject: [PATCH 218/362] New translations en-US.json (Russian) --- src/config/locales/ru-RU.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/ru-RU.json b/src/config/locales/ru-RU.json index a624eb8f0..650b16bbb 100644 --- a/src/config/locales/ru-RU.json +++ b/src/config/locales/ru-RU.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 38ca27d4edbdeeb39de8683c6fc04da80f0af3d1 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:29:20 +0200 Subject: [PATCH 219/362] New translations en-US.json (Polish) --- src/config/locales/pl-PL.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/pl-PL.json b/src/config/locales/pl-PL.json index 8991f9c74..efaf86ca8 100644 --- a/src/config/locales/pl-PL.json +++ b/src/config/locales/pl-PL.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 3a5d390d8f19f6383ae53471feda24e58e09aab8 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:29:22 +0200 Subject: [PATCH 220/362] New translations en-US.json (Korean) --- src/config/locales/ko-KR.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/ko-KR.json b/src/config/locales/ko-KR.json index 371941d14..af86b361c 100644 --- a/src/config/locales/ko-KR.json +++ b/src/config/locales/ko-KR.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From b09efc77fc8510f69a0a7935ad96b6324090b0e7 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:29:24 +0200 Subject: [PATCH 221/362] New translations en-US.json (Punjabi) --- src/config/locales/pa-IN.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/pa-IN.json b/src/config/locales/pa-IN.json index 1080a4727..df5eaa53e 100644 --- a/src/config/locales/pa-IN.json +++ b/src/config/locales/pa-IN.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From e2cf3b12d1f2179a058d85fd50440e3c0b61e8a9 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:29:26 +0200 Subject: [PATCH 222/362] New translations en-US.json (Norwegian) --- src/config/locales/no-NO.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/no-NO.json b/src/config/locales/no-NO.json index 1080a4727..df5eaa53e 100644 --- a/src/config/locales/no-NO.json +++ b/src/config/locales/no-NO.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 16b7cce2451d9aa924de8853edaa4971213fbe7b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:29:28 +0200 Subject: [PATCH 223/362] New translations en-US.json (Dutch) --- src/config/locales/nl-NL.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/nl-NL.json b/src/config/locales/nl-NL.json index 0d51eaecd..6ab5328ba 100644 --- a/src/config/locales/nl-NL.json +++ b/src/config/locales/nl-NL.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 510961fbff2f6eca99a5bfc6d24330a24476eb67 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:29:30 +0200 Subject: [PATCH 224/362] New translations en-US.json (Mongolian) --- src/config/locales/mn-MN.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/mn-MN.json b/src/config/locales/mn-MN.json index 1080a4727..df5eaa53e 100644 --- a/src/config/locales/mn-MN.json +++ b/src/config/locales/mn-MN.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 30c12cc59513004b6b6ac0ea43f270a5b33a9c8f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:29:32 +0200 Subject: [PATCH 225/362] New translations en-US.json (Macedonian) --- src/config/locales/mk-MK.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/mk-MK.json b/src/config/locales/mk-MK.json index 1080a4727..df5eaa53e 100644 --- a/src/config/locales/mk-MK.json +++ b/src/config/locales/mk-MK.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From f6b78fd146bc66412c3a01960c1f5c0e20059011 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:29:34 +0200 Subject: [PATCH 226/362] New translations en-US.json (Lithuanian) --- src/config/locales/lt-LT.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/lt-LT.json b/src/config/locales/lt-LT.json index d03173a2f..65d8b1441 100644 --- a/src/config/locales/lt-LT.json +++ b/src/config/locales/lt-LT.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From caac31d9b4d8e22556282b4a8bd8b57f62633b04 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:29:36 +0200 Subject: [PATCH 227/362] New translations en-US.json (Kurdish) --- src/config/locales/ku-TR.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/ku-TR.json b/src/config/locales/ku-TR.json index 4b861af12..5c91e8e14 100644 --- a/src/config/locales/ku-TR.json +++ b/src/config/locales/ku-TR.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From cb498ab7ace60c5914e0ee5a1f7f46f86c3cbc9c Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:29:38 +0200 Subject: [PATCH 228/362] New translations en-US.json (Spanish, Mexico) --- src/config/locales/es-MX.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/es-MX.json b/src/config/locales/es-MX.json index 7bd7a12c4..eff206b86 100644 --- a/src/config/locales/es-MX.json +++ b/src/config/locales/es-MX.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 7b4f6587653256192de8ba8e14c995c35580fb7d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:37:12 +0200 Subject: [PATCH 229/362] Update source file en-US.json --- src/config/locales/en-US.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json index 7bd7a12c4..eff206b86 100644 --- a/src/config/locales/en-US.json +++ b/src/config/locales/en-US.json @@ -585,5 +585,8 @@ "communities": { "joined": "Membership", "discover": "Discover" + }, + "empty_screen": { + "nothing_here": "Nothing here" } } From 4dca90c6bd52e70f78575ad35ad1bdf933ed1a4b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 21 Jan 2021 23:56:15 +0200 Subject: [PATCH 230/362] New translations en-US.json (Finnish) --- src/config/locales/fi-FI.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/locales/fi-FI.json b/src/config/locales/fi-FI.json index 5b2caac33..ba27a8ae4 100644 --- a/src/config/locales/fi-FI.json +++ b/src/config/locales/fi-FI.json @@ -587,6 +587,6 @@ "discover": "Löydä uutta" }, "empty_screen": { - "nothing_here": "Nothing here" + "nothing_here": "Täällä ei ole mitään" } } From c94f02bad6f68b93110a4e8563fef9f9e41c0ec0 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Fri, 22 Jan 2021 00:15:02 +0200 Subject: [PATCH 231/362] New translations en-US.json (Spanish) --- src/config/locales/es-ES.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/locales/es-ES.json b/src/config/locales/es-ES.json index 41b7536b1..15dd447a9 100644 --- a/src/config/locales/es-ES.json +++ b/src/config/locales/es-ES.json @@ -587,6 +587,6 @@ "discover": "Descubrir" }, "empty_screen": { - "nothing_here": "Nothing here" + "nothing_here": "Nada aquí" } } From 2f20d2e274b15460fa21344850f15486459f42e5 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Fri, 22 Jan 2021 00:25:40 +0200 Subject: [PATCH 232/362] New translations en-US.json (Slovenian) --- src/config/locales/sl-SI.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/locales/sl-SI.json b/src/config/locales/sl-SI.json index de986149c..7a5a269af 100644 --- a/src/config/locales/sl-SI.json +++ b/src/config/locales/sl-SI.json @@ -587,6 +587,6 @@ "discover": "Discover" }, "empty_screen": { - "nothing_here": "Nothing here" + "nothing_here": "Tu ni ničesar" } } From 04c4919bf391ae68c542acbe805ff25139c41f07 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Fri, 22 Jan 2021 18:36:07 +0200 Subject: [PATCH 233/362] New translations en-US.json (Hindi) --- src/config/locales/hi-IN.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/locales/hi-IN.json b/src/config/locales/hi-IN.json index f4d2cc629..0294b73c2 100644 --- a/src/config/locales/hi-IN.json +++ b/src/config/locales/hi-IN.json @@ -587,6 +587,6 @@ "discover": "खोजिए" }, "empty_screen": { - "nothing_here": "Nothing here" + "nothing_here": "कुछ नहीं है यहां" } } From 841c0399e53eac764e6b84616b90405ff101bb3f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Fri, 22 Jan 2021 23:14:38 +0200 Subject: [PATCH 234/362] New translations en-US.json (Portuguese) --- src/config/locales/pt-PT.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/config/locales/pt-PT.json b/src/config/locales/pt-PT.json index 17b42c2b6..6930a999c 100644 --- a/src/config/locales/pt-PT.json +++ b/src/config/locales/pt-PT.json @@ -252,7 +252,7 @@ "schedules": "Agendar", "gallery": "Galeria", "settings": "Configurações", - "communities": "Communities", + "communities": "Comunidades", "add_account": "Adicionar conta", "logout": "Sair", "cancel": "Cancelar", @@ -550,7 +550,7 @@ "title": "Tópicos" }, "communities": { - "title": "Groups", + "title": "Grupos", "subscribe": "Aderir", "unsubscribe": "Sair", "subscribers": "Membros", @@ -583,10 +583,10 @@ "unfollow": "Deixar de seguir" }, "communities": { - "joined": "Membership", - "discover": "Discover" + "joined": "Membros", + "discover": "Descobrir" }, "empty_screen": { - "nothing_here": "Nothing here" + "nothing_here": "Nada aqui" } } From cc07c68f6ef37840983a7de0c6a0b3ce148e95ab Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 23 Jan 2021 04:03:48 +0200 Subject: [PATCH 235/362] New translations en-US.json (Bulgarian) --- src/config/locales/bg-BG.json | 68 +++++++++++++++++------------------ 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/src/config/locales/bg-BG.json b/src/config/locales/bg-BG.json index 276713b52..148843612 100644 --- a/src/config/locales/bg-BG.json +++ b/src/config/locales/bg-BG.json @@ -159,7 +159,7 @@ "voting_power": "Сила за гласуване", "login_to_see": "Влез в акаунта да видиш", "follow_people": "Последвайте хора да ви последват и те", - "follow_communities": "Join some communities to fill your feed", + "follow_communities": "Влез в някой общества за да изпълниш потока си", "havent_commented": "Все още няма коментари", "havent_posted": "Все още няма публикации", "steem_power": "Hive Сила/стойност", @@ -241,8 +241,8 @@ "new": "Нови", "blog": "Блог", "posts": "Публикации", - "friends": "Friends", - "communities": "Communities" + "friends": "Приятели", + "communities": "Общности" }, "side_menu": { "profile": "Профил", @@ -252,14 +252,14 @@ "schedules": "Графици", "gallery": "Галерия", "settings": "Настройки", - "communities": "Communities", + "communities": "Общности", "add_account": "Добавяне на профил", "logout": "Изход", "cancel": "Отказ", "logout_text": "Сигурни ли сте, че искате да излезете?", - "create_a_new_account": "Create a new account", - "add_an_existing_account": "Add an existing account", - "accounts": "Accounts" + "create_a_new_account": "Създаване на нов акаунт", + "add_an_existing_account": "Добави съществуващ акаунт", + "accounts": "Акаунти" }, "header": { "title": "Влезте, за да персонализирате вашите постове", @@ -288,18 +288,18 @@ "limited_characters": "Използвайте само малки букви, цифри и едно тире", "limited_firstchar": "Тагът трябва да започва с буква!", "limited_lastchar": "Тагът трябва да завършва с буква или число", - "setting_schedule": "Scheduling Time", - "setting_reward": "Reward", - "setting_beneficiary": "Beneficiary", - "reward_default": "Default 50% / 50%", - "reward_power_up": "Power Up 100%", - "reward_decline": "Decline Payout", - "beneficiaries": "Beneficiaries", - "options": "Options", - "my_blog": "My Blog", - "my_communities": "My Communities", - "top_communities": "Top Communities", - "schedule_modal_title": "Schedule Post" + "setting_schedule": "Насрочване за време", + "setting_reward": "Награда", + "setting_beneficiary": "Бенефициент", + "reward_default": "По подразбиране 50% / 50%", + "reward_power_up": "Намаляне на силата 100%", + "reward_decline": "Откажи плащането", + "beneficiaries": "Бенефициенти", + "options": "Опции", + "my_blog": "Моят блог", + "my_communities": "Моите общества", + "top_communities": "Топ Общности", + "schedule_modal_title": "Насрочи пост" }, "pincode": { "enter_text": "Вкарай Пин-код за отключване", @@ -315,7 +315,7 @@ "fail": "Провал!!", "move": "Премести", "move_question": "Сигурен ли сте да преместите към чернови?", - "success_shared": "Success! Content submitted!", + "success_shared": "Успех! Съдържанието е изпратено!", "success_moved": "Премено в чернови", "permission_denied": "Достъпът е отказан", "permission_text": "Моля, идете на Настройки на телефона и променете разрешенията към Ecency.", @@ -325,15 +325,15 @@ "success_favorite": "Добавено в любими!", "success_unfavorite": "Прамахнат от любими!", "success_follow": "Последван успешно!", - "fail_follow": "Follow failed!", - "success_subscribe": "Subscribe success!", - "fail_subscribe": "Subscribe failed!", - "success_leave": "Leave success!", - "fail_leave": "Leave failed!", + "fail_follow": "Последването се провали!", + "success_subscribe": "Абонирането е успешно!", + "fail_subscribe": "Абонирането се провали!", + "success_leave": "Излизането е успешно!", + "fail_leave": "Излизането се провали!", "success_mute": "Заглушаване успешно!", "success_unmute": "Заглушаване премахнато успешно!", "success_unfollow": "Отказ от следване!", - "fail_unfollow": "Unfollow failed!", + "fail_unfollow": "Отследването се провали!", "warning": "Внимание", "invalid_pincode": "Невалиден Пин-код,провери и опитай отново.", "remove_alert": "Сигорни ли сте за премахването?", @@ -349,7 +349,7 @@ "same_user": "Този потребител вече е добавен в листа.", "unknow_error": "Възникна грешка", "error": "Грешка", - "fetch_error": "Connection issue, change server and restart", + "fetch_error": "Проблем с връзката, сменете сървъра и рестартирайте", "connection_fail": "Връзката е неуспешна", "connection_success": "Успешно свързване.", "checking": "Проверка...", @@ -360,10 +360,10 @@ "payloadTooLarge": "Размерът на файла е твърде голям, моля преоразмерете или качете по-малко изображение", "qoutaExceeded": "Превишена квота за качване", "invalidImage": "Невалидна снимка,опитайте различен файл", - "something_wrong": "Something went wrong.", - "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload", - "can_not_be_empty": "Title and body can not be empty!" + "something_wrong": "Нещо се обърка.", + "something_wrong_alt": "Опитай https://ecency.com", + "something_wrong_reload": "Презареди", + "can_not_be_empty": "Заглавитето и основата немогат да бъдат празни!" }, "post": { "reblog_alert": "Сигорни ли сте,че искате да споделите?", @@ -511,7 +511,7 @@ "days": "дни", "user": "Потребител", "permlink": "Публикация", - "permlinkPlaceholder": "username/permlink", + "permlinkPlaceholder": "потребителско име/permlink", "information": "Сигурни ли сте, че искате да промотирате?" }, "boostPost": { @@ -539,9 +539,9 @@ "more_replies": "още отговори" }, "search_result": { - "others": "Others", + "others": "Други", "best": { - "title": "Best" + "title": "Най-добри" }, "people": { "title": "People" From be818aceda3cfc1206cb4629298f56b4294955cd Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 23 Jan 2021 04:13:57 +0200 Subject: [PATCH 236/362] New translations en-US.json (Bulgarian) --- src/config/locales/bg-BG.json | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/config/locales/bg-BG.json b/src/config/locales/bg-BG.json index 148843612..2fb9b8893 100644 --- a/src/config/locales/bg-BG.json +++ b/src/config/locales/bg-BG.json @@ -544,23 +544,23 @@ "title": "Най-добри" }, "people": { - "title": "People" + "title": "Хора" }, "topics": { - "title": "Topics" + "title": "Tеми" }, "communities": { - "title": "Groups", - "subscribe": "Join", - "unsubscribe": "Leave", - "subscribers": "Members", + "title": "Групи", + "subscribe": "Присъединете се", + "unsubscribe": "Напусни", + "subscribers": "Членове", "posters": "Публикуващи", "posts": "Публикации" }, "communities_filter": { - "my": "My Communities", + "my": "Моите общества", "rank": "Ранг", - "subs": "Members", + "subs": "Членове", "new": "Нови" }, "post_result_filter": { @@ -575,18 +575,18 @@ }, "community": { "new_post": "Нова публикация", - "community": "community", - "details": "Details" + "community": "oбщество", + "details": "Подробности" }, "user": { - "follow": "Follow", - "unfollow": "Unfollow" + "follow": "Последвай", + "unfollow": "Отследване" }, "communities": { - "joined": "Membership", - "discover": "Discover" + "joined": "Членство", + "discover": "Открийте" }, "empty_screen": { - "nothing_here": "Nothing here" + "nothing_here": "Няма нищо тук" } } From d7c50aa77d7b0e8c5deb3fb07e5c808dae7133f9 Mon Sep 17 00:00:00 2001 From: feruz Date: Sat, 23 Jan 2021 21:08:27 +0200 Subject: [PATCH 237/362] update profile def cover --- ios/Ecency.xcodeproj/project.pbxproj | 14 +++++++------- ios/Podfile.lock | 2 +- src/assets/dark_cover_image.png | Bin 7964 -> 3240 bytes src/assets/dark_cover_image@2x.png | Bin 4153 -> 5770 bytes src/assets/dark_cover_image@3x.png | Bin 7130 -> 8457 bytes 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ios/Ecency.xcodeproj/project.pbxproj b/ios/Ecency.xcodeproj/project.pbxproj index 43297c5af..c74c86d75 100644 --- a/ios/Ecency.xcodeproj/project.pbxproj +++ b/ios/Ecency.xcodeproj/project.pbxproj @@ -43,7 +43,7 @@ 05B6C4B024C306CE00B7FA60 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 980BC9BC0D3B4AC69645C842 /* Zocial.ttf */; }; 0A1D279E0D3CD306C889592E /* libPods-Ecency-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7093E51BBC0EE2F41AB19EBA /* libPods-Ecency-tvOS.a */; }; 1CD0B89E258019B600A7D78E /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1CD0B89B258019B600A7D78E /* GoogleService-Info.plist */; }; - 2B3CF3607B7CB9B7296FD5EF /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; + 2B3CF3607B7CB9B7296FD5EF /* (null) in Frameworks */ = {isa = PBXBuildFile; }; 2D02E4BC1E0B4A80006451C7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; 2D02E4BD1E0B4A84006451C7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; @@ -55,7 +55,7 @@ CFAA2A599FD65F360D9B3E1E /* libPods-EcencyTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B344CAA24725C973F48BE81E /* libPods-EcencyTests.a */; }; D71EB20EDB9B987C0574BAFE /* libPods-EcencyTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C97456BE898C00B5EDA21C2E /* libPods-EcencyTests.a */; }; DC0E25610BB5F49AFF4514AD /* libPods-Ecency.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 388DF3FF85F08109F722083B /* libPods-Ecency.a */; }; - F77F6C7E54F3C783A2773E9D /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; + F77F6C7E54F3C783A2773E9D /* (null) in Frameworks */ = {isa = PBXBuildFile; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -204,8 +204,8 @@ buildActionMask = 2147483647; files = ( 05B6C49424C306CE00B7FA60 /* StoreKit.framework in Frameworks */, - F77F6C7E54F3C783A2773E9D /* BuildFile in Frameworks */, - 2B3CF3607B7CB9B7296FD5EF /* BuildFile in Frameworks */, + F77F6C7E54F3C783A2773E9D /* (null) in Frameworks */, + 2B3CF3607B7CB9B7296FD5EF /* (null) in Frameworks */, DC0E25610BB5F49AFF4514AD /* libPods-Ecency.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1101,10 +1101,10 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Ecency/EcencyDebug.entitlements; - CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2563; + CURRENT_PROJECT_VERSION = 2792; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = 75B6RXTKGT; HEADER_SEARCH_PATHS = ( @@ -1180,7 +1180,7 @@ CODE_SIGN_ENTITLEMENTS = Ecency/Ecency.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2563; + CURRENT_PROJECT_VERSION = 2792; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = 75B6RXTKGT; HEADER_SEARCH_PATHS = ( diff --git a/ios/Podfile.lock b/ios/Podfile.lock index f75c4ba50..afcb83b21 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -721,4 +721,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 1f30c7da5061dbc47185442a6ab4a3c95ac48c04 -COCOAPODS: 1.10.0 +COCOAPODS: 1.9.3 diff --git a/src/assets/dark_cover_image.png b/src/assets/dark_cover_image.png index cdcdf788d4fd8d98aa32e6bd80aca24d054fa42b..896e454b954461b705c5ef5d2c0faeae28284543 100755 GIT binary patch literal 3240 zcmb_e2~-o;8osQ`;#1)%N~{ghDhiX#O!jE-A&C+s7BTMh>0~m2K#~bbfUvl*SfN!> zTJ=?F+G<5XrIbEU#0^pLq2dZ^6$QkVQdv}_igtoP?K^E>PtTikX6DYl-~IpZ|Nrma zJ6U0~XAW`ob_D=b zs{jGHU}HT%vw(c>)|L4*ik^!hc##PJH&5Gb2e#&p0>Jr{MzPSmP#!A6NgWeYkxGJT z(HST-08^(~3>Y3mnCVI)Qll3$9+w|w&^0PCV*ytV%MC$9lqNXINX$)|t-zCFaG{DZ zEr34NBBBiF2s1{v=(Kv1$RcL++7(f4TQ`eA?}eCS#Ed|jL;6B_7(IwI5_BFDhHw~0 z>3ks*;c++ufj=FEQJ4kuSqKcFs0ikXxNLgg#h|PyUsGMfz|7Aqkk zftkQ&lEz3DA`}W)Fv>zvh(bW7M705I>P>xVq7ufkUA&NAUrYQ1v zOb-nI$^n&HxqQIKZ*tM;23(lT(s(M2zJ&ZH+N4M{5Ug;*M8+9$LK;ue9A}HhAPO=P zn3*&xNK)HhsIY#@bQER6bYD4!YxK4tCcQO+f{IYCAIuiP z@EfR{RB6qoShX;y9}2KuR9YfjB%q0V!dg8bT2zMj%{1SBMSFmymdzO$4_2Z`Ol~ z#3>uU&=aauY@resKs*9NAtBD;Kmrw81tADq1*?@Pj;lHSY~D9&s3nPM-?nOFrJ^hn zN-n}9I4X#XB3y`r5HO_V@)3xK3V9fY^0+u#WfOj{mPElC6IJEJzNIvmi0x}>HS}Kj zh%nr?EW`}lrUydB=L4bR^R=a*&p{|tv^+hE`5jP>6V>>Yb+Gp35!+ePj0w&uXmLVXMz zPK2Jyl#x1mj(n0D0)XQ~nIupVoJG_mF_AixaZq(h_epA8n>s| zz4F3t_i^Vt@831ba!#;v7=Fc7c)j>#ee33)o}T*0XY6X)AH2J=@yp7^4~xY;ae|b= zZ5OPM_T;3~qlS&uuG-*;kzO3#^nd= zwrv;`V~wOW=5@eL|2{sHqiufw>Ik2S(%~L!cXiD<(&f6s?O!gIp))gX7H^HXf93NG ze@wrK-R#}$TP)rbbE6<))wpr%*Y2t*8Csaewrj~;p4M(|omG+SpHL+^(Plba$7o*W zO|OkOMo;!U{v+qch8DPVmYYeQKO=F-f(%&=e6{OtVFUgwIfd;y{A|+Rt_igEr4y!) zY;{6Oi|4Y9gY@`m$MoDhtJfZH+Pu|8frTwz(v44BLfX>WiZ8eIKn#6X$CYoASoV?L z&fRC{6;6z1IwhYAttWgU4h}Os+@yandTi~eX6*<0r$86~`TZ%ixi0Y>dAF0|w1-}? zai#s3-Tz_mJ1(h1h$U;jO`UkY@_uIyh#2n}ROptre9W%OVjc71{FIy93z!@?YQmV4}!XT!&->HgTVgjdt=IOZQYnt#d>UsB8cHt%}%ZlPR} z4!;iV7{9DM`Ui~%ZM^iFHOOU+@c7PADwoGUS)IGrcf?*ay;SDTs^j?7`E<1UqL9U-SOr4^~@u4NVaox=n5$O$%g{w4B}A;7zN?US{|;f87{Z z8Bh4E^|>*9!nHGx%ZQ=iBFdRaEUSXdlUQ;dLDdA2a{z%O|NV4?SbqlLXeg zrMxDOguG-I%xeAcsO;&26En;9ew97`rq9i+h#+MFI+oxukuN!EN%z3e|us_ z#G~kHj=qpvGv9@^&p+RdMUeWB;x@7rVy6eXR4^;hmG7H@d!(xXX2`H){*0 z+F!3c7nfSNVpvLYN<$ZI%8Tc2oEJGaYP9?PRNJCwpDVfknMY{^-+zRA=Xl27mLKri za_hm1LHM%RZN*K=F$r3v#Q?zBGf|HvBN z+EujoML>Dv$G2*uQ-c%9OC8>ES!I{?4gbi#EGcvL8te4jqbP)1HK%Z7CheQ+xRYS+ z9rJ;ncb&_U8{Y}M4PG7N%-O!QMsuO<$!GWjh!!8bshS`B+2n<0uf3t!`Yi3l%_X5F zA7(#Vta`_5$-(p}=E_B&3~In)_O$V+{Zioy)P?q}`F64dRr!{b+3qkdc(Ctiz} zS8=i*<%H2Xr@F7RPS{i7x@V@>r-Cp$Pi^MOdAm=(*Z7Kd$}4!^GWW%Yx+Qsy_3!27 zS8Uj)Id&#L|4FsNkU3ZTHRJM@@hs0W#I4aI<;9?Tp||EV&BzEy$epdtzFcy+uBhZm zfptwt=;fDAyLNv5{mzWe6a40;#rw;DdNw4eYlZk}^u1%cn+3CmH|^^#&G#E_xbyIq z{k1&B7W?&I?Mb#{-NykCxVx$8M!9BlaY?E)Ccj1S)tb1>qRH)Y e-C1enYr9JuPtxmot9RIb)@9P!lEUfB(tZZB{Nro@ literal 7964 zcmV+%ALHPOP)~-2jf-0Dsv4cgX;H%K(wx0EW~6 zf7Aem*#Lmg0E^oIe9r)y;Q({S0G8hXiq`;Xz5s*L0C2qK6)qFN-C*|hWOvy^+<@2FZc_6tfZAy0}>2xu%6Eb!X`U9YyAhcI{ldM!6>BWl;o!V@RY49e{+kL`` z1D#$HZGcl;-#{1zpIZa~O0bxhWxZX|o6A^uvqgY?btC7lgiF9xemW zkhjFo05m4vlLx~d^o_6#+wcfdcbZQK4Y5kPeFe^EEqOwmzb)y0KM2jL>LbrP(2^>I zLt{mc83&rfiq7&`8oGSEqAQ;-6$cumZ#Rp5>SeR2fU*sJw@L@056f#vuy-5|(a@w( z$Ker{7=fm!djM_4Q_>T;)$dQ5&B^EwI!BlEv}O3DYerYE@eVXZm54Gz(dYx|4JV!%k z06My&E7eWKg@)KI+6%p^1fZ{X%WH)8^^OQ=Vu#RVIwS3)MM;PC z4yDUpD5_$Z&SO<&YY>Fy6@8{EPIP0;!j}!EfGxTZ4lN+GoxG4m=&-S4Q}sgMSwZN^ zcDpYIpcAY205r}Wq0rt=9Cw^C^C5YXuP|n(aT9=sToLK>(5o9<8elMj49@GrTl5rVw498Z**TfIH7eK)og)lWR5lI)YomrN*Hu;yVx(b zi2$@y&>56{&tds)KC|$f;JS4WOB9^pO(4<4t zO&ap{9s-R+TnKY47DH%=?c8q4?P1#kjnb`_4Gq#~A+vN~HPo%eP-&^GgnJfe2JU;9_gJu*ok)CSG-I&5UX|T>(n9Ga&Bm2lR`P`$J ztJSzNDB~bq;F4Zwluo^Ty(UXvRV-;58dk%*B8j)4?~g!Vzr81Zg+s5O<3oA4);gzX z?SqcTI>SM;?XHP!4IUKqi68pBOG%r`zyH$}GS;c~-tb~Fl|rCZ7N9|z87ot<;FZqh z$J2%cQ%8-f*X!}e|%LppUJOH6`ey?!$sPJ#)96b z5gLrC-m%-6-Q(Bg{d)|Z<8e*aV9|>`_l5(sMrdH}tp`2$!U{1SjZVDO7IYt=Bcv_m z|IQV)KY?^r{Wr_@C-8V=`z^zTh9GnUpb0fhARvtu-I$J{dBDG9>hO#mWe6icn{E{R z&>VxU!(~o>e$=bCrPSu@rMmh0OqQI+5v*u3av=2m-F~$K?IW$@@H6ptI2?9wZ@YsF z4Q`qi)8ywk>BGc&*y}t4t_7|2;=nvucgzn^Iu3gl3cB4qLugaF5A$@Zbw!xZ|MVxV z7Hm%@8 z0w*1%3M`3VU!VJ1u)a+Nq4#@)hOD-S15f82Z2&F1H~6c`gC2f?(s8*BB~3%4G}d%;)aw5^2W0A= zrEA#B;lz*vdqac1_dem*TphY|JpDU@(NvS?j9z&sBX+tMRN@Jb(9+Z;3p&vST@%UIX*TOPa5QKag z>bVNNg#0xh*&DJHChM=|)NSyN#a;`Oi^}H3551_k(D&*6ezn}L4%^i(1RBrpXlS{E z&i+8Z{;S1?SkD1zC}|p+F6maYbrrP>?@n1;TAFpcM$KIf>52wpMV}f5LzsOf?UgQb z5>v02oux3tF#=P+;eu{lWt8JpVUBb|j zUM|z&tKp@8XJ|JLve<>!Gnqg-1Gq_yg-X*U9SVKk9bHB4!gV+(bxK-#)VnIndrDdz zo6sn2h-1BwFZiHImqzF^OwllOls%VOa9P`^3C>kkrY^ohIj5qb$zoX9Z}uqtu(-3K zi_6vFK5=hnw|Yxl(iII82Rwom-P0)N(^FE+gLUs2{?Pk7glB|wuuGp!DCqM(ZVzeb zu8z>=nRM6iKr4Ref;cOPI^%9xu%r<>&*sZ!5E}Z10ByVK^yuoxYxM}UJ>HdIMNHoX z#^{F?%+H>q|95b|zQl^g>5hV)4`Y-wFl&Qh=M==jyeGp)G&IC4X%d8Pje^kV9JV*? z!o&B@!L&_`JNHt7beh5U31OJM+-V`e!UIzP^rvko*$=U|9-p+UO(n*A0Uvfre<`<1)Z z>H&-c()Vwx9d!?WPgS(s2{sPs83WQYPMtgto@r@k!qevR$O}Dcojswn?Hmo=)q~Km z7{W-6bF>W&%*u=@KzNWwXj8h*3Kld&oU?REGr1~46KU?1hK2;7((b7Zu_9goZ<8g%(`QJ5&}J6x1pjjHZ(dPdy$6B92X?P7sGg?JGG!^ zCUj$_OnLX56!za@prY&SSjurVwvK22zOh5d1fXwTt05&Fau5DMrjN?v0oukLIQyVc z`g*rIc%T!zp8;sC6G!ON-Wq#`H!w$^hDt++Z>}|Y9)w2c_LZ5a)v&LGL4)+TtJKVc ze-WHvdM3;$J=PhNCeBdHHR+M((Afu_72pwF(OA-92hvc~i`8PWx91MJqV4tpd%;T_ zI(*P4Jv{0+kBxeyXVB4x@CcKh!#iYJdp_udLq9bqS4W|LPo@;KE&ZsfW1*&~I!_Lx zMaKXB-E3O$LrV-dYh<0Ea}+f95jNjN+=H+7i4`>IFlgKwCYH;@FFS{KKePtU5Qn)# zsyZy4!D*N@afSG-SIftt#I^L;F}Bt}W%8dWNy(#FXv?p`V)Y-obI{ zi>`8{qJ^nW?q{dEXeMwy%jhf+V@dN8M?qW6oY=?-96+NqjM3%S=)(@z8GA>%Xy+L8 zugk*{uCU(UcfUvwnvB82*t2XiM@z4J2#wCqWI60L0UD&&Jqx-?pl#>xpy6tkhQ>P< zbxfcQMGUEEBF&>SG-(l`vj}~YWrTXBnisvTBb9@tF#DRk{fEWSIZ{f0U(pa4?3T;7 zB~{TNH5|fB5kKmTt079qd*Do!_(LfmRF(+LGpV z#v?s0gh7`Jd_H3i(wt|<0@EH4*FQk|pDMbtfX8y`s;J422@|EG7=P-w{m-59Giu|Zcfi8L)>j~?e}=yINC z$~R_mLdJ!@5$h?E`fK&}pDH@JDq`z!6JF6v7&w3%o`H%!MQGZYBy=^@)~Dc1BDXDQ z2n^K@^r(6E9ke=XjgCSK3iRl)YJhXZ|6jp^wB4c^mP2S{&Ssn!4hljhX*<7uz|*?R z`aDw62>r4J=znV+iMLDpwT@s#$Nul^PMgz4f-nI4$Yx`E#R6*rHU?}94Cb_uxG%~0 z0D`^7$N&E;`_AZSNh1leUA0MS%lYzDS5MDOk20j&6~8k{5Br{!R>yEQ|GG8O%j@%D zb251zV}eF&-EMwhWBR|{)9Lt5fKI07X)B{;**AU%=0@J>@3?gR9L}Xg zWoh3UW=oq*+=0Ff>^jU6jmoiG>A*T@pGSZ9XY?I)5~0vz)eYSoJNMz8rtQq7F)W7p z#|fOh(86fPiK1a+I8!2Ov|O$lQ+@7-CTSo~4GTIYd7;x)|A=%6{|o!cWo5IWd+^v| z^LfmiV}N(x{g*@<#1{=qRWajITLhObwS^nZx0XD7D1cJ zCih2s(8J8ZWHQla6YN!Vl#i2CXz7soJZTxy;ZL(Nx?Bfzdg>Zhl4{kY_bv-js%J{H zD|F9@5kT!;4e#y3f!(AF zy5Dz~j_$;qR%#ARWwt+Lwi7Ef4MSibBTOBf^Z?zP^|YR%!&!iqoqO`Ov}-NQ zr{$Y+(zi3DAxCaqPsW^-&a$X4;}P$lWH+d7=mYHN zf}Kg)-m>6Ndw^ES*=(cTrK6?Y@=&$?L5KOa5EJMQK0ZEJYMT|BH60iQ8=y=V6==8T zE@=Olqfv<{9Vi#!fZK8pBF*HcMlig&<^t& zFAmYyeZP8q0Wq?gs8KrZzxoGz;m{EQ%Lt!^TH5y0$QHvpqnt?KHG?MbPY@go++|If$4f(JE zL7#uxr=;)iT$zv&7q4hKB1^~HBbfcuq<}^+_P5i$@%=&nxg*pL@$l|z+~pGp&tG@G zJC?BpP4Dml4e;ppj@OPhj2-IvV5UrKrZYh!s%^Ov30;{d^C;5u6qw1`51mez2s&B! zWOQM5ku{+gpQ{yy{}+o_L@c&OEFK=BG8(VJiCKh3{Pp&0k4-7Hwo7BMqp#kX9mmj{ z(RhOB>F#)q#&3Uahn|hx(4fXxsllBI+L}d=d=NgB>j(_dB&d%TpyQ3W3p%m%OrpQP zJJ9bJvE$bTj|UzrC@)^mD7?_8XKXG^nCl>EPR*eY)gh##p!w*X)pOhpRdVM06@q59 zV?5cv9kg1v+o4BV(F=W(nzwsxJq2VpbVJtzpvf7+3_72x5VTmM^OF1Y4i|<#XuEVQ zuBkxtKsukjvStKj1jzo%@n%jcML{D>Xh`2j=CnGbKkuQTc0=Dc$(c*5&1Q3aAkH}o zS6PGJi7id--E=hQwT&u0Q#Q9OQP3C?6QBzMv{d&T{4e7%p>)u5aCg&zBY$9w8#zjH6^$0uk%t*=hk>r-J8JqjAp{p$NS;#4e##Eifm@z5z8V__5>4ae;+hj+@X z2(c)8$(jxRksmd|C0J!knmz6ACn zOVY1AnT77|Ecf!1yTaDw^lHb9wxn^-8Ys=@{>KE(!`@4>6D1W-@4cl12hpsLo^69} zQ;7~Z>X7l!LUF$Lqf6w>jHkLjpURSRHJg^FQ%dN7Nu@e2vZ#%=iZms3y^fbzIPl;F zI=fiC;{^+MzF1uf&^++SFo(AlXIH-kP14``{conUJ?_t*vJ6R?L-!A<=TKYw1kFO# z0PQr=;ro@rAPO35VM-ayWe#m9PC{2|hOQf_hU6P^#Fe2;&_d~`)P2ygWZi*|eb%#R z>W*=AXKuhR7JLXDfuWh42+ae{Gx|EjuFzZ>a=dz|&*R}8H@@rk$9OHIs{L2Y{xJD}_S$+R@MmgN@K&TUf(1I*`jXV>Ht7M^>P{(EKW^k_c;~6XiHT z`v;Xun|I+R>vFMLAfsO&fE^5tVgD!Lu}~y5N#74u_NG()b`N9zB+D+!-91;}R?CLQ zW1;4~w?u2I`5+wUcj3@**0rPJHt4cEZ!7a!dDK>v>Qo=0T+sVBFEpgnMkWzbI;8YD zL3?XQHolAp++^jD)v*Ou!Z2uN{P-3PEj|`PFuJ?pm?ie}v)aGE`{q<@cAtWv+i%x| zBkoeX(8y#sBPK0!7NC!CC{4};E$qPMDXs_x)rzhdas?Gy3WG-3sGQUjff-$p3vl+0 zgw;3P`F&Xm9&*gRVmH1B&S-k0ymO7Fl(rvkvQr~!^~99^h7#?}`?va?vB^x$odu0^ zrGLWKLTpx8>7Wo2n$DCOWn)m4^tt5QuZYkn)4|Z0jN=SwnnXwONNmX22c3PmzIeD6 zp-GxQG$iNUpb>l|=8pC*6n)waqKwnK3U)?HUq`WSSnLj3YlW9+t$m`*wnAG?2QI@g zam($;Yrkw7NI~_0vg!-kTY~S~Xd~C*fDAdF#*x0lG)(E62lkuqe8614%a*@z)k8u7U&>bop{=gn^ zh!~HXhxAN{XY=86hoBG8Yf!Ybke=h`Yy#&VUVx8^ma;f`SFTP+?e-{zaev8}?*yGl zo+O1C$7JI?D5K+84C#q-5Hy;*EzoCA!cj*E^u9-0Rl}Sa?jE}{WYad5Gh&S1ZeN|a zOSI?tO7la6=FYQ0@5sEu(r_^9g-)fIv#C6l%@-`w5jlrLL%NX?pexBhXk2H-X(H?* zsC2w;gGPh5D>O;7d)f{-!-JP`wMot>(SYtY9cQydleC@EUgslihD&g(yVKd-tTLyM zIV!#0NUrK_`193}L)VnbZqPU^EqK?$gj^tJf@Z^{oBAf=Q5MdVY-n;8J`=VpG)ZG} zzi)Qb5y8q!$94uW{x;PPcKJQ?Kx5Y;JQTvn-Jr;V?h8kjbq&sXFNN1DZN*^94z#Q^ zqM_+I=QLSxL!W1)^C0M0?09(|+vLO7LUbL$(BzETarXPr-Di813wK5|)dLIKZaCEL ztp$C6{kP{er#8XR%*Tftx;ObK60~J)pop*_yg8M!29GiX2*^37SinWl}~I z6}dZ6>tX zM#nY{m`JU;msQ|d+xekF`*587idT$tN71N7PB;|spHhF`CCghoPBP+p77hz|RgEqKLn&PMwjx~2IOdPd)mn4mlh(Bl64 zrZI zd!U@luCBM0Xsm?4oSx$i(s14ejXfTt3kdoSIzeO8Vor{FPoXAZ%0bdglBN>PBVxbu_C#lQkml7R82Ud0^k4|R SI;pw<0000Z59rlTf zD2V_7AZ}xA>BPHpc^7gMAMgLb^|GzJTb84}ixt3r4B#&Uf$c!_D4?GNknaJ+Mj&zo z2pa^Tk$@Hp*c}eITmzU70c0FN?*cq;0VZbvs~muGA8@=3c-I1M<$(EFAou~`Q3)7k z0H|YtZ6RQC5^yR5;4y&V31DA7kT?PmZUgC00d@~?ZX7uJ1h6UrV*7#oDIlaB2)YlL z6auGT0LWATe@C=BLj&B ze(I(sYDR1vFF+89MNnf0QE5yZ+gSZaTpaItqZy{I_5;ESG*&m;NT}w9cT}^Whmh1T zx^O5F4o9l#8|Wf1C=?c}qlSbd;V`&93;~BCkvKR8ht^a3`BUd*3-Kf4oGkbL%*A^% zRu5pY7&sU#JUm=CTu+xC;txX@7#P6dNEi|cKpS0h3i8R7#D;d4uQlW(b{l5931{96i@e~kRyIU5l}dSH@_|j1Wpf*gX?R< zd2{_2lxG@00*ml}g8hg%GCd@Sz$=*&MDQoU7&L!%wO>NwEa+5v2ruylyT7;FSXelQ z(8&}kuY>8d&s@#M$^wHhz+j+AUBnN%cs$OA#$*v_M3RlAu{uv4T?)kyhcFiD(4+ukn_2V(5kmHpc(C9{lJ;UX1^yr*EK##UhA) zP(2I+3pLO~p`ci_9u`UKZL?tk_77Cqi(SB<3%JLMk6pJlphqm z!3BjN!J&uI`UofnX@DURkQg*k&u_!{KfHvqrZ9Q49Px80Ig^5aK2a%ZKkS1e5I2^E zu{v?X4%mcIp6FOI6b0vP6a<2vK9o#^`{@~wc(Nh&|0@0$`G4ly|BU=kX@~&?nm>uR z&%)II^K$+@Z~n>i|Fs<0#s>SR&tU)Cff)W7?TTqZ)Y>B*S!jRW;$ndq2+W6Vw*8<}pAm?d;NAb^aC07E8 z4pgweh+>MK>IxM+adKZvV{_@Q9cxP`Ki+6bvxtMuzpqpqU!se%mDe2NpwDGTp7QIK zj<~GV?)A#K@rF{$+%EW7Cm*bL_?WU&ytCkUG1JvWXQ^}X zPl9E+7MprgCf@I=I&gL*CA@T%Bo69}Prco!q`(eu`EoY5V`-ZLhxX$1Ma`YGEs-ir zFF`S%rQE)Ef?PXLvdYRQDbB^pRtex>vot%4CN>$gq6e;97!eERVD9%M-Nb6AN~5ZLFM zf7cOtfr`S@Ezjyf_NPVo7_}bT66&>VQ|(Sm2_)fSzIt3SJ{wg5rg^4Ns_l2$EPOdM zxj(M*;4_C~ZKu+=C+Q^R#y$l3uzb(mS5bUjBiNgJ!YuO^k+72YQ9cpvy8~XT8-4>F z-=RkmRkbz>M_(U;^iN@zLxg)@v*x}*+G6FuH63X;G0W)3XhmoEz*KXWO0{h1Lzxbj zTz&Y1??j}_NlZwOIyoxo3YE3xE?t*?vrT;9Q{O_nhVRoy2BzoUtwWeGN7Kp3P)K__K2)QNdF=@cYEx|Pl*a8#f6n|p1}n&>I>@mA%Z}g5)xGBimyIPY2sO zc2|v~Dzq%iP^o#F$JYskXQ|BEh!ukPKe>Y^LK9nKrjzUY=RTz_Ys8;-1RKVDGA!YK z(~oX$~OAQCo>9 zgPo^Mk30O)(e^#z$?ywVEOsvF$?sE-&T+!~=Yr-Td+Hy2*ZPn!IxciCz+NnO`{G<{ zhpotWKMnxFNv`12uP@E+6Y9uLO;gKJzPv7fydYPI>`r|=KVl4@t_!OUwiYr|sLwz8 z3M@fw?A7_r&vY5NyHZuCuCPpw!M2aO6m0djwe+az=IGY4Q&4SWh)(P|UeAPUcCS92b3J8K(58Gp6bSIP2D@ z8?+nRQj>6(Fv`$pTvdKe0PTohPqA5?C?_Qvk(%6+52|RdDFw}m@!!y6Q?g6f z)%QMBIru+ex!0PlDdu?{%m~r9c%ePK0&`sY}im;-+s}8Pz09!7W42*H0e* zRNC2)CDKZ7TUV%hFy$yoG4MYyufio~ExR19eO#QFlJ0UHp$llJDx$d!@zJh)NnJ$( z6<0X!J>Q*Fv>Rn>3Keh_9v|T2Q47_Xnr)R`u{TvDGOo?!9-@dejoth98J4c%2<6VKVb;DkuGza1W$ttm+txyxPaP)bc&Cc5 zZQD+!)PS!Rtpl;ugHC#qcmq(G$j5v99IN{y#))oD2_uSrMFN@@on8|D=bzQm8J}VNQ6I9xmV>c;0v9*rcYAE#&3>@kt(1wRUbxvF zyMw5Atuq5CZe>C~R7$8Uhi?um?oC$qXdB|mhLNSPMYBE_%meFl-N2d!? zsaCW?f12!>e_ts4^qi2)?Sh&eA`7Hgg|y##fY}70`c}A|kEwoabS>mmguMW{m< zG0tylA=neILOntamk)&2YGW^4u@Iv0tw@(i5(B%hqXZyIfr5&6xF=#RY-$>h54^Vc zRherJZd6@TXUdu0MU;Blg$u6eYL;sYnT%hvZdMDkRyx=(dKqPX<5}xq2l4u;Z0314 z@$7-Kf_8RvCJG$QVZbj2X^I&pPOYE73Ob&HUDr2<@C7BAu4rW$J zAE@SFGb@(tyCq{@8x^A7wsw0*2EMByqiD9E=ZwTDXOY{ZZlMx%n2S+F6`W~i3Y9ms!+}*c$(b0qN zEII7G8mrXw9QD5Q)w@fyi%+1R#29JvOwMJ?Imj1_vl;!fdXno!g(Xr9#;|Nz#xAi1 z$Bz*>_OM%ljB_5z>S%!^;61F#iAK+r8K+6VC6N7V(YD% zSvy9BV1k{pg$cskRo^;7!C9T!MeZeP;$WI-pi~K~(seP?({}6nmPZSBN-e*dL#mgl z;)k^}bb@!@n>|RG%;^AYxL>})aV+(GQV=m>9(PGb`OvOvw0FupU_Z^qM}0fa3`r|9XCLuqJ;&H<^^t@(H%}|CsBy@*(E>-85(F$0lJzS%hc*r-vKCDWzGmV`* zyU4$Cnzkl6d27py`b;!wXtTc-OtQcUvm5)^%|mfw)uUK3p*xWld~N=tzIdl%jpE^{+>hn<%^Xtd8y-TPTo|T}H01H0tfq7J6#g!) znh_UtYe>D{gEbk0<}-@y&=c^sTkYt|Uv6_geJZ<&++9%9489PO-nAz+a1{z^hG=TI z&h7HfZkuyYEUAtU_bq>h&ggbnGggT0-<`NkMikCPRWS;IF+ zD%P3&(?#5^sL8B8?HdU>a}novB_=E@!?*Q$Y2Gq*9sN8u89el?>Z6Un6MJcyA)%N# z_|*`u+qI|rwOmAzW~FVd5EQ#FZHu@0jX%H)NZJ+l)0u5^pZx57vKl3#{SMkqT}K`n z$x&auy)((}C`qpX3@KN7F8 z28UinO`^Voy?$$yUG|9w&2JT{>L_NU!?qD43Nv3?y8+jtTOkKV8 y*g2u;JB)37j*FSgimy zg#bmD08F0%PND!plmIt~0A#xWN}K>^z5qRr06>udTCV_Qy#R5_05gIBFMR-BwE$wc z0ARNON16bO+5mOW0D#v3kK6!x%K&`P0EXEBbjJWipa6!|0F~bWIFbN8nE-Ia0Bynm zfYE1|fj9sF4^l})K~!kog__%TqF4}yO#-To22c=0Q3XNHh{*fD+EncWumLkQYuVFn zZod3=u04A^7GQA$AFDWmkJjXDv08K%KZtG6ni4)PmrGOrGW+4Cq9wKCIA<^$&A0RV ze!qM5S@SevuIuV(3Yu<9t(m5&8E6M$ffDS{_QXzLN3@gig=Xz{mSt_X`(nGjg1xS5 zup8R)_PQ;JeWO|bzW*_s5#EIyhfx`4J>1nQVt-}8;bPGthYtj9%F8tHPud4obH_(u z=dF3(1hD@ZSRVo-@mH|_qE?)?TPp~*1lX$9YfikZtYr_lT6Vx(!0Z{y0`Dp+`Tvn$ zNr=B1PK**i$`GK3z=YUI-W_qB+dcvIb0#nXcf`6U0-IytodA3^PhXt42#VL10w1jo zcwH^~!0YY55%6NjyNaS!kC*~4xWr8umT6LMK1f_Al=o}{JMbd#-OFqE6GdjY6j*bW zkHAV0jDhzi=e4Zk(b_WL*R};-R#yS|yBaDCP+>|Vx3x0r(Jy8h{mC|tF^to4^Lv>j zPTzTwtLO7OQEdc9Qag8&n%G-)Z2PXcgxDJZOC7M{9(Lm(Hkn6TUt1Ex#7?i%x&^-S z2xh?lw#zYaJOmCSS?(kb2fz=Kx6<-54V*Ofy9T_RgfRuK9gjP;2j<%jHGcvaiGzb; zD7%4AL&`Fbox%+G`Z`uLXA$6PyA&0^Z3SS$6h=K*S)LJKG~(W27|R{;g9Bes<0;?< zgV;%P+wOo>)YcP&Shsz})|4@@DM<=^EscTq0q5;0{IaU51-`Zs%z?kF3E+$Yi) z37opuI=Y1YzGVEmNjD2y}Ic-12Y;D!RX8V?k% z88CNgB+l=iX4kf$u&V2htGk-#`yNnA5+*gIC8iI7_XpG59mg?zMP3FB5j+CES>FTT zD2twP9CgS9SeBt&Md;OwCKDu1(+wj|xK}gYpE^&{1S>IS=yT`O2<&Oz``rR7uIj_@ zMPe?k=-S=Z&AY_2RxkuM6vGUpee2V$!dAh7F@ndy-xbmLdp+a4F)B^6RB;Fj)vS)@~ z-bQlYr=u45^1CU^Ce53sNjAUSry)-_iJCKs1z^o5#JcPFv=Tc?m$f|8(0ol{3WNW) zz@`%HS?6)u7w}C{95ILq@V?@}ul2U?(yT7sDhvMrm!`a+W*5D)2!suvz|Fmz=IXHN zh&eDPPRexiD;6e|ICVY&tl4kRbv@N%&E;L|>XPQVo+;_Bu9!e<>X62;7VkmbuGK<$ zA)1dxtMKcK0e=-%^{UpxG=07D7^b{gpBF8AKBKrxV6-^35-&vH%WsLfT1Z=U?vU=X zPSr86=0SmS+_t%F#|Klo>k4sbL(*Kp2k8~pHFt`%>yHn#uQa8C0~ZznzP>782aT=e zhgNGw6P7FhgIk9X&e^O_49I0C@upWjdxo%?USRT!g~^7@#!IPgJ%R+^;gy`fJ4lgd== zJK$GuK)hC!0Q|25mcyAWgfD>3=kr;X&F2H+FpPK*_kf#b(0c%Ho^xOzhVmo;+p6O^ zs@*9pX+&b>PIy~j-C)4Gy<|=TZ-ICRPHnwV-s-yUCgP<^Z;!o8t=5Y!oXZrHsZj3GP#zSp+r)jqFFq`A~;mb4Vf*G1risp%9Li46t%jt{^{T#&wF z0(kjty{z?>wOKT2g<#PH?>r7WiRBFRU1cS-(-AH=A0eL+FPD+Tu*6eGz<%!EJ7CsL zdk&LW@)ZHt)OGWqNQ@VETgu_|QDKYiEhm7N-%yjSZi_ct$+PF2)ujP&*7-Eym0?MM z^TR4GDR3Hgy_TSGlJ|hmEig{QA~1{(RAI%I`oOw|jitfUw2l$17^hFbr`NWp@LB}E z!jg8~tHZMVoDX@UC=!D>3`w&U%XEcVhD}^PQku9%z-g1FW8i!Je&@C~0M_p|jbX0? zhEAHz!=`2iSdt_>e}7;;N}4jQ1zhTa(e9}yJw+EMmFmxU5jz^Jj zQ5*D#p(?#T07Hu2Lej$1!xDOHUY2GVC-YmGYq z3ss)Q&sd%&j-Jm9n(H|3TCI}0^dk*%=@F(Iu_`g*nxrh%QIkX!T-tN$DPZMnE4JpH z^+Dr-y(P`k%7Ft1=CM7tSZ&+!H5J1Z9g6u<3pZLYPs}nomEBRNbuh_z81TjtfpJL-DXZw)j`o!zFsOT54uApq zO2)&dERQvgo)PJ#Ay;#k#^Vd^q@m?Xuc}UQVrLZU8g0Ju3`k-_E{P6d7PHAs6C!GaTY!{ zlV$if>3|`IA)0f?XTXj<0LIO%L(;S~0`5&q%1&_Uy>x8H!!MK=f*S{>>Im47m%Dw( zKw$<9lhUZyirTItB46UM=^3?)TDXtX+rtR>y}A5!3X>4VEe|~)+N##}(zx+}b)KW? zjxKrkF|eX=;Jp;^q^0aJX9d!UCoNcA9$5%)VSiWP+M`gmc0Rm2Z`Ibi6_4V1BVbeMfLRcqK-tso^mU|5%M%K0iNLU!u3qcgUkWqg7<&g; zbHs5RW?95@6;l{PIE-7~M~nenrc=PpB(QJ4Yt{Gj+Q%y?Jr4I)Jg}Y}0>ik}t#}mT z)1Ymym9B!~MDPCs@YMp~vBKX2V3LiW&p6|pZ9@`0+3_I`WzI{*eT3ubaMO@JdH_tb zw38>Qk2?TYeDr|xuyR&JU{gEvfK8NGG6oxuN-=|x!fWAr_)%dzfM@;v<%|_zneIen zJhw$0IBMuCfMz6cQ%}V(yO%=e;i%(R9*8Wlw=L}gz%>uu!UH5$0_iXumX5`-m;kn{ z{{g1RaBP?h>v-zaVa(U?5#LKcSiah9!Vz%!=D_1t+J{?H?o9xb^P#6RUaGKm5P=On z7>~mRU&IT*{e$=)z|dET2bU<0W5`~N7hk=^tnXNae1+Ex+m0q_k|ZZ*hu*>icp-*s z=dQg+eFsxmlKdVpw9x`EWG!W4;Srpy35D0M+ouq2@5A8H;qbl$r1QCqH)C>H0@|?b zhcH^a5rJVmgbfc~4&UuN9@X}3C(qwxR8sv3V0s{SeW~+k%@`^?1zdbh0pBX?e}T!p zMV>&$ahV*%ae+to@UVq%II#GtC2tazqTh9%05g{01fm+wrX+?TitQUn)}tl; z(9c;rSa%ra2>7c#ruBO1iB~)#Fh%AsI^+Q_x;mMWGJF9LrpOD^VS8sOlTDgjDDb7} z&ckGMNP#&y`}LbW)WWwr&UDTqb~l+Bt-u@@dM(KuuBG==z~mXv`hS3771?I%0WZGp zARdiB3Y!j`gj`ha^qR_g&)AiYE!c?3jjySn%lS5XN)qdVTu~cor_Efzg>m_;SHYQn-3_ zw_)Jj&{s>Ba?|_{d0A0PRGZC8WEig7HGD5=F>^i1Fj(6m2@2EG(%vklLwEqZu3lAD zS$_bB{bz=&?m-$gyfx6LhmSIQ(6_V^fivaQg(jiWiH))6)Js%Phj^Mz##A!t4i2_41xaxI6YuHXCBi-00000NkvXXu0mjf D$SBf1 diff --git a/src/assets/dark_cover_image@3x.png b/src/assets/dark_cover_image@3x.png index 74a5678b3a369858db14d2bd35fc3a5083e6349e..0a320ffd5a4c4fb219cf25835fb01709c23b3184 100644 GIT binary patch literal 8457 zcmbVy2Q-`S`*-Y3QPc>rTGSRR_MTC+c2OcE6(SNslo~BcZ92@@+ESEKw3L2ZZ50tp z8?~w`saiE_)T`fhe(!t!@A^OIeXf~va&p7b!HSDrgdG3?aM@U!I|Bf8 zh~u>#E5q^qGH!X`_>t#mf58F}H3onZ0l_Z;S3Ur=lL3L<09Y4*Fb;?u0VojwayWnj z9&q7406Pd!j|ZS%1H2vq408b%w*kmrfMXTF=P|&&0brUBz`O-`HUjiA0N_M`Z85+w z6X09}P>luXr2(u80oTU?eop{5DS)T}K*2QN>IA@|5)d~GD4YX?zXXKz0t|}*Ia2`j z8vtm1;njPh$Mo33tUa&*00;l?4;`Se_!I!ZB!ax)j&q0FLty9-WxoKlKU_H~BWl^sTXp*{=Kat1^N?$3pS84`E3y74s`^Xp~K-IEoD_D zn5wEeNLyD~O$!Xx(NP4ctE#K2sA{XIsVb?fLsYdOni`@imDUu+lxjYDG*=>LuCe~|+W{_RZ|#4H@{heL;7K%-IrB+Bt0${=-hWmS+I)DMOX z{q2POe~7@%{cvytso!~1Qq@*c)4HIh0Z~(jsB4~8)qtp~{so1i1CW8y|3cN2RMn32 zdqGVNqOJ?k&^W7loa=v}$3+w1hx7Ztf&*ZXKy-MB-?7Wc5WgU}N?2%+6zJbTLd?)8 zbojC1-|YT#-^R?$F&rI;L>(VsovlnkHWp@DYPwolO6tmLf6|3QAvU2{oL?vmZewmB zbsQdLBr*U3_t#X@f`bE;G}YBKmB4CnRV9B-Z8aq=bzLn#KXollm`1=q^5$q*#P1^b zM?T>HQ~q2y^0*28Q2%W`zgzQn^+2qV*yFrL|J^+2;h4WyC?x35f`RzKem8=F6zq2e zz>hunYa99Bj=*2?cm(`d>HncF{(@oAfjGQhINT)YI9mS?m8Wt{U*&hx{^g0v|LWwQ zXaCXQ|G1YJ)Uym$K%Yexu^jE5ZSgdH@Of+SuXK_Rla`Ia9uWg z?3KE8ydqdbnwfTV)XAU25OA8!xnw`g*I|5G`SyeR5{6cd?!3Y|242k?1AN;aKkhWl zrd)BgVf6K!L)Y)+1syILZJM+Fr16}~uj)DcnLCtOQm1|$Hp1WUTG(f$6L)zpOe~Un zlkv-k@4H{G1GB^#GM7a+i+4L_7|;Vl-FnKpL4>}(uIqDL!=DczDpcK2-#HBCkCqOB zel7zy!uV1I|HG~g=+M>SHKSd*VsWousjr7eq@CrZsclD>dD^RpS6}m_iFE&Aa@*tQ z{*E?%VUE_QGfSt#*|)me4=C#~V^WKmI26*@*WXN1DRITAY~9Lg?=hE|L#Ny+>fwNa z6q<2at0=>q@XQD7Ca}3fITUB$y4E6>rmnR3QIWs<(@{ZNdeDK1L!X(5j`WJQGxU)c1;S#68qU!%N{ECuccvQelBVoC1GJg#EhlD3#jZm95Mo8B%jk7*A{fi!%(` z6mhe}(xfTr&m<8rnTj27g;^u39;yBMzCvN_x`Js9C`|CBDP3%=*3uTC4mgY<$&Jaq z=xoV1(HOIlLV&Z7po_Pha^p=0cpG?V3isjUh&S-0(y?zRI~kNxaIvI#txe)85Rpu& zrkEIaH9lh{@M>8&JxRCV@pR;7CX6bM7p8W1@&)NuyniC#P^!f8=vg1M3Fq}66G!j}li?Z@D+tLP3I4pEcN#2F z(Gw#|j>u0O&v)`T|8bVPkpnSPF3976x*K6}&bzV-umTdN3mG7;PS1T_vN#R^-HOyn z>j%YC74n}l=smfp$`unUo-BmzRpJQ7>Z}s2SdT|!R9ayQX?5+hQ>~M?BuW@pJkI@V z=C;h<>~6CMzQ2$$M0KudIph+L$@$5I+O@t7ImGLv_6#qvEIul<`4rvZvY{q1hQHSC zT39mCEjo9><6-#es>)P1CC8qd1e&s_b5c+>;FCHFulLJ3a^`nE$ldL;9Oe|KgA$RE z*=_oM9+Yn-@Y(Y0+w%9BFxKj~fK3olkCYZ^pWw62Qe4Iki4It{r+@bCho7m5G>!2+ z%vtX~qF>$buBZ1PIVV{}?K;m_>kxz|q6%ppQ>x7vtFA9Y#!O6j^J;q;v^8&jR>6-G@z8ag7)OTGXR_eaYT9@=49 zMQqJZ1aXX+adbwW00%msWiB+e-e;w76yGssradV;$Yb8TTl1oUzPcZoMp@g{bmFTs@KZ z!vM>bJsT#cK)dT`23OBSuW`v#7)#vykK8k-G7u9RKGV^BV1gbmn2ow5hw#t~AjPZL z{aDDxv53T}T$Tv=!wcGBUU+X)VNU6^|4KzwG3f9**&bH7Z7`M^=q>Ab8GCA^O2D~D zUx-2{V>5cQ~hw$RfxWOZuKjI$kKXUnA;vE=M3x>E60Br)@DJ64Q8aSxQ+ z#?bOZ2?rDkU31g|t@?%eat=Rz&CFxpAL}mC86zDv?5K@Fn5~o`?a@)iKR+;{nB^sxK%uC>TJw!1F3XK=AYWo0ak~*uD;of zl`6R$l@xL+E~o++1~Tr8IKT1f4(S)~Rmat`M8!BZa6-->IxF zJ{h!((mX$wG)d(K=Q0PhQkh9Jl3{V7;~-FlZ{;$l zVBd*}<@tox_1jng5c5t7iJE;wp{r*h=HTeB965`;x>_e{`sR_@HjR6-a$E*c`?ZQ; zcdR)Y=)<#zS7XL<9%U2HC127T3rtxAeeIS8CI^v%SwlJ3CK;(`Bg=(ks``z6MSJn7 znbHzpo<}p@Q4oE? z^XMz60yew>9d7B(5L3RnHMK6Yti#m%MnIIzxTS2d3`zGb82&fM}9UD=trRCGPNN|%@51Ldx`6s?K` zOd3$us$)=HmIe^wx^C~5C@RFlxkckk>Q4r-j4q$@Vz^+2$S-9g#qS-M(qUvt?c6x` zCqlC3-L2k6v90MQ z4kRP+PC|J+^Hi!y+v>&2)dcM7w}M~lc5?2d>5~1MA10}ysXH!DV9{DH&rf9EQf`To zy2!1=@KsP@S@#6X*Go3HHrBImRl`^bH#Hi#?8cDmTIr0BFA9f~SRUBITG%g;9Mkbc zmm#nK;a2-IJaK38`N!?4Oh5C{#0A&2a)zdnldY4Q)m;fmXHMnPQ5{3`$mVq#VzX71 zvb~(dN|v8C=Q>}Wow}F$Dsce~u2@flpP3Q$*L(;~HvH1}{`HNq_~ z$}YQG%C7l%MEUirK-G_QxaKG)<3<-!jsgi$YNA1S7X}i}%o)ma$%n=>4}BgiXWu)! zN8vK*2O_yCH|R99^u+utW0^J=jLj(8%PUeBzo7n@K9ot&DsBktuV8@MlyQjZ=p+XD z%zEDJtOqSl^HeXk#`dCOI3O3?#F3uVa_9K5pcsOM| zl&3-(K0iFizSZ7n-pX}#q}x4zBfFJXl%2|dE`{8bTk`;Cw!B$<2+y3F0x(sRywJL%O$$D8o{`2dSqfW?cqSB)CJ~?C@ zOtn)LTb|`LKv)Y6)?9kV9cvC#L>C6Wko9DmYCHIv7O~iRXAyf@kGU#mgR`GIJOONp z(~dfEcnHl%o`a6FB3Kvi*OTA=agS$4_}%sQk7a;DXWKeL<%s7XB(IMVuYZM-vLe$p zRC=vUUa*PKQ;@T|O8?;07X|E$T1;6j8+4CV>U+Nxhn zl*_)UbzRuR>P2czac^6_47tQ|KFDaas>6IqT0~I;sJq5e*+mp}fU|dyx=HKa-p0OH zW-?XqBi2b7TJBmnn`e(C5^q6(_QYCg5wOV3Y3#<8a z)^z6@Ju0lolU)Lf2h8BxR9;e*DdUT|U?~xseksI&o2A~Vpy3-K^WwV|xbGp>*GpR> zqOH3|$q7o;FZWYV*G<)6icHL5y}1dscc56oM{`fRW-5wpK{(5s7Mlt-anlJa zG6Ze)U33~ZS`~A`Et9&+?MY%mX*^|mMnW;Ce1Zbiz_QeHp!Epb@DSa#BoW<3}HOBYaIZ>^XMUKo=1M^SMBb6 zfO#pg;eo{)jMS4Ub+yL*h-G_mQs*Iii*zjJ-GFf=T}#kfLXsH@B^-3-(rpj%C?33` z@Y{*A>GMJ4=JNXq!HVqE1!)nwlF`&5c+TlMwG?t1{4QGytwqsB+{5{o`Hy!A+?(j! zI2RjD8ss^ppx~W{c)8kA{9>Owu!qC{NNRdW+<%|3c(rtO&C6^@oH2Rn(YCkFH%OB= z;lLh(5SKZmt{yQQ9x-hmf=wiL@4yC)i!wPOO=BLLdRN%k@%=oBakH0v85@;^Ew%MuaBUH7ln>;D zP4Dr2tFb}4A;1Fcyh@bJ=v!NZnR0nrsbPJaEPM-Df?%GnGYZhk@SXPw(=?O3i#og` z3BcJXF!FG+uezMYKE%xXT{!13cj5qT<V=zW4fW3v-(=R9fVT)Q7}YVrBB zEdSfyJjs)DKjSxY+dX1PPrk5qG!+Et0n}cWd_L)ZQr3oEf+$ySY#8}9$~>=kDoVdX zvWjO6%2J~$@YVfRgHLnu%J$s!?U~QvOqp^_OmZnZkl>)c!mqo$)XGWyG8y5-r7)&3 zFp&vg`xxJGK{PS6)qh{vCiyJJ2yS`C_NeKERU4aLK;r3!xMn#;434>WRpCYp#PRLa z)Q3ls_q+(B7&d>6wiLVvsxZH)Z8=tm91t-c$=UhJnOcOHyiQ&d_Mx=#EqZ8sz5RxUoaS<|zl*V%?z^{WS*;;*Pq=qOzUdOfZoDO!Lpoji zclYXj-)nNO60{hx0QQCs|AhE$2nj^ajYK8IwpU#dMQpBHs=TPZ0`~8Y8^uL&O`Qpj zI58IdecGVzT#OZj{uOV@iGi=|)QhQz(<4UN{5Nn1zo4x)52z0YuIZe4Hk$OcA#)_P ztpRdcgH|UjeTYEKvO%ju?Xb>(jO*HWme_K zF+i@)Qt5_3`sOM+jL_{h%rE7b;8kNia_BouN|8W-mv#FqzH>?2y^B|paP!5q zuJqSFQG$n0SqAm+pQa?gQCjPBJT{$ZsxYmFFSJ72gUE4hMpCJC1CHRsLeX1ohhh>X zn4dlGlPp|`gr6Fj1y|8MMRU=P#!)`TG7UV`$e~rvIqbraBjcf2C$QSF@n+IWL1ha* zf?d$Og{9{@2zY zcA6xh)>e6HQ`-%CVl{6pNKU7FlycgIi|+;!aYQlqCeF74#nz2V7>TE6JuHnS!eG{P z4JAt_(C&;mg4IdOQ|UF8QJU$AWv{#yUwblL0r>f#EK|gKdNf<`A7+YEX%|EgH5s%!Pm=zP4)9z!@>^5uni9W3-5*j(;)-3t*+z&~GRZvfs+Zd81${L^CYjKmR zXP4YAC3lhp;$(`IUWnwFN+xp)^)J!?lDX39al}DIl5N~h@{!({DY}W@-BaZ{#T^Pc z9b=oLv#FAG?Zznnb6@tmpR>{dMy$_q7nPf9pp+zTZagiyx{IMU$;Aa_LR_=cq#~Qt_s~&DVVJ%ma`>`IWN+-LhlY);G4yQ@Ll&LaX|h3c~qXuMZ-$ zuJ+ps_6aixgZ4Akp=nqkKkxD+JL1yhDz+Qtn6*64g}l8Psr;e!2zoKV=@aly&|1X& zJ{m@pr)}promU&Klu1&r4&gU67){FDlYR1CEee9NTnWtk0;FzoQFR_-TyNAT7NzQ1 zzAmsSwGg(?^Fe)vZ1OJqDdd~%@cZpN$G*2)%l;7Lq;r8ZRWWB|36{;sgaj{MQ(Nhd zs8HnEa-JMC4$4s+`9f3uk>;Yy*4Z~zu1#dSyhd;-tg%Cma%gjVJjG{jf@YB9Wza<41Ju_<&;Gc7a5n9P*Z& zo}x{kM4mP71#?fV87%K<2i@f#lcBA^DM%kDDD$iq#JN zjEI@6C35(Eitw^Lh6EZVkWyYCPmJjN;Q2hqgvYBInVEDkrEZ0Yf$LZ<_ZubEu&E78 z6hfbv*D+6~Jdr;s-&mO+tIg)7_$r?vtpL2o3YK?Q(0FVJ2uX@USoY!QG9-a|wRTOw zqB6RE47OIfuzu>O(O9KY`enPmlDx7!Wy_D$P=IfseYLuEhB01u z2hXhU#R%9?Bpu2ZLm*!(Br68w4hcLWvLaV3;gBKsbN5(cd*k{^Q!j7lSwb9!rXO>; zX&a3iEIjeGPm0r;*g9fvb=BH6mlnxk*-j_SfkyOWQYpPF>;>7b3?ja_QrAk7TK95S zIV={MvcoNWi1(JVjAOP#oBB-C3;fJQvpL@=?^4a(rB&pEjV00tt!n0t7G%k7!1@$%WT3VKPYx)A=OACf9lPxI}*q4X;(tz|kW0#8nm6$^o zc4fyiJN2H+&kTAZJzO2*`QLu8wpa8x7&cCdlAA>Ppb+`6^z&VG?)qZR-$Gi!A)pS# zA(2dFNHQbQ(-iL_XCCIdFJ?Wx+8}MlGZoy=^PuN?wsMN72hut1>`sl%N??vAGuGwv z3lwrjt{Sb=&7kyskU}@2$OXg<6WCaM) zM5n6uOl|*4bb5npMS-Z`y6&bnQEx19PdTFg?j*HGLZfYK9LchKv*2kd=ZIaPp6!tC za@n%uAg~*L{c+p%R)L{7_%l2nWq;iIF}tQks~;?nx$gi9)Y7b9 zfKA(ILF{)mhTUYD!xn$k9qFK~VVN6Z$3LMsR@PocviTogC)%ABg^;2;oC{=kGdf#O zlDy%&mKAEe;`ThZx!1V@ByztkRAo{5X$rh#N^19;uc2S~u8fKqh2hD0ce4=NA8o|- zg~C||TNz{^ZrjVFGE&V4w`F={IDT>Iu6~J)sdKQUolcK`_~4xJXgHIYoi=}9KaAYF zS9Ps5(8c<)MV8ejh3klJ^Rgx@b)Df&mQn)_eUKEHo$?_tx8p@pF;e}S#a>uzi#3@f9WHo?}W2t$o@=;>G@Oll?kXTuarbSz1TasX}dQp`&1HI zc1@tPbdka{PUR&Rjq-HS`3TA%+R%?BWsk~4j%>)kU9{OaFsDCd0l{w-b-4y%s$KTTDY6}mswkd&2TYO_XSCP-Z zf72rA@Z*F<((Grh51|fYk=o?SqLn08mccVrkeLCLJJy+2IFvJ1V8&zlvT9S!ujmgv zb2Vcto@Dq*olaKsQ-UIVVBgxWSB? z=gdeamIid37!qk7^o;t74@SD*N6|!ox-3V~$KJajZv^eNyPZJVw%6@V2K{AwUrV5Y za83xxwVYS0oVz@Kq+@!<$581cY2b{w|03xRouuokNyZAAn&Yfjw3Wn;0NP&wefAa3 zplHf^5cIyk&Y-V-iM5p>FN z9_^#bixY7ECOH}W<8P9#6iJ&|W+n`@l_g7{C(@=nfsSWI`-!iDHWn0pq>7IGGGd_b zYp*ZcW7(I{=paz*axH6$bm>86@&gH~oShi0HfNjGPI4QN9T`oTbts6FZ(18A>5@}SpITb8A_UeBO8=NLin z+O@4w^vx4Ei;9+Y%TV9f^YGy+aRLV-Ny=XibCM=4309 zW~jf>KK_X`w!=e~WzEPrGimOa6R*ATb+O)?3iVXdI5S4;>XW zjU8B}A6*wgLm#~Fyz+7pK<~=+0_ZRAr2##MI9(%zQbBKvG%xahLgqY>CS;mgV18N5 z(ySZOfM;a@+%gqK*9p3`E9MSn(?M;4NxM?MlNAkVFLZ;@2{hg@$BxN4wBB)vU{p~+ zD}rXACGU6#dNUU!KN)oT%)6BUddvD@NzJ z3fQTX2hbf};jIK*rh~CvacM-I77R4?>3;*=RHh0VMnf=X3*18sx^WRSc2X+=nw+Eq z1nq}zGC&6Fc>D&x8qinT4);EU=r^Dt>_OBUro)*u2>P~v1X}bCF*gIgPNh799#I#d zW|V%>NuWpX*rwIDe&eA7JnTJCzbzmoSt*q8e;Q%_od>4Q*fcWv#fR&EmmURx3 z#D!NZb_B+vqCMa5{p(xMnC*DbgP?DVphfQxK?A-#EjB7?1{&TY-LoUps;Ll2k1oAU zrxnu>?nqjHy&?U9)=V``_a3sM$E^}LwW%t4ScNp^)C-*unxttaZs?c+I7*BTJqPJ? zyjMXF?Xc|KJ$m%@Z8sbjOPru@Z$R7LYxkuG{VY~_o&(2EiS-0}1zqu(&e5dkgeBAH z(jw^7Po*V&`1q(ZjCI*K8y-k)si2cF+qtd@qCWF~q@B>L0}E3}JOwQgQmBEI3cs9 zpjVsp`Ak2BgqLmw)Ptfc23jFKLjK9Jia=Fa{Q*sod9Xnj?K(;RKl!CJeI(8N7@VvbrIuG!VzAqm=;J!}AaaVHmg#&$C!+gGbr|8$~ z&(3?jUNGlG0_d*WbkO29gA3z+i4+KT0Ntgl0W;Z%O>xz&wkyd!rWnmYBkAl!$cZwh zh^y>}PttV_SE@!MX$BfZjii~PtvZ?Zr1QvsGBv}%ooI8Q4eW*jXm1}Q=3yi4T_b3T zz`FH-wRe<3w=EBPS9-73d!uLo{S^V{*Ukn5;qw|@XN(dCU3bqX(#Dsc0GdpgdD6JR z6TJgiE1;2d3Vcr)mGKFEgBw{6$UZyZdenLg+HEG%A^hq((;VI?`@00ioWLIm=Vl0h zu|r;V_%33eH_}mb1-}MyqrmTPK;Li+y&fdJ1p3x;xr0v}h0+5*33NWN5s-2R-prde zw?9=R&4K1fXOO80>R2}%He)*^Y&6tZ2iBxb(L z-tilTzaGDk9#G#S?*S2HUACg6X}Ftz6zu_I4=&luijM3r6?6fKW23820@6;4XZI<# zNA?A!Td5zOG@wsEsAzd5&Gt&u0?(>R_EyoTXg%d^|eO>@dVI!20ALe-NnPu0mRq;vQ=U|EnThjdd37o zp77W#kX9tE0}a-3TAW$x$~??}3+cMb%tQxzBHaXLeGaALEJ4x+q-cXH+;%uHUMAB~ z7QAvn&g$xa&e6~eqqcAP!Eil-zO?1*HXX3sUI1OUC*67cso~TJJB9P-CyE*397GSu z8@c)=EV?vNK%+%3FP1>i2Wj`e4Eh{2=b(1wb3-O+1Ra{8A%O8(1*jUFVKC$LKql_l-Mad9~$Bw~!VNv!+J4Q8)wU4kqnSAP&qSl59SgB`sQq z3VMk%oeeAWY5p{85VbfNPN2_Loh4=+%AjEuXP{-yv=#c6zke{$$9?GT=WU0oXgaXm z%ju>Ah|v_Z$ClFUhJzP>1QG>wB(6zmBh&>BNYZ38U6wcAIH7M9#iS+8I_#EOi_qg1lAqI2pG6k)K!AWqFs6 zXKfquN2Hu(-4sRRhDdIJ)H6P(DxQT(nt>)cFKXP9Zh6uJ=Vj1;=o|<6D15%-fCC*g zSu;$A$rw5~MLT9fLA%IV0~&fC4|;!$UE$Uap&N1|_>meljnN+1#!k7j1L)%LB7wGL z&_p(94A0;hGiE4ghD)T2bW8F#pn)@gawvoTARh-6biznapxp#8W(I0kq-nxic0WXiEB8;tdBE$joaz%aT_A)4+1`#``<;x6n*?67ZNY zXNZ(%(7G^9o`s<3E#X1SoE6e_MZ>go7fsSsHTCF*f^M=pVS7@TzXM6p4t&swEy`IX zZ6t;S`ae$2bxTnlh{Dneb|29J1sv5z<*oqw{!e$Ra)Bg&B-lNkvu3&G^5>hHon4h( zIrHOC3M*-*N>_9r$BJZ^Hm4D2N_qwM<0*jN$e}Ru4_}x-&sELfAMnw0J!zl}eWQ4L zC{{FZF6AJNdK%tyEodjj8y7zK4{eT_leTM5Dd`Z!J&iS-5pf8IFm_N1q_Lv=;6d_#_wQ6R3~#awprM@Wd!5%dranS% zlnZMbNjhRDb-8XRpwBwcTiJEU{%$mn_N#B+f*V1@=LkYgK_53V=&b0-jmm79JXrUq z1X5_@MghF&P)np^ch{tHDoh|9gpRDy zdn=58ZsYi!@iMD=jS5-=8r(uJ(l zqV*LGmYGHl!clY=bi=D{;Vg7x8sF6wbR33m8s9`C4K~_hr=d^!mHimBH0fXhJzdeD z(O~qRo9FXLrCPLiU9l{SVU}Sa4dShWM!!LS8hComl034(-hFb;Z$NX2Hh?A_A{dTP zQ_)B|6+t_p6767|121*0TNH}Yv3KDp47{z+OWL274jd^h-d8k1?YFJpjw%`(mI6G* zY?`xh8qWLsEy{VuLh7GoK{H~kqCc~2{SI_5(K|!%-xeL-C~=V1p6KrmTF?g^lA^zV zi-nE_+#V2iBP8wnn(>_i`dIOV^mIiN&`b~y|yGHZ3UKpf7F8}68$5M1_yoAg&gUy!l=+fMT@85yeNhqJSn8b z77RYFLBH2p(7c%c)OnuVcOO0IogOri=!uGs+z3;ri8TrQ_!oY-!jntbL2X*3FY7#4ZUGG;=JV3zX3FV?jC|fcXH$a z5L4VahLe&c%QE-@dX*aFV`rNyn&e4Sb45c*AE?QTY$2@VIgYDN{?9k}a2vWpG4qef znWzHg2wvaXs8ZXWegyjDx6dchXgCag0W~dX!E|U{M=7-|pc|byRm!sQrq=pi(4gaA z><^J`#y%w2k=K8)SGi+dN>Q?D78~}e8s{-j)b-A?)#D^ z8=bCa(d~*#Cmm!)`W7@+^OM-S)qj{JT?wcO=fuo;K2$WEhVTvV5<7|WtdBghwveWG z!Cc?Vo-Zy>z`2H{J(!Mrg8%P6a%A01fNrLwgOK*zgG2joH?$ppFSayySvS`kY_zAu zNnh1B+ZX!QRdn@j2Hg+u2e3zoG0Mk)8aZdPr5W@<9D_?_xYrf(oRp>4g$+8A zC@om|-t)Dz1Shx-_+{!jz)vUl#vmPi2X5Z#4C|)BOljakF-M@#n#n&DbkKtak(RV$ z8}0ku+3QH7Pgi<>M>}Qj5c6e4kHgE+f3gmop#H+4(u4Z6ccc?woY3G>F;_sBLPax) zUc;G4q~p)uiRoRPeDo(F#&>sm(7XdTRW*Ek#I9C#89evn{` zMdLPjk9iClK2Yv#9px=)Y(lz{I*x~2(WT<<60)vbBO8>Pce zS%@ak%{ushrD13ZpaW0ZGz@|sbnw03w$&N_v*^7FW;^?AaTr?fkt6fz5)B1}A zN&CYOAk2%6F?+XKX(C}bcAKc_Ql4`>Ix!}#g2u7kEXz!s2hi9Qe(Xl19a7efu%sNO zOr%GD(gAIXhnt-?ncg)~YzA$mmUNXB#bQO@*kO3BqDlb`!cfttJFeHG-%{Gg#p$wu z-w9tgU%vr8O*-qFLIOH_i0#UwP~S@d!@*6*bCNeqRFdn_{NLx_;WC<4{hHo^Z}|f!5^f^1F&&N}bDGEMSa( z;mI?9Uj1~?p-2Zb;n=YBw!>J_`F*D?XcnNssAK=$Pwfeufw5iJ4cT(zNp#$Li(~Uy z=!X0fydQU1gGBFL*NV{Bp+H~v6@0;i5H0lUs0F{ABak((@Tq|N=xeG;^PgTrVR3u7${;f#e0kV8)iIbz&kqM}1r0S#=2 zHN%$+>apGWM>-|Fepf7neiipC6n6*a8GN02Ez1O&lI|V_H5KzR$qHywx-R3PjsbKs z>}C~@(Ti3ya%Grh??C5oK&NSg5gM|gY$N6rA=fr}tz#5&j9ub7^c5Z8Q7D6d9)e1@ zDDc(0*(0&fqHw67`~A0HRx~Azj=JdPgfXsU^`b0gO{wi>po>J7X!4>Jd0go}3A)CW zmN%dYYVdk>p65(1LhWlmgmly#0t09-I;+ybwZpeO%U3`j@$IVW1sdWTK_g>m2q!_W z^q`ls@=+k}$D_-Va^9=;vM8i~HQI-ea4a%qwIa*-8wZ*04*btBQ2H44D{9&RKQ>Ul zJ7Eou532g$nLuNbbf<5@skc)jVJ`6CeLZU7B=EfDXg7xjSCnc*dC$2MscRtp|NLoJSRn zNpuj8AiDXZSO*2|S0L6`GiXo`)Q(?+rUznKJ~Rtjna~Y(4{?DdQ6BBM57Q(}{+pBo znw32H5opq|)OPOt0JIC@p-C#~3K~l~_0Dm$HN`r>aa{fBiYD9O{{(u8BWK-qR>8gV zk`6}rGc=Ex^e7ui8T6!oHOV^;I;$nn=8G&W=sd3tFQX`+gV2sO1&tx45$OFkvMdi1 zG}^5!`j%tmPlCSqzxL7no^o007Y_09h;oigv@ABm`|r<0(he~kU3R(2MMFj3llvd&*xjY^StA{1Z|}R7uZwl`FAVM%)1aS!?d9uVKx<`#2kp>^ zJaAq#2nVU=*+bM0c2}sBv|7;k;6Z}x_j&yx-xrF?;UMLjJdDybKLQ=NyU}I^ZC1t= zZNXtkR+NoFrB>dZ)qp-#oBvBYyY56`APh@SL3WQ-bP>O>RY=50)&2j!ZZkC>T%9HADMZ74JtZ*TLzhrhmSMBox+>p^j2AxrRjqp177od zv!cNwm4PF)EbB1PTs*9! zth|mK%CUlF(t?+Gu%x8RXtZsBs%ZD3lGpcc2-+ZhArq&i5@Oxl8f_wRff`zC$A{{_ zjgV%;Lm^6-c?llJ;%ydKLol}t{KBXnluB#CG0?_2=M0@0mb!jgIrgocK$NL0FnWce9L8Y$72Z3K&WEn$JsU5Tq$%R0=uB}v`zMxWkSPKmZ&SWK7h5zswqLw%<%)~edj z-^WB9WA)m>>x>j%%~Ha|ZU^f)Q|%^U7k6N>1if~D0<oys$?$nx+xKPf)IBcEG zq9Q9@63syu5ezz@0ryDs>s&Z@xf%z6PA#`a-;F*0LWp*|Qp+5T@M&#KrdeGonwp zxbr-Jg3s@Vfa(r8Io_&C*oWM@T-a66N;|kjH`WSzq@ zD%!U`v%KEnJSY@&id_6hNK2TA*3Hh z9QVJ-@`3tqsnCWmX~o|D19aBLyP#aiQ{mtVJX^c^LVcfnJQuljp!~l4dm5GK`F&}e zaz6bwv~ozd-QzjSabxI{Xw Date: Sat, 23 Jan 2021 22:38:23 +0300 Subject: [PATCH 238/362] fix #1833 --- src/components/postElements/body/view/commentBodyView.js | 2 +- src/screens/post/container/postContainer.js | 6 ++++-- .../screen/tabs/people/container/peopleResultsContainer.js | 1 - 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/postElements/body/view/commentBodyView.js b/src/components/postElements/body/view/commentBodyView.js index 054e790fe..f01541f8b 100644 --- a/src/components/postElements/body/view/commentBodyView.js +++ b/src/components/postElements/body/view/commentBodyView.js @@ -208,7 +208,7 @@ const CommentBody = ({ author, permlink, }, - key: permlink, + key: `@${author}/${permlink}`, }); } }; diff --git a/src/screens/post/container/postContainer.js b/src/screens/post/container/postContainer.js index e3c83e910..a3b75f60d 100644 --- a/src/screens/post/container/postContainer.js +++ b/src/screens/post/container/postContainer.js @@ -22,7 +22,8 @@ const PostContainer = ({ navigation, currentAccount, isLoggedIn, isAnalytics }) const [isNewPost, setIsNewPost] = useState(false); const [isPostUnavailable, setIsPostUnavailable] = useState(false); const [parentPost, setParentPost] = useState(null); - const [author, setAuthor] = useState(null); + + let author; useEffect(() => { const { content, permlink, author: _author, isNewPost: _isNewPost } = get( @@ -47,7 +48,8 @@ const PostContainer = ({ navigation, currentAccount, isLoggedIn, isAnalytics }) } } else if (_author && permlink) { _loadPost(_author, permlink); - setAuthor(_author); + author = _author; + // tracking info if (isAnalytics) { Matomo.trackView([`/post/@${_author}/${permlink}`]).catch((error) => diff --git a/src/screens/searchResult/screen/tabs/people/container/peopleResultsContainer.js b/src/screens/searchResult/screen/tabs/people/container/peopleResultsContainer.js index 85f72ceb4..cfa4a08cb 100644 --- a/src/screens/searchResult/screen/tabs/people/container/peopleResultsContainer.js +++ b/src/screens/searchResult/screen/tabs/people/container/peopleResultsContainer.js @@ -36,7 +36,6 @@ const PeopleResultsContainer = (props) => { }); }; - console.log(users, 'users'); return ( children && children({ From dcf55f513bf1aa1ea917fac967ef71b8b6b54f89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Sun, 24 Jan 2021 15:52:56 +0300 Subject: [PATCH 239/362] Fix #1830 --- ios/Ecency.xcodeproj/project.pbxproj | 28 +++++++++---------- .../basicUIElements/view/tag/tagStyles.js | 2 +- .../basicUIElements/view/tag/tagView.js | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ios/Ecency.xcodeproj/project.pbxproj b/ios/Ecency.xcodeproj/project.pbxproj index 43297c5af..f4c80b3ae 100644 --- a/ios/Ecency.xcodeproj/project.pbxproj +++ b/ios/Ecency.xcodeproj/project.pbxproj @@ -43,7 +43,7 @@ 05B6C4B024C306CE00B7FA60 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 980BC9BC0D3B4AC69645C842 /* Zocial.ttf */; }; 0A1D279E0D3CD306C889592E /* libPods-Ecency-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7093E51BBC0EE2F41AB19EBA /* libPods-Ecency-tvOS.a */; }; 1CD0B89E258019B600A7D78E /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1CD0B89B258019B600A7D78E /* GoogleService-Info.plist */; }; - 2B3CF3607B7CB9B7296FD5EF /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; + 2B3CF3607B7CB9B7296FD5EF /* (null) in Frameworks */ = {isa = PBXBuildFile; }; 2D02E4BC1E0B4A80006451C7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; 2D02E4BD1E0B4A84006451C7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; @@ -55,7 +55,7 @@ CFAA2A599FD65F360D9B3E1E /* libPods-EcencyTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B344CAA24725C973F48BE81E /* libPods-EcencyTests.a */; }; D71EB20EDB9B987C0574BAFE /* libPods-EcencyTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C97456BE898C00B5EDA21C2E /* libPods-EcencyTests.a */; }; DC0E25610BB5F49AFF4514AD /* libPods-Ecency.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 388DF3FF85F08109F722083B /* libPods-Ecency.a */; }; - F77F6C7E54F3C783A2773E9D /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; + F77F6C7E54F3C783A2773E9D /* (null) in Frameworks */ = {isa = PBXBuildFile; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -204,8 +204,8 @@ buildActionMask = 2147483647; files = ( 05B6C49424C306CE00B7FA60 /* StoreKit.framework in Frameworks */, - F77F6C7E54F3C783A2773E9D /* BuildFile in Frameworks */, - 2B3CF3607B7CB9B7296FD5EF /* BuildFile in Frameworks */, + F77F6C7E54F3C783A2773E9D /* (null) in Frameworks */, + 2B3CF3607B7CB9B7296FD5EF /* (null) in Frameworks */, DC0E25610BB5F49AFF4514AD /* libPods-Ecency.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -527,9 +527,9 @@ ProvisioningStyle = Manual; }; 05B6C48C24C306CE00B7FA60 = { - DevelopmentTeam = 75B6RXTKGT; + DevelopmentTeam = RBP7PE82SN; LastSwiftMigration = 1160; - ProvisioningStyle = Manual; + ProvisioningStyle = Automatic; }; 2D02E47A1E0B4A5D006451C7 = { CreatedOnToolsVersion = 8.2.1; @@ -1101,12 +1101,12 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Ecency/EcencyDebug.entitlements; - CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 2563; DEAD_CODE_STRIPPING = NO; - DEVELOPMENT_TEAM = 75B6RXTKGT; + DEVELOPMENT_TEAM = RBP7PE82SN; HEADER_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)/../../../../ios/Pods/Headers/Public/**", @@ -1161,7 +1161,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = app.esteem.mobile.ios; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ios_dev_app; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "Ecency-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -1178,11 +1178,11 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Ecency/Ecency.entitlements; - CODE_SIGN_IDENTITY = "iPhone Distribution"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 2563; DEAD_CODE_STRIPPING = NO; - DEVELOPMENT_TEAM = 75B6RXTKGT; + DEVELOPMENT_TEAM = ""; HEADER_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)/../../../../ios/Pods/Headers/Public/**", @@ -1237,7 +1237,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = app.esteem.mobile.ios; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ios_dist_app; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "Ecency-Bridging-Header.h"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/src/components/basicUIElements/view/tag/tagStyles.js b/src/components/basicUIElements/view/tag/tagStyles.js index 9b25ae209..70ff8475e 100644 --- a/src/components/basicUIElements/view/tag/tagStyles.js +++ b/src/components/basicUIElements/view/tag/tagStyles.js @@ -14,7 +14,7 @@ export default EStyleSheet.create({ backgroundColor: '$tagColor', }, textWrapper: { - paddingHorizontal: Platform.OS === 'android' ? 20 : 10, + paddingHorizontal: Platform.OS === 'android' ? 16 : 8, justifyContent: 'center', marginRight: 8, marginLeft: 8, diff --git a/src/components/basicUIElements/view/tag/tagView.js b/src/components/basicUIElements/view/tag/tagView.js index 35e43a2b6..497e7067c 100644 --- a/src/components/basicUIElements/view/tag/tagView.js +++ b/src/components/basicUIElements/view/tag/tagView.js @@ -35,7 +35,7 @@ const Tag = ({ textStyle, ]} > - {label} + {` ${label} `} From f51660d79ec9dd35aa6228d109274e021ed99f39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Sun, 24 Jan 2021 18:45:00 +0300 Subject: [PATCH 240/362] Fix #1835 --- src/components/posts/view/postsView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/posts/view/postsView.js b/src/components/posts/view/postsView.js index 8e0952e5e..cd4bc6dce 100644 --- a/src/components/posts/view/postsView.js +++ b/src/components/posts/view/postsView.js @@ -319,7 +319,7 @@ const PostsView = ({ removeClippedSubviews refreshing={refreshing} onRefresh={handleOnRefreshPosts} - onEndReachedThreshold={2} + onEndReachedThreshold={0.5} ListFooterComponent={_renderFooter} onScrollEndDrag={_handleOnScroll} ListEmptyComponent={_renderEmptyContent} From a647bda9c85f9ecb085beb5320806347b6ed0456 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Mon, 25 Jan 2021 00:04:36 +0300 Subject: [PATCH 241/362] fix #1828 & fix #1837 --- .../basicHeader/view/basicHeaderStyles.js | 5 + .../basicHeader/view/basicHeaderView.js | 3 + .../beneficiaryModal/beneficiaryModal.js | 125 ++++++++++++------ .../beneficiaryModalStyles.js | 11 +- .../formInput/view/formInputView.js | 11 +- src/config/locales/en-US.json | 6 + .../editor/container/editorContainer.js | 11 +- src/screens/editor/screen/editorScreen.js | 2 + 8 files changed, 127 insertions(+), 47 deletions(-) diff --git a/src/components/basicHeader/view/basicHeaderStyles.js b/src/components/basicHeader/view/basicHeaderStyles.js index b34b05052..2552b99f3 100644 --- a/src/components/basicHeader/view/basicHeaderStyles.js +++ b/src/components/basicHeader/view/basicHeaderStyles.js @@ -84,4 +84,9 @@ export default EStyleSheet.create({ backgroundColor: '$primaryBackgroundColor', alignItems: 'center', }, + beneficiaryModal: { + flex: 1, + backgroundColor: '$modalBackground', + margin: 0, + }, }); diff --git a/src/components/basicHeader/view/basicHeaderView.js b/src/components/basicHeader/view/basicHeaderView.js index 5cd77a9c3..57f934059 100644 --- a/src/components/basicHeader/view/basicHeaderView.js +++ b/src/components/basicHeader/view/basicHeaderView.js @@ -27,6 +27,7 @@ const BasicHeaderView = ({ intl, isDraftSaved, isDraftSaving, + isDraft, isFormValid, isHasDropdown, isHasIcons, @@ -264,10 +265,12 @@ const BasicHeaderView = ({ handleOnModalClose={() => setBeneficiaryModal(false)} title={intl.formatMessage({ id: 'editor.beneficiaries' })} animationType="slide" + style={styles.beneficiaryModal} > { +const BeneficiaryModal = ({ username, handleOnSaveBeneficiaries, isDraft }) => { const intl = useIntl(); const [beneficiaries, setBeneficiaries] = useState([ { account: username, weight: 10000, isValid: true }, ]); + useEffect(() => { + if (!isDraft) { + readTempBeneficiaries(); + } + }, []); + + const readTempBeneficiaries = async () => { + const tempBeneficiariesString = await AsyncStorage.getItem('temp-beneficiaries'); + const tempBeneficiaries = JSON.parse(tempBeneficiariesString); + + if (isArray(tempBeneficiaries)) { + tempBeneficiaries.forEach((item) => { + item.isValid = true; + }); + + setBeneficiaries(tempBeneficiaries); + } + }; + const _addAccount = () => { setBeneficiaries([...beneficiaries, { account: '', weight: 0, isValid: false }]); }; @@ -48,43 +69,53 @@ const BeneficiaryModal = ({ username, handleOnSaveBeneficiaries }) => { return beneficiaries.every((item) => item.isValid); }; - const renderInputs = useCallback( - ({ item, index }) => { - const _isCurrentUser = item.account === username; + const _onBlur = (item, index) => { + if (item.weight === 0) { + const newBeneficiaries = [...beneficiaries]; + remove(newBeneficiaries, (current) => { + return current.account === item.account; + }); - return ( - - - _onWeightInputChange(value, index)} - /> - - - _onUsernameInputChange(value, index)} - placeholder={intl.formatMessage({ - id: 'login.username', - })} - type="username" - isFirstImage - value={item.account} - wrapperStyle={styles.usernameFormInputWrapper} - /> - + setBeneficiaries(newBeneficiaries); + } + }; + + const renderInputs = ({ item, index }) => { + const _isCurrentUser = item.account === username; + + return ( + + + _onWeightInputChange(value, index)} + onBlur={() => _onBlur(item, index)} + /> - ); - }, - [beneficiaries], - ); + + _onUsernameInputChange(value, index)} + placeholder={intl.formatMessage({ + id: 'beneficiary_modal.username', + })} + type="username" + isFirstImage + value={item.account} + inputStyle={styles.usernameInput} + wrapperStyle={styles.usernameFormInputWrapper} + /> + + + ); + }; return ( @@ -95,17 +126,27 @@ const BeneficiaryModal = ({ username, handleOnSaveBeneficiaries }) => { ListHeaderComponent={() => ( - Weight(%) + + {intl.formatMessage({ + id: 'beneficiary_modal.percent', + })} + - Username + + {intl.formatMessage({ + id: 'beneficiary_modal.username', + })} + )} ListFooterComponent={() => ( { style={styles.saveButton} isDisable={!_isValid()} onPress={() => handleOnSaveBeneficiaries(beneficiaries)} - text="Save" + text={intl.formatMessage({ + id: 'beneficiary_modal.save', + })} /> diff --git a/src/components/beneficiaryModal/beneficiaryModalStyles.js b/src/components/beneficiaryModal/beneficiaryModalStyles.js index d9926e6df..b19005586 100644 --- a/src/components/beneficiaryModal/beneficiaryModalStyles.js +++ b/src/components/beneficiaryModal/beneficiaryModalStyles.js @@ -1,13 +1,18 @@ import EStyleSheet from 'react-native-extended-stylesheet'; export default EStyleSheet.create({ - container: { flex: 1, justifyContent: 'space-between' }, + container: { + flex: 1, + justifyContent: 'space-between', + padding: 16, + }, bodyWrapper: { flex: 3, paddingTop: 20 }, inputWrapper: { flexDirection: 'row', alignItems: 'center' }, + text: { color: '$primaryBlack', marginBottom: 8 }, weightInput: { flex: 1 }, - weightFormInput: { textAlign: 'center' }, + weightFormInput: { textAlign: 'center', color: '$primaryBlack' }, weightFormInputWrapper: { marginTop: 0 }, - usernameInput: { flex: 4 }, + usernameInput: { flex: 3, color: '$primaryBlack', marginLeft: 16 }, usernameFormInputWrapper: { marginTop: 0, marginLeft: 10 }, footerWrapper: { flex: 1 }, saveButton: { diff --git a/src/components/formInput/view/formInputView.js b/src/components/formInput/view/formInputView.js index d1a51df2e..d904dca8d 100644 --- a/src/components/formInput/view/formInputView.js +++ b/src/components/formInput/view/formInputView.js @@ -28,6 +28,7 @@ const FormInputView = ({ onChange, isValid, value, + onBlur, }) => { const [_value, setValue] = useState(value || ''); const [inputBorderColor, setInputBorderColor] = useState('#e7e7e7'); @@ -47,6 +48,14 @@ const FormInputView = ({ setInputBorderColor('#357ce6'); }; + const _handleOnBlur = () => { + setInputBorderColor('#e7e7e7'); + + if (onBlur) { + onBlur(); + } + }; + useEffect(() => { setValue(value); }, [value]); @@ -97,7 +106,7 @@ const FormInputView = ({ setInputBorderColor('#e7e7e7')} + onBlur={_handleOnBlur} autoCapitalize="none" secureTextEntry={secureTextEntry} height={height} diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json index eff206b86..ec0defc88 100644 --- a/src/config/locales/en-US.json +++ b/src/config/locales/en-US.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } diff --git a/src/screens/editor/container/editorContainer.js b/src/screens/editor/container/editorContainer.js index 937ce3093..777a9909f 100644 --- a/src/screens/editor/container/editorContainer.js +++ b/src/screens/editor/container/editorContainer.js @@ -331,6 +331,9 @@ class EditorContainer extends Component { const voteWeight = null; if (scheduleDate) { + if (fields.tags.length === 0) { + fields.tags = ['hive-125125']; + } await this._setScheduledPost({ author, permlink, @@ -351,7 +354,7 @@ class EditorContainer extends Component { options, voteWeight, ) - .then(() => { + .then(async () => { setDraftPost( { title: '', @@ -360,6 +363,7 @@ class EditorContainer extends Component { }, currentAccount.name, ); + await AsyncStorage.setItem('temp-beneficiaries', ''); dispatch( toastNotification( @@ -716,8 +720,9 @@ class EditorContainer extends Component { this.setState({ rewardType: value }); }; - _handleBeneficiaries = (value) => { + _handleBeneficiaries = async (value) => { this.setState({ beneficiaries: value }); + await AsyncStorage.setItem('temp-beneficiaries', JSON.stringify(value)); }; // Component Life Cycle Functions @@ -829,6 +834,7 @@ class EditorContainer extends Component { post, uploadedImage, community, + isDraft, } = this.state; const tags = navigation.state.params && navigation.state.params.tags; @@ -861,6 +867,7 @@ class EditorContainer extends Component { tags={tags} community={community} currentAccount={currentAccount} + isDraft={isDraft} /> ); } diff --git a/src/screens/editor/screen/editorScreen.js b/src/screens/editor/screen/editorScreen.js index e9e20abd1..2e1a93aad 100644 --- a/src/screens/editor/screen/editorScreen.js +++ b/src/screens/editor/screen/editorScreen.js @@ -266,6 +266,7 @@ class EditorScreen extends Component { intl, isDraftSaved, isDraftSaving, + isDraft, isEdit, isLoggedIn, isPostSending, @@ -305,6 +306,7 @@ class EditorScreen extends Component { handleOnSubmit={this._handleOnSubmit} isDraftSaved={isDraftSaved} isDraftSaving={isDraftSaving} + isDraft={isDraft} isEdit={isEdit} isFormValid={isFormValid} isHasIcons From 681224d9a840d47b409f9ed234231445d8b13d1e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:24:54 +0200 Subject: [PATCH 242/362] New translations en-US.json (Bengali) --- src/config/locales/bn-BD.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/bn-BD.json b/src/config/locales/bn-BD.json index 712c8b075..d886705e6 100644 --- a/src/config/locales/bn-BD.json +++ b/src/config/locales/bn-BD.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 53f527d5d4c7be1f54fbe027a468b512ac9c6627 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:24:56 +0200 Subject: [PATCH 243/362] New translations en-US.json (Estonian) --- src/config/locales/et-EE.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/et-EE.json b/src/config/locales/et-EE.json index 895f6ef1f..30301f6e4 100644 --- a/src/config/locales/et-EE.json +++ b/src/config/locales/et-EE.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From e1b30b0dedad39b78b3eda7133b7514dedf5959a Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:24:57 +0200 Subject: [PATCH 244/362] New translations en-US.json (Filipino) --- src/config/locales/fil-PH.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/fil-PH.json b/src/config/locales/fil-PH.json index 9b8339f66..2d26676cb 100644 --- a/src/config/locales/fil-PH.json +++ b/src/config/locales/fil-PH.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 704aa4e3f1ede7afb216181b424b27f2533b57fe Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:24:59 +0200 Subject: [PATCH 245/362] New translations en-US.json (Esperanto) --- src/config/locales/eo-UY.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/eo-UY.json b/src/config/locales/eo-UY.json index df5eaa53e..fbcab875a 100644 --- a/src/config/locales/eo-UY.json +++ b/src/config/locales/eo-UY.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From ccac1080e84aa1cbe6cde6a7fd6ba581f309c6ca Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:01 +0200 Subject: [PATCH 246/362] New translations en-US.json (Malay) --- src/config/locales/ms-MY.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/ms-MY.json b/src/config/locales/ms-MY.json index 154595449..5c3aa5448 100644 --- a/src/config/locales/ms-MY.json +++ b/src/config/locales/ms-MY.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 400c6fe02392cebbdfcb7412b9f1448b8df4a6ad Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:03 +0200 Subject: [PATCH 247/362] New translations en-US.json (Kyrgyz) --- src/config/locales/ky-KG.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/ky-KG.json b/src/config/locales/ky-KG.json index 4b58e6c5c..f83ab8b1c 100644 --- a/src/config/locales/ky-KG.json +++ b/src/config/locales/ky-KG.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From e6c91bae63225224fcf2cf6c6c59c3d36e26bfa6 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:05 +0200 Subject: [PATCH 248/362] New translations en-US.json (Azerbaijani) --- src/config/locales/az-AZ.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/az-AZ.json b/src/config/locales/az-AZ.json index ea78e2272..7f395bd46 100644 --- a/src/config/locales/az-AZ.json +++ b/src/config/locales/az-AZ.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 291a954974419a5606ccceadb3feddc4592d8db0 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:06 +0200 Subject: [PATCH 249/362] New translations en-US.json (Latvian) --- src/config/locales/lv-LV.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/lv-LV.json b/src/config/locales/lv-LV.json index df5eaa53e..fbcab875a 100644 --- a/src/config/locales/lv-LV.json +++ b/src/config/locales/lv-LV.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 00efda98255222406fb09eea8cdb6c9d63f5a633 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:08 +0200 Subject: [PATCH 250/362] New translations en-US.json (Kazakh) --- src/config/locales/kk-KZ.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/kk-KZ.json b/src/config/locales/kk-KZ.json index df5eaa53e..fbcab875a 100644 --- a/src/config/locales/kk-KZ.json +++ b/src/config/locales/kk-KZ.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 9fa1a480f7444c0600caa8878b24d6f02ff26fba Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:10 +0200 Subject: [PATCH 251/362] New translations en-US.json (Bosnian) --- src/config/locales/bs-BA.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/bs-BA.json b/src/config/locales/bs-BA.json index df5eaa53e..fbcab875a 100644 --- a/src/config/locales/bs-BA.json +++ b/src/config/locales/bs-BA.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 192192ae5c06883953432876f623e6c2afb07bfc Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:12 +0200 Subject: [PATCH 252/362] New translations en-US.json (Croatian) --- src/config/locales/hr-HR.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/hr-HR.json b/src/config/locales/hr-HR.json index 9753d3a0c..f17ccba06 100644 --- a/src/config/locales/hr-HR.json +++ b/src/config/locales/hr-HR.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 4da491dd5da6f6faacad4efacf9ef5e80d29fbfa Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:14 +0200 Subject: [PATCH 253/362] New translations en-US.json (Thai) --- src/config/locales/th-TH.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/th-TH.json b/src/config/locales/th-TH.json index df5eaa53e..fbcab875a 100644 --- a/src/config/locales/th-TH.json +++ b/src/config/locales/th-TH.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 1480846ccf0bde558b1bacabe8cc5b551cbdb38a Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:15 +0200 Subject: [PATCH 254/362] New translations en-US.json (Tamil) --- src/config/locales/ta-IN.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/ta-IN.json b/src/config/locales/ta-IN.json index a8704471a..30258b713 100644 --- a/src/config/locales/ta-IN.json +++ b/src/config/locales/ta-IN.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 47b90b96747b0f0546b037c56e5d1f46a179cc8e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:17 +0200 Subject: [PATCH 255/362] New translations en-US.json (Persian) --- src/config/locales/fa-IR.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json index 6840c6699..8a55354c1 100644 --- a/src/config/locales/fa-IR.json +++ b/src/config/locales/fa-IR.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 1ae43e727a5ec308e80774acc926c7e5c6ac0105 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:19 +0200 Subject: [PATCH 256/362] New translations en-US.json (Indonesian) --- src/config/locales/id-ID.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/id-ID.json b/src/config/locales/id-ID.json index db96d0a50..c1caad7cf 100644 --- a/src/config/locales/id-ID.json +++ b/src/config/locales/id-ID.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 09f223e431d5a0e5c9450a055a77ff0339d5c40b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:21 +0200 Subject: [PATCH 257/362] New translations en-US.json (Icelandic) --- src/config/locales/is-IS.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/is-IS.json b/src/config/locales/is-IS.json index df5eaa53e..fbcab875a 100644 --- a/src/config/locales/is-IS.json +++ b/src/config/locales/is-IS.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From b6012b3cfe204e0c2a2bb430f0065149e6bc0d05 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:23 +0200 Subject: [PATCH 258/362] New translations en-US.json (Galician) --- src/config/locales/gl-ES.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/gl-ES.json b/src/config/locales/gl-ES.json index df5eaa53e..fbcab875a 100644 --- a/src/config/locales/gl-ES.json +++ b/src/config/locales/gl-ES.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 2c3d48002f570e4f74f2c06fbb84bb65651258ef Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:24 +0200 Subject: [PATCH 259/362] New translations en-US.json (Tibetan) --- src/config/locales/bo-BT.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/bo-BT.json b/src/config/locales/bo-BT.json index df5eaa53e..fbcab875a 100644 --- a/src/config/locales/bo-BT.json +++ b/src/config/locales/bo-BT.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 5b14a48ba115a940fd8bdd472f5e048d7045c822 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:26 +0200 Subject: [PATCH 260/362] New translations en-US.json (Uzbek) --- src/config/locales/uz-UZ.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/uz-UZ.json b/src/config/locales/uz-UZ.json index df5eaa53e..fbcab875a 100644 --- a/src/config/locales/uz-UZ.json +++ b/src/config/locales/uz-UZ.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 21fb9f5cafdcc3bd2e0734e1e4f8eb9365236f17 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:28 +0200 Subject: [PATCH 261/362] New translations en-US.json (Urdu (Pakistan)) --- src/config/locales/ur-PK.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/ur-PK.json b/src/config/locales/ur-PK.json index c58f8838f..860abdb2b 100644 --- a/src/config/locales/ur-PK.json +++ b/src/config/locales/ur-PK.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 220dd613a8cee8b250f99ad1fbb20fa890d722d6 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:30 +0200 Subject: [PATCH 262/362] New translations en-US.json (Sanskrit) --- src/config/locales/sa-IN.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/sa-IN.json b/src/config/locales/sa-IN.json index df5eaa53e..fbcab875a 100644 --- a/src/config/locales/sa-IN.json +++ b/src/config/locales/sa-IN.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From e9f5fb2b958e3d2f46c2e3d0f25378cced6565e6 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:32 +0200 Subject: [PATCH 263/362] New translations en-US.json (Spanish, Argentina) --- src/config/locales/es-AR.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/es-AR.json b/src/config/locales/es-AR.json index eff206b86..ec0defc88 100644 --- a/src/config/locales/es-AR.json +++ b/src/config/locales/es-AR.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From d2fa0cd6797fc2f80045d6f4bbc2f854675a9113 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:33 +0200 Subject: [PATCH 264/362] New translations en-US.json (Acehnese) --- src/config/locales/ac-ace.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/ac-ace.json b/src/config/locales/ac-ace.json index 0d002219c..e05a7a939 100644 --- a/src/config/locales/ac-ace.json +++ b/src/config/locales/ac-ace.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 833a1939f7cafdff2edf143a2bf801bff835970b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:35 +0200 Subject: [PATCH 265/362] New translations en-US.json (Urdu (India)) --- src/config/locales/ur-IN.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/ur-IN.json b/src/config/locales/ur-IN.json index c58f8838f..860abdb2b 100644 --- a/src/config/locales/ur-IN.json +++ b/src/config/locales/ur-IN.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 4d085b662ac311b374a675880d788997372aaf5e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:37 +0200 Subject: [PATCH 266/362] New translations en-US.json (Kabyle) --- src/config/locales/kab-KAB.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/kab-KAB.json b/src/config/locales/kab-KAB.json index fdb19013b..733b5cd04 100644 --- a/src/config/locales/kab-KAB.json +++ b/src/config/locales/kab-KAB.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From e4f1f92707a68f05cb4b5d3a67ecf489cdff6a0f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:39 +0200 Subject: [PATCH 267/362] New translations en-US.json (Gothic) --- src/config/locales/got-DE.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/got-DE.json b/src/config/locales/got-DE.json index 8fd2e4ed9..b398690e9 100644 --- a/src/config/locales/got-DE.json +++ b/src/config/locales/got-DE.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 1baab4d8b26eead5f045ed37c9835f41572dfa3a Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:40 +0200 Subject: [PATCH 268/362] New translations en-US.json (Nigerian Pidgin) --- src/config/locales/pcm-NG.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/pcm-NG.json b/src/config/locales/pcm-NG.json index 22e3c19b5..8604dbf04 100644 --- a/src/config/locales/pcm-NG.json +++ b/src/config/locales/pcm-NG.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From c8bdb897f21eb4614f347f35990f0b85e878d340 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:42 +0200 Subject: [PATCH 269/362] New translations en-US.json (Turkmen) --- src/config/locales/tk-TM.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/tk-TM.json b/src/config/locales/tk-TM.json index df5eaa53e..fbcab875a 100644 --- a/src/config/locales/tk-TM.json +++ b/src/config/locales/tk-TM.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 7be9cc66a2eb575df2dfebd9e3436245e35a5849 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:44 +0200 Subject: [PATCH 270/362] New translations en-US.json (Assamese) --- src/config/locales/as-IN.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/as-IN.json b/src/config/locales/as-IN.json index df5eaa53e..fbcab875a 100644 --- a/src/config/locales/as-IN.json +++ b/src/config/locales/as-IN.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From abc56a5880833bb89258144f0b343c7af336b233 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:45 +0200 Subject: [PATCH 271/362] New translations en-US.json (Kashmiri) --- src/config/locales/ks-IN.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/ks-IN.json b/src/config/locales/ks-IN.json index df5eaa53e..fbcab875a 100644 --- a/src/config/locales/ks-IN.json +++ b/src/config/locales/ks-IN.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 48b665a5fe2ecb85c062ce1c1dba7a55cd8f033a Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:47 +0200 Subject: [PATCH 272/362] New translations en-US.json (Cebuano) --- src/config/locales/ceb-PH.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/ceb-PH.json b/src/config/locales/ceb-PH.json index df5eaa53e..fbcab875a 100644 --- a/src/config/locales/ceb-PH.json +++ b/src/config/locales/ceb-PH.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 6bdbad471a23fc95b694034fbb9ef7971d682612 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:49 +0200 Subject: [PATCH 273/362] New translations en-US.json (Yoruba) --- src/config/locales/yo-NG.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/yo-NG.json b/src/config/locales/yo-NG.json index 9b7c1e671..c79888d22 100644 --- a/src/config/locales/yo-NG.json +++ b/src/config/locales/yo-NG.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 7b550fd1ff5b212c146e83cb5a4ac435d5372105 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:50 +0200 Subject: [PATCH 274/362] New translations en-US.json (Tajik) --- src/config/locales/tg-TJ.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/tg-TJ.json b/src/config/locales/tg-TJ.json index df5eaa53e..fbcab875a 100644 --- a/src/config/locales/tg-TJ.json +++ b/src/config/locales/tg-TJ.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From c4f10e91face540106f9c862cc973b2ab2617cdf Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:52 +0200 Subject: [PATCH 275/362] New translations en-US.json (Nepali) --- src/config/locales/ne-NP.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/ne-NP.json b/src/config/locales/ne-NP.json index df5eaa53e..fbcab875a 100644 --- a/src/config/locales/ne-NP.json +++ b/src/config/locales/ne-NP.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 24e38b70e98f830f38df01c6840dbfcd91c62a45 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:54 +0200 Subject: [PATCH 276/362] New translations en-US.json (Serbian (Latin)) --- src/config/locales/sr-CS.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/sr-CS.json b/src/config/locales/sr-CS.json index b439cdd8c..e02bf1b24 100644 --- a/src/config/locales/sr-CS.json +++ b/src/config/locales/sr-CS.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From c3e67724813274e0e18d877fbc7687b3df4db035 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:56 +0200 Subject: [PATCH 277/362] New translations en-US.json (Swahili) --- src/config/locales/sw-KE.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/sw-KE.json b/src/config/locales/sw-KE.json index df5eaa53e..fbcab875a 100644 --- a/src/config/locales/sw-KE.json +++ b/src/config/locales/sw-KE.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From fea7a7ad77746e373ad9d7e514563f700e781404 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:58 +0200 Subject: [PATCH 278/362] New translations en-US.json (Vietnamese) --- src/config/locales/vi-VN.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/vi-VN.json b/src/config/locales/vi-VN.json index 2026a5395..8abd506a4 100644 --- a/src/config/locales/vi-VN.json +++ b/src/config/locales/vi-VN.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From adf1723ddb4f6f7740a31fb02733410d8d17f8e7 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:25:59 +0200 Subject: [PATCH 279/362] New translations en-US.json (Chinese Traditional) --- src/config/locales/zh-TW.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/zh-TW.json b/src/config/locales/zh-TW.json index ff344b416..dae24e8e0 100644 --- a/src/config/locales/zh-TW.json +++ b/src/config/locales/zh-TW.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 853dec7101ce461d2660542bcb31bc650ec62e2d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:01 +0200 Subject: [PATCH 280/362] New translations en-US.json (Hindi) --- src/config/locales/hi-IN.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/hi-IN.json b/src/config/locales/hi-IN.json index 0294b73c2..645f22937 100644 --- a/src/config/locales/hi-IN.json +++ b/src/config/locales/hi-IN.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "कुछ नहीं है यहां" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From e80cabfa0cf6175277e34bee0c9dae81b67549ee Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:03 +0200 Subject: [PATCH 281/362] New translations en-US.json (German) --- src/config/locales/de-DE.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/de-DE.json b/src/config/locales/de-DE.json index ca7a63b41..3ac856653 100644 --- a/src/config/locales/de-DE.json +++ b/src/config/locales/de-DE.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 960a154c3d09e3b9d64119af44ac454b79098e12 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:05 +0200 Subject: [PATCH 282/362] New translations en-US.json (Armenian) --- src/config/locales/hy-AM.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/hy-AM.json b/src/config/locales/hy-AM.json index 75dd49881..038f05c50 100644 --- a/src/config/locales/hy-AM.json +++ b/src/config/locales/hy-AM.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 21b275d7ac0d679d95452a15e9f9cc1c826f4786 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:07 +0200 Subject: [PATCH 283/362] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index 749c249f7..b11498e43 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From e2b5b0fc576910207295ff483fa88a6385076a78 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:09 +0200 Subject: [PATCH 284/362] New translations en-US.json (Hebrew) --- src/config/locales/he-IL.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/he-IL.json b/src/config/locales/he-IL.json index 26a74d525..ff5357ed6 100644 --- a/src/config/locales/he-IL.json +++ b/src/config/locales/he-IL.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 2ba19e8b10ab987b0e1373e8dab9baae3b8bb443 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:11 +0200 Subject: [PATCH 285/362] New translations en-US.json (Irish) --- src/config/locales/ga-IE.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/ga-IE.json b/src/config/locales/ga-IE.json index df5eaa53e..fbcab875a 100644 --- a/src/config/locales/ga-IE.json +++ b/src/config/locales/ga-IE.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From c892088089ae629a6c9476a3912b3d439268d4d3 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:12 +0200 Subject: [PATCH 286/362] New translations en-US.json (Finnish) --- src/config/locales/fi-FI.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/fi-FI.json b/src/config/locales/fi-FI.json index ba27a8ae4..920587a8c 100644 --- a/src/config/locales/fi-FI.json +++ b/src/config/locales/fi-FI.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Täällä ei ole mitään" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From e137e67ca478f22e1a989590e033f71c6664aecf Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:14 +0200 Subject: [PATCH 287/362] New translations en-US.json (Greek) --- src/config/locales/el-GR.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/el-GR.json b/src/config/locales/el-GR.json index df5eaa53e..fbcab875a 100644 --- a/src/config/locales/el-GR.json +++ b/src/config/locales/el-GR.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From d6a45fa907673ea2d5c5aaa0bfe3abbdee922fd5 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:16 +0200 Subject: [PATCH 288/362] New translations en-US.json (Danish) --- src/config/locales/da-DK.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/da-DK.json b/src/config/locales/da-DK.json index df5eaa53e..fbcab875a 100644 --- a/src/config/locales/da-DK.json +++ b/src/config/locales/da-DK.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From dba6a70a6cc30d2d625f33f8ca0842bfae7ba2ff Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:18 +0200 Subject: [PATCH 289/362] New translations en-US.json (Japanese) --- src/config/locales/ja-JP.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/ja-JP.json b/src/config/locales/ja-JP.json index d1a85ee44..b3efbefde 100644 --- a/src/config/locales/ja-JP.json +++ b/src/config/locales/ja-JP.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 1c29a35aa97558fcbf8dcd71456d5086d97bc411 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:19 +0200 Subject: [PATCH 290/362] New translations en-US.json (Czech) --- src/config/locales/cs-CZ.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/cs-CZ.json b/src/config/locales/cs-CZ.json index df5eaa53e..fbcab875a 100644 --- a/src/config/locales/cs-CZ.json +++ b/src/config/locales/cs-CZ.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 772d91b72452727f52e957609a98eb5e161d5a48 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:21 +0200 Subject: [PATCH 291/362] New translations en-US.json (Catalan) --- src/config/locales/ca-ES.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/ca-ES.json b/src/config/locales/ca-ES.json index df5eaa53e..fbcab875a 100644 --- a/src/config/locales/ca-ES.json +++ b/src/config/locales/ca-ES.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From c284595cc5f203a9f307606924fa0b469e5d77cb Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:23 +0200 Subject: [PATCH 292/362] New translations en-US.json (Bulgarian) --- src/config/locales/bg-BG.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/bg-BG.json b/src/config/locales/bg-BG.json index 2fb9b8893..7dd8e5a40 100644 --- a/src/config/locales/bg-BG.json +++ b/src/config/locales/bg-BG.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Няма нищо тук" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From b41dcf03e4da830cf1a957db007f703a1bb19fcc Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:25 +0200 Subject: [PATCH 293/362] New translations en-US.json (Arabic) --- src/config/locales/ar-SA.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/ar-SA.json b/src/config/locales/ar-SA.json index b6a8c7e8c..3eae4e738 100644 --- a/src/config/locales/ar-SA.json +++ b/src/config/locales/ar-SA.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From fa1463092b1c693731fd0d246d14ee74f06a9024 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:27 +0200 Subject: [PATCH 294/362] New translations en-US.json (Spanish) --- src/config/locales/es-ES.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/es-ES.json b/src/config/locales/es-ES.json index 15dd447a9..e1c0c5c6d 100644 --- a/src/config/locales/es-ES.json +++ b/src/config/locales/es-ES.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nada aquí" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From b260a60741f50667f7a4779e54a833714eeb0987 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:28 +0200 Subject: [PATCH 295/362] New translations en-US.json (Romanian) --- src/config/locales/ro-RO.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/ro-RO.json b/src/config/locales/ro-RO.json index fb9a4b53b..a989396d4 100644 --- a/src/config/locales/ro-RO.json +++ b/src/config/locales/ro-RO.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 9418074a910517ea697bd55e2cfd1fbf7875d53e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:30 +0200 Subject: [PATCH 296/362] New translations en-US.json (French) --- src/config/locales/fr-FR.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/fr-FR.json b/src/config/locales/fr-FR.json index 649def19b..072159f8c 100644 --- a/src/config/locales/fr-FR.json +++ b/src/config/locales/fr-FR.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 32be93c462ab2479baccccc95b6c2156d192221f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:32 +0200 Subject: [PATCH 297/362] New translations en-US.json (Italian) --- src/config/locales/it-IT.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/it-IT.json b/src/config/locales/it-IT.json index 653699f2c..6178e2b5d 100644 --- a/src/config/locales/it-IT.json +++ b/src/config/locales/it-IT.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From bbb1a07c8bd33876d42d9b6c0fe862e5d3a2ce35 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:34 +0200 Subject: [PATCH 298/362] New translations en-US.json (Georgian) --- src/config/locales/ka-GE.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/ka-GE.json b/src/config/locales/ka-GE.json index df5eaa53e..fbcab875a 100644 --- a/src/config/locales/ka-GE.json +++ b/src/config/locales/ka-GE.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 3031b651abba24194bf9518253128a80f6bd330e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:35 +0200 Subject: [PATCH 299/362] New translations en-US.json (Chinese Simplified) --- src/config/locales/zh-CN.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/zh-CN.json b/src/config/locales/zh-CN.json index 56223543e..72b3de180 100644 --- a/src/config/locales/zh-CN.json +++ b/src/config/locales/zh-CN.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From a1e0f4b66239802ca8a5053c6cce5e3ffffa12b1 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:37 +0200 Subject: [PATCH 300/362] New translations en-US.json (Portuguese) --- src/config/locales/pt-PT.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/pt-PT.json b/src/config/locales/pt-PT.json index 6930a999c..982dc4f43 100644 --- a/src/config/locales/pt-PT.json +++ b/src/config/locales/pt-PT.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nada aqui" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 2f43c2a9e3e8667072b80a10e1be9b8984c2a3a1 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:39 +0200 Subject: [PATCH 301/362] New translations en-US.json (Ukrainian) --- src/config/locales/uk-UA.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/uk-UA.json b/src/config/locales/uk-UA.json index dc3719ffb..58bb09192 100644 --- a/src/config/locales/uk-UA.json +++ b/src/config/locales/uk-UA.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 22b7f1ec77b01f6c434d82f2eb72b629f0d4ff43 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:41 +0200 Subject: [PATCH 302/362] New translations en-US.json (Turkish) --- src/config/locales/tr-TR.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/tr-TR.json b/src/config/locales/tr-TR.json index 3274a4458..e6402997b 100644 --- a/src/config/locales/tr-TR.json +++ b/src/config/locales/tr-TR.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From be84aff8fb999197e9495f4563e9c7ecb0a7dd35 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:42 +0200 Subject: [PATCH 303/362] New translations en-US.json (Swedish) --- src/config/locales/sv-SE.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/sv-SE.json b/src/config/locales/sv-SE.json index df5eaa53e..fbcab875a 100644 --- a/src/config/locales/sv-SE.json +++ b/src/config/locales/sv-SE.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From ca4b72749786293202b44362e041520bc8d8dfd6 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:44 +0200 Subject: [PATCH 304/362] New translations en-US.json (Albanian) --- src/config/locales/sq-AL.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/sq-AL.json b/src/config/locales/sq-AL.json index 75dd49881..038f05c50 100644 --- a/src/config/locales/sq-AL.json +++ b/src/config/locales/sq-AL.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 2e3cba7f221838ba264ca43e2e094b181cd3372e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:46 +0200 Subject: [PATCH 305/362] New translations en-US.json (Slovenian) --- src/config/locales/sl-SI.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/sl-SI.json b/src/config/locales/sl-SI.json index 7a5a269af..7ae15549b 100644 --- a/src/config/locales/sl-SI.json +++ b/src/config/locales/sl-SI.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Tu ni ničesar" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From cfb548fe957fa94002256ee7de64934407bc7cf9 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:48 +0200 Subject: [PATCH 306/362] New translations en-US.json (Slovak) --- src/config/locales/sk-SK.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/sk-SK.json b/src/config/locales/sk-SK.json index df5eaa53e..fbcab875a 100644 --- a/src/config/locales/sk-SK.json +++ b/src/config/locales/sk-SK.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 3bd3d4d6e2e91d96bfeaf51448451a8ecb4d27af Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:49 +0200 Subject: [PATCH 307/362] New translations en-US.json (Russian) --- src/config/locales/ru-RU.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/ru-RU.json b/src/config/locales/ru-RU.json index 650b16bbb..27b730da3 100644 --- a/src/config/locales/ru-RU.json +++ b/src/config/locales/ru-RU.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From a757bb8baaa125bdb9d05fd52b9a662359b29b70 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:51 +0200 Subject: [PATCH 308/362] New translations en-US.json (Polish) --- src/config/locales/pl-PL.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/pl-PL.json b/src/config/locales/pl-PL.json index efaf86ca8..9647df89b 100644 --- a/src/config/locales/pl-PL.json +++ b/src/config/locales/pl-PL.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 421f5b08465dd199568b379b2655e4050a305de2 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:53 +0200 Subject: [PATCH 309/362] New translations en-US.json (Korean) --- src/config/locales/ko-KR.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/ko-KR.json b/src/config/locales/ko-KR.json index af86b361c..4ab820646 100644 --- a/src/config/locales/ko-KR.json +++ b/src/config/locales/ko-KR.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From e4391fe65c4a95fda1df0ed503e3180706bd207c Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:55 +0200 Subject: [PATCH 310/362] New translations en-US.json (Punjabi) --- src/config/locales/pa-IN.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/pa-IN.json b/src/config/locales/pa-IN.json index df5eaa53e..fbcab875a 100644 --- a/src/config/locales/pa-IN.json +++ b/src/config/locales/pa-IN.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From d9f687bc1a4f29b518d05f18741d37ae61d0320d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:56 +0200 Subject: [PATCH 311/362] New translations en-US.json (Norwegian) --- src/config/locales/no-NO.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/no-NO.json b/src/config/locales/no-NO.json index df5eaa53e..fbcab875a 100644 --- a/src/config/locales/no-NO.json +++ b/src/config/locales/no-NO.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 589dc8fcd5b72d2f14fbbccf678f7d2c3d0fd5f2 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:26:58 +0200 Subject: [PATCH 312/362] New translations en-US.json (Dutch) --- src/config/locales/nl-NL.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/nl-NL.json b/src/config/locales/nl-NL.json index 6ab5328ba..3283703d5 100644 --- a/src/config/locales/nl-NL.json +++ b/src/config/locales/nl-NL.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 828a0fa847b1660bc6542f6dd9cc7f980b58adf8 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:27:00 +0200 Subject: [PATCH 313/362] New translations en-US.json (Mongolian) --- src/config/locales/mn-MN.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/mn-MN.json b/src/config/locales/mn-MN.json index df5eaa53e..fbcab875a 100644 --- a/src/config/locales/mn-MN.json +++ b/src/config/locales/mn-MN.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 16c3cc52bd4f9453fd64342439bae6a6251b8256 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:27:02 +0200 Subject: [PATCH 314/362] New translations en-US.json (Macedonian) --- src/config/locales/mk-MK.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/mk-MK.json b/src/config/locales/mk-MK.json index df5eaa53e..fbcab875a 100644 --- a/src/config/locales/mk-MK.json +++ b/src/config/locales/mk-MK.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From a7c2255767994edc8dfe4320e2d95d097b66c205 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:27:03 +0200 Subject: [PATCH 315/362] New translations en-US.json (Lithuanian) --- src/config/locales/lt-LT.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/lt-LT.json b/src/config/locales/lt-LT.json index 65d8b1441..356da9340 100644 --- a/src/config/locales/lt-LT.json +++ b/src/config/locales/lt-LT.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From c933cd829989b6349a96539ff950480001d97c5c Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:27:05 +0200 Subject: [PATCH 316/362] New translations en-US.json (Kurdish) --- src/config/locales/ku-TR.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/ku-TR.json b/src/config/locales/ku-TR.json index 5c91e8e14..33e6697ec 100644 --- a/src/config/locales/ku-TR.json +++ b/src/config/locales/ku-TR.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 22d47411eb0f43e8264211954212cf691ac1dbcf Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:27:07 +0200 Subject: [PATCH 317/362] New translations en-US.json (Spanish, Mexico) --- src/config/locales/es-MX.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/es-MX.json b/src/config/locales/es-MX.json index eff206b86..ec0defc88 100644 --- a/src/config/locales/es-MX.json +++ b/src/config/locales/es-MX.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 4d48a97d967767f39400d50a69047ef40ec84cc7 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:34:42 +0200 Subject: [PATCH 318/362] Update source file en-US.json --- src/config/locales/en-US.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json index eff206b86..ec0defc88 100644 --- a/src/config/locales/en-US.json +++ b/src/config/locales/en-US.json @@ -588,5 +588,11 @@ }, "empty_screen": { "nothing_here": "Nothing here" + }, + "beneficiary_modal": { + "percent": "Percent", + "username": "Username", + "addAccount": "Add Account", + "save": "Save" } } From 8c64160458e5bf559d4e9910f066501e96b7717c Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 24 Jan 2021 23:53:42 +0200 Subject: [PATCH 319/362] New translations en-US.json (Spanish) --- src/config/locales/es-ES.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/config/locales/es-ES.json b/src/config/locales/es-ES.json index e1c0c5c6d..129748373 100644 --- a/src/config/locales/es-ES.json +++ b/src/config/locales/es-ES.json @@ -590,9 +590,9 @@ "nothing_here": "Nada aquí" }, "beneficiary_modal": { - "percent": "Percent", - "username": "Username", - "addAccount": "Add Account", - "save": "Save" + "percent": "Porcentaje", + "username": "Nombre de Usuario", + "addAccount": "Agregar cuenta", + "save": "Guardar" } } From c98af617e1d56297c5c791a9d65cd73f859865e6 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 25 Jan 2021 00:33:22 +0200 Subject: [PATCH 320/362] New translations en-US.json (Finnish) --- src/config/locales/fi-FI.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/config/locales/fi-FI.json b/src/config/locales/fi-FI.json index 920587a8c..5f8017508 100644 --- a/src/config/locales/fi-FI.json +++ b/src/config/locales/fi-FI.json @@ -590,9 +590,9 @@ "nothing_here": "Täällä ei ole mitään" }, "beneficiary_modal": { - "percent": "Percent", - "username": "Username", - "addAccount": "Add Account", - "save": "Save" + "percent": "Prosenttia", + "username": "Käyttäjänimi", + "addAccount": "Lisää Tili", + "save": "Tallenna" } } From 7527aa635c1ee8c5f8c15ae4c4f43674364d8297 Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 25 Jan 2021 09:45:04 +0200 Subject: [PATCH 321/362] improve community search page --- ios/Ecency.xcodeproj/project.pbxproj | 12 +++---- .../searchResult/screen/searchResultScreen.js | 2 +- .../container/communitiesResultsContainer.js | 32 +++++++++++++------ 3 files changed, 29 insertions(+), 17 deletions(-) diff --git a/ios/Ecency.xcodeproj/project.pbxproj b/ios/Ecency.xcodeproj/project.pbxproj index fc5ab25d5..c74c86d75 100644 --- a/ios/Ecency.xcodeproj/project.pbxproj +++ b/ios/Ecency.xcodeproj/project.pbxproj @@ -527,9 +527,9 @@ ProvisioningStyle = Manual; }; 05B6C48C24C306CE00B7FA60 = { - DevelopmentTeam = RBP7PE82SN; + DevelopmentTeam = 75B6RXTKGT; LastSwiftMigration = 1160; - ProvisioningStyle = Automatic; + ProvisioningStyle = Manual; }; 2D02E47A1E0B4A5D006451C7 = { CreatedOnToolsVersion = 8.2.1; @@ -1106,7 +1106,7 @@ CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 2792; DEAD_CODE_STRIPPING = NO; - DEVELOPMENT_TEAM = RBP7PE82SN; + DEVELOPMENT_TEAM = 75B6RXTKGT; HEADER_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)/../../../../ios/Pods/Headers/Public/**", @@ -1161,7 +1161,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = app.esteem.mobile.ios; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; + PROVISIONING_PROFILE_SPECIFIER = ios_dev_app; SWIFT_OBJC_BRIDGING_HEADER = "Ecency-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -1182,7 +1182,7 @@ CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 2792; DEAD_CODE_STRIPPING = NO; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 75B6RXTKGT; HEADER_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)/../../../../ios/Pods/Headers/Public/**", @@ -1237,7 +1237,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = app.esteem.mobile.ios; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; + PROVISIONING_PROFILE_SPECIFIER = ios_dist_app; SWIFT_OBJC_BRIDGING_HEADER = "Ecency-Bridging-Header.h"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/src/screens/searchResult/screen/searchResultScreen.js b/src/screens/searchResult/screen/searchResultScreen.js index 7f388cc3a..3d5fe1328 100644 --- a/src/screens/searchResult/screen/searchResultScreen.js +++ b/src/screens/searchResult/screen/searchResultScreen.js @@ -35,7 +35,7 @@ const SearchResultScreen = ({ navigation }) => { const _handleChangeText = debounce((value) => { setSearchValue(value); - }, 250); + }, 1000); return ( diff --git a/src/screens/searchResult/screen/tabs/communities/container/communitiesResultsContainer.js b/src/screens/searchResult/screen/tabs/communities/container/communitiesResultsContainer.js index d1373f3f5..8ae75283a 100644 --- a/src/screens/searchResult/screen/tabs/communities/container/communitiesResultsContainer.js +++ b/src/screens/searchResult/screen/tabs/communities/container/communitiesResultsContainer.js @@ -45,16 +45,28 @@ const CommunitiesResultsContainer = ({ children, navigation, searchValue }) => { setData([]); setNoResult(false); - getSubscriptions(currentAccount.username).then((subs) => { - getCommunities('', searchValue ? 100 : 20, searchValue, 'rank').then((communities) => { - communities.forEach((community) => - Object.assign(community, { - isSubscribed: subs.some( - (subscribedCommunity) => subscribedCommunity[0] === community.name, - ), - }), - ); + getCommunities('', searchValue ? 100 : 20, searchValue, 'rank').then((communities) => { + if (currentAccount && currentAccount.username) { + getSubscriptions(currentAccount.username).then((subs) => { + communities.forEach((community) => + Object.assign(community, { + isSubscribed: subs.some( + (subscribedCommunity) => subscribedCommunity[0] === community.name, + ), + }), + ); + if (searchValue) { + setData(communities); + } else { + setData(shuffle(communities)); + } + + if (communities.length === 0) { + setNoResult(true); + } + }); + } else { if (searchValue) { setData(communities); } else { @@ -64,7 +76,7 @@ const CommunitiesResultsContainer = ({ children, navigation, searchValue }) => { if (communities.length === 0) { setNoResult(true); } - }); + } }); }, [searchValue]); From 0841578e635c646c08614e30cfe75966f7767657 Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 25 Jan 2021 09:52:27 +0200 Subject: [PATCH 322/362] improve topics search page --- .../screen/tabs/topics/container/topicsResultsContainer.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/screens/searchResult/screen/tabs/topics/container/topicsResultsContainer.js b/src/screens/searchResult/screen/tabs/topics/container/topicsResultsContainer.js index 50c919aeb..65bf9e180 100644 --- a/src/screens/searchResult/screen/tabs/topics/container/topicsResultsContainer.js +++ b/src/screens/searchResult/screen/tabs/topics/container/topicsResultsContainer.js @@ -15,7 +15,7 @@ const OtherResultContainer = (props) => { const { children, navigation, searchValue } = props; useEffect(() => { - if (searchValue.length <= 10) { + if (searchValue && searchValue.length <= 10) { setNoResult(false); setTags([]); @@ -25,6 +25,9 @@ const OtherResultContainer = (props) => { } setTags(res); }); + } else { + setNoResult(true); + setTags([]); } }, [searchValue]); From e97d2deb38df60f7db94f21a2fb10d2c70302d40 Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 25 Jan 2021 10:02:40 +0200 Subject: [PATCH 323/362] catch cases for search page --- .../container/communitiesResultsContainer.js | 51 ++++++++++--------- .../container/peopleResultsContainer.js | 15 ++++-- .../container/topicsResultsContainer.js | 28 +++++++--- 3 files changed, 59 insertions(+), 35 deletions(-) diff --git a/src/screens/searchResult/screen/tabs/communities/container/communitiesResultsContainer.js b/src/screens/searchResult/screen/tabs/communities/container/communitiesResultsContainer.js index 8ae75283a..713b2eab0 100644 --- a/src/screens/searchResult/screen/tabs/communities/container/communitiesResultsContainer.js +++ b/src/screens/searchResult/screen/tabs/communities/container/communitiesResultsContainer.js @@ -45,17 +45,29 @@ const CommunitiesResultsContainer = ({ children, navigation, searchValue }) => { setData([]); setNoResult(false); - getCommunities('', searchValue ? 100 : 20, searchValue, 'rank').then((communities) => { - if (currentAccount && currentAccount.username) { - getSubscriptions(currentAccount.username).then((subs) => { - communities.forEach((community) => - Object.assign(community, { - isSubscribed: subs.some( - (subscribedCommunity) => subscribedCommunity[0] === community.name, - ), - }), - ); - + getCommunities('', searchValue ? 100 : 20, searchValue, 'rank') + .then((communities) => { + if (currentAccount && currentAccount.username) { + getSubscriptions(currentAccount.username).then((subs) => { + if (subs) { + communities.forEach((community) => + Object.assign(community, { + isSubscribed: subs.some( + (subscribedCommunity) => subscribedCommunity[0] === community.name, + ), + }), + ); + } + if (searchValue) { + setData(communities); + } else { + setData(shuffle(communities)); + } + if (communities.length === 0) { + setNoResult(true); + } + }); + } else { if (searchValue) { setData(communities); } else { @@ -65,19 +77,12 @@ const CommunitiesResultsContainer = ({ children, navigation, searchValue }) => { if (communities.length === 0) { setNoResult(true); } - }); - } else { - if (searchValue) { - setData(communities); - } else { - setData(shuffle(communities)); } - - if (communities.length === 0) { - setNoResult(true); - } - } - }); + }) + .catch((err) => { + setNoResult(true); + setData([]); + }); }, [searchValue]); useEffect(() => { diff --git a/src/screens/searchResult/screen/tabs/people/container/peopleResultsContainer.js b/src/screens/searchResult/screen/tabs/people/container/peopleResultsContainer.js index cfa4a08cb..ebd6f45b3 100644 --- a/src/screens/searchResult/screen/tabs/people/container/peopleResultsContainer.js +++ b/src/screens/searchResult/screen/tabs/people/container/peopleResultsContainer.js @@ -16,12 +16,17 @@ const PeopleResultsContainer = (props) => { setNoResult(false); setUsers([]); - searchAccount(searchValue, 20, searchValue ? 0 : 1).then((res) => { - if (res.length === 0) { + searchAccount(searchValue, 20, searchValue ? 0 : 1) + .then((res) => { + if (res && res.length === 0) { + setNoResult(true); + } + setUsers(res); + }) + .catch((err) => { setNoResult(true); - } - setUsers(res); - }); + setUsers([]); + }); }, [searchValue]); // Component Functions diff --git a/src/screens/searchResult/screen/tabs/topics/container/topicsResultsContainer.js b/src/screens/searchResult/screen/tabs/topics/container/topicsResultsContainer.js index 65bf9e180..cf8170453 100644 --- a/src/screens/searchResult/screen/tabs/topics/container/topicsResultsContainer.js +++ b/src/screens/searchResult/screen/tabs/topics/container/topicsResultsContainer.js @@ -19,15 +19,29 @@ const OtherResultContainer = (props) => { setNoResult(false); setTags([]); - searchTag(searchValue.trim(), 20).then((res) => { - if (res.length === 0) { + searchTag(searchValue.trim(), 20) + .then((res) => { + if (res && res.length === 0) { + setNoResult(true); + } + setTags(res); + }) + .catch((err) => { setNoResult(true); - } - setTags(res); - }); + setTags([]); + }); } else { - setNoResult(true); - setTags([]); + searchTag(searchValue.trim(), 20, 1) + .then((res) => { + if (res && res.length === 0) { + setNoResult(true); + } + setTags(res); + }) + .catch((err) => { + setNoResult(true); + setTags([]); + }); } }, [searchValue]); From eb3904698f57ff1c96163da4570b8ad13d59b427 Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 25 Jan 2021 11:03:00 +0200 Subject: [PATCH 324/362] posts search improvements --- .../best/container/postsResultsContainer.js | 42 ++++++++++++++----- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/src/screens/searchResult/screen/tabs/best/container/postsResultsContainer.js b/src/screens/searchResult/screen/tabs/best/container/postsResultsContainer.js index 8860d58c9..a5f538df4 100644 --- a/src/screens/searchResult/screen/tabs/best/container/postsResultsContainer.js +++ b/src/screens/searchResult/screen/tabs/best/container/postsResultsContainer.js @@ -21,20 +21,40 @@ const PostsResultsContainer = ({ children, navigation, searchValue }) => { setData([]); if (searchValue) { - search({ q: `${searchValue} type:post`, sort }).then((res) => { - setScrollId(res.scroll_id); - setData(res.results); - if (res.results.length === 0) { + search({ q: `${searchValue} type:post`, sort }) + .then((res) => { + if (res) { + setScrollId(res.scroll_id); + setData(res.results); + if (res.results.length === 0) { + setNoResult(true); + } + } else { + setNoResult(true); + setData([]); + } + }) + .catch((err) => { setNoResult(true); - } - }); + setData([]); + }); } else { - getInitialPosts().then((res) => { - if (res.length === 0) { + getInitialPosts() + .then((res) => { + if (res) { + if (res.length === 0) { + setNoResult(true); + } + setData(res); + } else { + setNoResult(true); + setData([]); + } + }) + .catch((err) => { setNoResult(true); - } - setData(res); - }); + setData([]); + }); } }, [searchValue]); From 6b9c3d6216269157f56f1ee6f21e76ababbe03d2 Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 25 Jan 2021 13:23:19 +0200 Subject: [PATCH 325/362] highlighter, thumbnail and simplified checks --- package.json | 1 + .../screen/tabs/best/view/postsResults.js | 43 +++++++++++++++---- .../tabs/best/view/postsResultsStyles.js | 15 +++++-- yarn.lock | 15 ++++++- 4 files changed, 61 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 1e42ab03b..b02057522 100644 --- a/package.json +++ b/package.json @@ -74,6 +74,7 @@ "react-native-extended-stylesheet": "^0.10.0", "react-native-fast-image": "^8.3.2", "react-native-gesture-handler": "^1.4.1", + "react-native-highlight-words": "^1.0.1", "react-native-iap": "3.4.15", "react-native-image-crop-picker": "^0.35.2", "react-native-image-size": "^1.1.3", diff --git a/src/screens/searchResult/screen/tabs/best/view/postsResults.js b/src/screens/searchResult/screen/tabs/best/view/postsResults.js index 9045546b6..fef8d2bf1 100644 --- a/src/screens/searchResult/screen/tabs/best/view/postsResults.js +++ b/src/screens/searchResult/screen/tabs/best/view/postsResults.js @@ -1,9 +1,10 @@ -import React from 'react'; -import { SafeAreaView, FlatList, View, Text, TouchableOpacity } from 'react-native'; +import React, { useState } from 'react'; +import { SafeAreaView, FlatList, View, Text, TouchableOpacity, Dimensions } from 'react-native'; import get from 'lodash/get'; import isUndefined from 'lodash/isUndefined'; import FastImage from 'react-native-fast-image'; import { useIntl } from 'react-intl'; +import Highlighter from 'react-native-highlight-words'; // Components import { PostHeaderDescription, FilterBar } from '../../../../../../components'; @@ -19,15 +20,26 @@ import { getTimeFromNow } from '../../../../../../utils/time'; import styles from './postsResultsStyles'; import DEFAULT_IMAGE from '../../../../../../assets/no_image.png'; +import ProgressiveImage from '../../../../../../components/progressiveImage'; + +const dim = Dimensions.get('window'); const filterOptions = ['relevance', 'popularity', 'newest']; const PostsResults = ({ navigation, searchValue }) => { const intl = useIntl(); + const [calcImgHeight, setCalcImgHeight] = useState(300); const _renderItem = (item, index) => { const reputation = get(item, 'author_rep', undefined) || get(item, 'author_reputation', undefined); + //console.log(item); + const image = get(item, 'img_url', undefined) || get(item, 'image', undefined); + const thumbnail = + get(item, 'thumbnail', undefined) || + `https://images.ecency.com/6x5/${get(item, 'img_url', undefined)}`; + const votes = get(item, 'up_votes', 0) || get(item, 'stats.total_votes', 0); + const body = get(item, 'summary', '') || get(item, 'body_marked', ''); return ( @@ -36,15 +48,28 @@ const PostsResults = ({ navigation, searchValue }) => { name={get(item, 'author')} reputation={Math.floor(reputation)} size={36} - tag={item.category} + content={item} /> - + {image && ( + + )} {item.title} - {!!item.body && ( - - {item.body} - + {!!body && ( + /g, '').replace(/<\/mark>/g, '')} + style={styles.summary} + numberOfLines={2} + /> )} @@ -56,7 +81,7 @@ const PostsResults = ({ navigation, searchValue }) => { textStyle={styles.postIconText} iconStyle={styles.postIcon} iconType="MaterialCommunityIcons" - text={get(item, 'up_votes', 0)} + text={votes} /> Date: Mon, 25 Jan 2021 14:48:08 +0200 Subject: [PATCH 326/362] image url fixes --- .../screen/tabs/best/view/postsResults.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/screens/searchResult/screen/tabs/best/view/postsResults.js b/src/screens/searchResult/screen/tabs/best/view/postsResults.js index fef8d2bf1..861f760f0 100644 --- a/src/screens/searchResult/screen/tabs/best/view/postsResults.js +++ b/src/screens/searchResult/screen/tabs/best/view/postsResults.js @@ -14,13 +14,13 @@ import { EmptyScreen, } from '../../../../../../components/basicUIElements'; import PostsResultsContainer from '../container/postsResultsContainer'; +import ProgressiveImage from '../../../../../../components/progressiveImage'; import { getTimeFromNow } from '../../../../../../utils/time'; - import styles from './postsResultsStyles'; -import DEFAULT_IMAGE from '../../../../../../assets/no_image.png'; -import ProgressiveImage from '../../../../../../components/progressiveImage'; +const DEFAULT_IMAGE = + 'https://images.ecency.com/DQmT8R33geccEjJfzZEdsRHpP3VE8pu3peRCnQa1qukU4KR/no_image_3x.png'; const dim = Dimensions.get('window'); @@ -34,10 +34,10 @@ const PostsResults = ({ navigation, searchValue }) => { const reputation = get(item, 'author_rep', undefined) || get(item, 'author_reputation', undefined); //console.log(item); - const image = get(item, 'img_url', undefined) || get(item, 'image', undefined); + const image = get(item, 'img_url', DEFAULT_IMAGE) || get(item, 'image', DEFAULT_IMAGE); const thumbnail = - get(item, 'thumbnail', undefined) || - `https://images.ecency.com/6x5/${get(item, 'img_url', undefined)}`; + get(item, 'thumbnail', DEFAULT_IMAGE) || + `https://images.ecency.com/6x5/${get(item, 'img_url', DEFAULT_IMAGE)}`; const votes = get(item, 'up_votes', 0) || get(item, 'stats.total_votes', 0); const body = get(item, 'summary', '') || get(item, 'body_marked', ''); @@ -50,7 +50,7 @@ const PostsResults = ({ navigation, searchValue }) => { size={36} content={item} /> - {image && ( + {image && thumbnail && ( Date: Mon, 25 Jan 2021 15:14:48 +0200 Subject: [PATCH 327/362] remove search page thumbnails --- .../view/userListItem/userListItem.js | 15 ++++++++++- .../screen/tabs/best/view/postsResults.js | 26 ++----------------- .../screen/tabs/people/view/peopleResults.js | 1 + 3 files changed, 17 insertions(+), 25 deletions(-) diff --git a/src/components/basicUIElements/view/userListItem/userListItem.js b/src/components/basicUIElements/view/userListItem/userListItem.js index ae615b773..a638fde97 100644 --- a/src/components/basicUIElements/view/userListItem/userListItem.js +++ b/src/components/basicUIElements/view/userListItem/userListItem.js @@ -1,5 +1,6 @@ import React from 'react'; import { ActivityIndicator, View, Text, TouchableOpacity } from 'react-native'; +import Highlighter from 'react-native-highlight-words'; import { UserAvatar } from '../../../userAvatar'; import Tag from '../tag/tagView'; @@ -26,6 +27,7 @@ const UserListItem = ({ isFollowing = false, isLoadingRightAction = false, isLoggedIn, + searchValue, }) => { const _handleSubscribeButtonPress = () => { const _data = {}; @@ -45,7 +47,18 @@ const UserListItem = ({ {text || username} - {description && {description}} + {!!searchValue && ( + + )} + {description && !searchValue && ( + {description} + )} {middleText && ( diff --git a/src/screens/searchResult/screen/tabs/best/view/postsResults.js b/src/screens/searchResult/screen/tabs/best/view/postsResults.js index 861f760f0..b32dd1749 100644 --- a/src/screens/searchResult/screen/tabs/best/view/postsResults.js +++ b/src/screens/searchResult/screen/tabs/best/view/postsResults.js @@ -1,8 +1,7 @@ import React, { useState } from 'react'; -import { SafeAreaView, FlatList, View, Text, TouchableOpacity, Dimensions } from 'react-native'; +import { SafeAreaView, FlatList, View, Text, TouchableOpacity } from 'react-native'; import get from 'lodash/get'; import isUndefined from 'lodash/isUndefined'; -import FastImage from 'react-native-fast-image'; import { useIntl } from 'react-intl'; import Highlighter from 'react-native-highlight-words'; @@ -14,30 +13,19 @@ import { EmptyScreen, } from '../../../../../../components/basicUIElements'; import PostsResultsContainer from '../container/postsResultsContainer'; -import ProgressiveImage from '../../../../../../components/progressiveImage'; import { getTimeFromNow } from '../../../../../../utils/time'; import styles from './postsResultsStyles'; -const DEFAULT_IMAGE = - 'https://images.ecency.com/DQmT8R33geccEjJfzZEdsRHpP3VE8pu3peRCnQa1qukU4KR/no_image_3x.png'; - -const dim = Dimensions.get('window'); - const filterOptions = ['relevance', 'popularity', 'newest']; const PostsResults = ({ navigation, searchValue }) => { const intl = useIntl(); - const [calcImgHeight, setCalcImgHeight] = useState(300); const _renderItem = (item, index) => { const reputation = get(item, 'author_rep', undefined) || get(item, 'author_reputation', undefined); //console.log(item); - const image = get(item, 'img_url', DEFAULT_IMAGE) || get(item, 'image', DEFAULT_IMAGE); - const thumbnail = - get(item, 'thumbnail', DEFAULT_IMAGE) || - `https://images.ecency.com/6x5/${get(item, 'img_url', DEFAULT_IMAGE)}`; const votes = get(item, 'up_votes', 0) || get(item, 'stats.total_votes', 0); const body = get(item, 'summary', '') || get(item, 'body_marked', ''); @@ -50,16 +38,6 @@ const PostsResults = ({ navigation, searchValue }) => { size={36} content={item} /> - {image && thumbnail && ( - - )} {item.title} {!!body && ( @@ -68,7 +46,7 @@ const PostsResults = ({ navigation, searchValue }) => { searchWords={[searchValue]} textToHighlight={body.replace(//g, '').replace(/<\/mark>/g, '')} style={styles.summary} - numberOfLines={2} + numberOfLines={3} /> )} diff --git a/src/screens/searchResult/screen/tabs/people/view/peopleResults.js b/src/screens/searchResult/screen/tabs/people/view/peopleResults.js index 15330f976..5d142b0d0 100644 --- a/src/screens/searchResult/screen/tabs/people/view/peopleResults.js +++ b/src/screens/searchResult/screen/tabs/people/view/peopleResults.js @@ -40,6 +40,7 @@ const PeopleResults = ({ searchValue }) => { descriptionStyle={styles.descriptionStyle} isHasRightItem isLoggedIn + searchValue={searchValue} isLoadingRightAction={false} /> )} From 280104fe78c9fdd5fe256cab31c07f25622f85df Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 25 Jan 2021 15:24:17 +0200 Subject: [PATCH 328/362] update bugsnag library --- package.json | 2 +- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index b02057522..b734c6ccf 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "appcenter-crashes": "^3.1.0", "axios": "^0.18.0", "buffer": "^5.4.3", - "bugsnag-react-native": "^2.23.4", + "bugsnag-react-native": "^2.23.10", "core-js": "3.6.4", "crypto-js": "^3.1.9-1", "currency-symbol-map": "^4.0.4", diff --git a/yarn.lock b/yarn.lock index b6e1d1593..276dad5fa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2209,7 +2209,7 @@ buffer@^5.4.3, buffer@^5.5.0: base64-js "^1.0.2" ieee754 "^1.1.4" -bugsnag-react-native@^2.23.4: +bugsnag-react-native@^2.23.10: version "2.23.10" resolved "https://registry.yarnpkg.com/bugsnag-react-native/-/bugsnag-react-native-2.23.10.tgz#f2156f15182d1e81d076386e9bff5b02a2db5153" integrity sha512-Z47+dSitce8CpJa7rpDMP06tm3045LtIwaJ/nYtKFk+SnbL4qdPad8j4JCC65XL2P/wSOxHfMGYw1lPA4j+lWA== From c816acb3cb1723fea88841fd685a3b8e3dd694fc Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 25 Jan 2021 16:55:19 +0200 Subject: [PATCH 329/362] New translations en-US.json (Portuguese) --- src/config/locales/pt-PT.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/config/locales/pt-PT.json b/src/config/locales/pt-PT.json index 982dc4f43..074a9e872 100644 --- a/src/config/locales/pt-PT.json +++ b/src/config/locales/pt-PT.json @@ -590,9 +590,9 @@ "nothing_here": "Nada aqui" }, "beneficiary_modal": { - "percent": "Percent", - "username": "Username", - "addAccount": "Add Account", - "save": "Save" + "percent": "Porcentagem", + "username": "Nome de Usuário", + "addAccount": "Adicionar Conta", + "save": "Salvar" } } From f192740338d9cda7436c0fae739a28c4eb39e64c Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 25 Jan 2021 19:36:47 +0200 Subject: [PATCH 330/362] New translations en-US.json (Hindi) --- src/config/locales/hi-IN.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/config/locales/hi-IN.json b/src/config/locales/hi-IN.json index 645f22937..7fac6e4a4 100644 --- a/src/config/locales/hi-IN.json +++ b/src/config/locales/hi-IN.json @@ -590,9 +590,9 @@ "nothing_here": "कुछ नहीं है यहां" }, "beneficiary_modal": { - "percent": "Percent", - "username": "Username", - "addAccount": "Add Account", - "save": "Save" + "percent": "प्रतिशत", + "username": "प्रयोक्ता नाम", + "addAccount": "खता जोड़ें", + "save": "रक्षित करें" } } From 2a21360e0e36b1b1b8ff4e2537c1a4e4d5e1f37d Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 25 Jan 2021 20:16:17 +0200 Subject: [PATCH 331/362] update bugsnag --- android/app/build.gradle | 5 +- ios/Ecency/AppDelegate.m | 4 +- ios/Ecency/Info.plist | 7 ++- ios/Podfile.lock | 11 ++-- package.json | 2 +- src/config/bugsnag.js | 16 +++--- yarn.lock | 121 +++++++++++++++++++++++++++++++++++---- 7 files changed, 134 insertions(+), 32 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index d4ec219d8..255229b4d 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,7 +1,7 @@ apply plugin: "com.android.application" apply plugin: 'com.google.gms.google-services' apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle" -apply plugin: 'com.bugsnag.android.gradle' +//apply plugin: 'com.bugsnag.android.gradle' import com.android.build.OutputFile @@ -232,4 +232,5 @@ task copyDownloadableDepsToLibs(type: Copy) { } apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) -apply from: "../../node_modules/react-native-vector-icons/fonts.gradle" \ No newline at end of file +apply from: "../../node_modules/react-native-vector-icons/fonts.gradle" +apply from: "../../node_modules/@bugsnag/react-native/bugsnag-react-native.gradle" \ No newline at end of file diff --git a/ios/Ecency/AppDelegate.m b/ios/Ecency/AppDelegate.m index 1a1955b85..68219b0b8 100644 --- a/ios/Ecency/AppDelegate.m +++ b/ios/Ecency/AppDelegate.m @@ -11,8 +11,8 @@ #import #import #import -#import #import +#import #import #import @@ -36,7 +36,7 @@ [AppCenterReactNative register]; [AppCenterReactNativeAnalytics registerWithInitiallyEnabled:true]; [AppCenterReactNativeCrashes registerWithAutomaticProcessing]; - [BugsnagReactNative start]; + [Bugsnag start]; RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions]; RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge moduleName:@"Ecency" diff --git a/ios/Ecency/Info.plist b/ios/Ecency/Info.plist index c55bf7b10..ef7b60443 100644 --- a/ios/Ecency/Info.plist +++ b/ios/Ecency/Info.plist @@ -2,8 +2,11 @@ - BugsnagAPIKey - 88a8a25738939a80ba49f1d5289dbc80 + bugsnag + + apiKey + 88a8a25738939a80ba49f1d5289dbc80 + CFBundleDevelopmentRegion en CFBundleDisplayName diff --git a/ios/Podfile.lock b/ios/Podfile.lock index afcb83b21..9a2ba2dea 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -18,10 +18,7 @@ PODS: - AppCenterReactNativeShared (3.1.0): - AppCenter/Core (= 3.3.1) - boost-for-react-native (1.63.0) - - BugsnagReactNative (2.23.10): - - BugsnagReactNative/Core (= 2.23.10) - - React - - BugsnagReactNative/Core (2.23.10): + - BugsnagReactNative (7.6.0): - React - BVLinearGradient (2.5.6): - React @@ -431,7 +428,7 @@ DEPENDENCIES: - appcenter-analytics (from `../node_modules/appcenter-analytics/ios`) - appcenter-core (from `../node_modules/appcenter/ios`) - appcenter-crashes (from `../node_modules/appcenter-crashes/ios`) - - BugsnagReactNative (from `../node_modules/bugsnag-react-native`) + - "BugsnagReactNative (from `../node_modules/@bugsnag/react-native`)" - BVLinearGradient (from `../node_modules/react-native-linear-gradient`) - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) @@ -524,7 +521,7 @@ EXTERNAL SOURCES: appcenter-crashes: :path: "../node_modules/appcenter-crashes/ios" BugsnagReactNative: - :path: "../node_modules/bugsnag-react-native" + :path: "../node_modules/@bugsnag/react-native" BVLinearGradient: :path: "../node_modules/react-native-linear-gradient" DoubleConversion: @@ -643,7 +640,7 @@ SPEC CHECKSUMS: appcenter-crashes: 10790bf670f79150f1654d79f76c10a8b4936688 AppCenterReactNativeShared: 2ec88a4ac2c52cdbc828a1f9c16244b534c84026 boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c - BugsnagReactNative: 98fb350df4bb0c94cce903023531a1a5cc11fa51 + BugsnagReactNative: 0750207f412264f772997ceac9bbad36e100b828 BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872 DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2 FBLazyVector: aaeaf388755e4f29cd74acbc9e3b8da6d807c37f diff --git a/package.json b/package.json index b734c6ccf..04a36a486 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ }, "dependencies": { "@babel/runtime": "^7.5.5", + "@bugsnag/react-native": "^7.6.0", "@ecency/render-helper": "^2.0.15", "@esteemapp/dhive": "0.15.0", "@esteemapp/react-native-autocomplete-input": "^4.2.1", @@ -51,7 +52,6 @@ "appcenter-crashes": "^3.1.0", "axios": "^0.18.0", "buffer": "^5.4.3", - "bugsnag-react-native": "^2.23.10", "core-js": "3.6.4", "crypto-js": "^3.1.9-1", "currency-symbol-map": "^4.0.4", diff --git a/src/config/bugsnag.js b/src/config/bugsnag.js index 48aeb8adf..1680fb9fc 100644 --- a/src/config/bugsnag.js +++ b/src/config/bugsnag.js @@ -1,10 +1,12 @@ -import { Client, Configuration } from 'bugsnag-react-native'; +import Bugsnag from '@bugsnag/react-native'; import Config from 'react-native-config'; -const configuration = new Configuration(); -configuration.apiKey = Config.BUGSNAG_API_KEY; -configuration.consoleBreadcrumbsEnabled = true; -configuration.notifyReleaseStages = ['beta', 'production']; +const configuration = { + apiKey: Config.BUGSNAG_API_KEY, + consoleBreadcrumbsEnabled: true, + notifyReleaseStages: ['beta', 'production'], +}; -const client = new Client(configuration); -export default client; +Bugsnag.start(configuration); + +export default Bugsnag; diff --git a/yarn.lock b/yarn.lock index 276dad5fa..d9a0e3c23 100644 --- a/yarn.lock +++ b/yarn.lock @@ -690,6 +690,95 @@ sharp "^0.23.0" universal-analytics "^0.4.20" +"@bugsnag/core@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@bugsnag/core/-/core-7.6.0.tgz#f18deb534ea5f95c1e02bdb3656e1e6605b16334" + integrity sha512-hBYAZJw4ScqoyM1jA1x/m2e4iS2EqYEs0I2hdzBCZFv2ls17ILmU58eRSyVdUfyzbv0J7Hi6DwwBGC4Yb6ROZA== + dependencies: + "@bugsnag/cuid" "^3.0.0" + "@bugsnag/safe-json-stringify" "^6.0.0" + error-stack-parser "^2.0.3" + iserror "0.0.2" + stack-generator "^2.0.3" + +"@bugsnag/cuid@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@bugsnag/cuid/-/cuid-3.0.0.tgz#2ee7642a30aee6dc86f5e7f824653741e42e5c35" + integrity sha512-LOt8aaBI+KvOQGneBtpuCz3YqzyEAehd1f3nC5yr9TIYW1+IzYKa2xWS4EiMz5pPOnRPHkyyS5t/wmSmN51Gjg== + +"@bugsnag/delivery-react-native@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@bugsnag/delivery-react-native/-/delivery-react-native-7.6.0.tgz#4f4214d32f1b3bc848cab1c08b2b6646bd15aa77" + integrity sha512-9o0Kc0kB85lqz9KpyRUTNbZH+l//qgGr/8j8otGOJn8rMbHp0ya///m9gIIM/Q9sls7gxNdKAqrH3s/kRuvC9w== + +"@bugsnag/plugin-console-breadcrumbs@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@bugsnag/plugin-console-breadcrumbs/-/plugin-console-breadcrumbs-7.6.0.tgz#c497ab92faafb1e1e06b7937250f93d0c44bb5de" + integrity sha512-5GtRRrfgUTARQl2lwDmtWemhKpm6ybCrCrlSuYPenBsBkWLAZ5eI0CPFfcGysbbrjzVvstVluVzQoUGWOA8YPg== + +"@bugsnag/plugin-network-breadcrumbs@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@bugsnag/plugin-network-breadcrumbs/-/plugin-network-breadcrumbs-7.6.0.tgz#85c7ea203a7ab2e94041ecd7631cb1df68936781" + integrity sha512-arbia/1PYlzR9y8sjhxSCmMtd8MOw7Q3EPIhDJUcQ7FYcTQgMZgv7b+1zOkX1uPEPuwuQGFLj8PVfAXQ3K5qeA== + +"@bugsnag/plugin-react-native-client-sync@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@bugsnag/plugin-react-native-client-sync/-/plugin-react-native-client-sync-7.6.0.tgz#b5278105c48f311904cfa45c99757ea70ffaa2ce" + integrity sha512-AyCxDG9uax4O6InhC0pt6ytG7FAeywGXlKATMqTJvK0ahIPg9um57EPsvOIhY8cxSKQtVABCvwDB4qA2evCc+w== + +"@bugsnag/plugin-react-native-event-sync@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@bugsnag/plugin-react-native-event-sync/-/plugin-react-native-event-sync-7.6.0.tgz#1a71ca61e37f49b6e839357036d4b079b7758490" + integrity sha512-8aqCHeNIGjwIJ69zGRS1FiqfM0OpMAPo3SF61gPvhODnPzQqjEhDFojaMSGMi2/YWMCb5augg9MXvI2sPjC2og== + +"@bugsnag/plugin-react-native-global-error-handler@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@bugsnag/plugin-react-native-global-error-handler/-/plugin-react-native-global-error-handler-7.6.0.tgz#9eb0617cc99c40a86f81759a0b02a4ece6b64414" + integrity sha512-Al5AJv/h/ZSpnMAZI2SJyPB4xH8wkkOVWKOTAOHpjzXw0aFuSA1ZDdLZDnysr2dKqm/b5NYLP9paB/Zhitk1Sg== + +"@bugsnag/plugin-react-native-hermes@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@bugsnag/plugin-react-native-hermes/-/plugin-react-native-hermes-7.6.0.tgz#1d7c0982e636600ab29c32c9fbdb95f1e31bb347" + integrity sha512-vXUuC7LzjP6NsxHs0pjjjTTXiqMSqQc/e1XwJGBZFEGd4aJx+2BIg0iY7wcpeE1FghJz36NgonL3lb2v9283dA== + +"@bugsnag/plugin-react-native-session@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@bugsnag/plugin-react-native-session/-/plugin-react-native-session-7.6.0.tgz#71dcc2c58298cba202abcaf0bffd8ef473033d00" + integrity sha512-jzJan0acUUmjW608tMxM28aj/Dv9J6+MNbEBso8pCFqT17w7rzRD0gRX7hkd5i1V3V5ZQxIjqHeZkBUSre+x6Q== + +"@bugsnag/plugin-react-native-unhandled-rejection@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@bugsnag/plugin-react-native-unhandled-rejection/-/plugin-react-native-unhandled-rejection-7.6.0.tgz#948518dade8c0ce68bf738c1d2073c09c6b7ba91" + integrity sha512-KpDy+YNXbvkqTJ1mWk8rY2QFkR7+WkW/uK5moPTdCdwegxImsjaD0mMhfOmW3s5lqn7k4D6bvUdIjml8B9+Msg== + +"@bugsnag/plugin-react@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@bugsnag/plugin-react/-/plugin-react-7.6.0.tgz#27448c03170f99a68c35ec923e75ad323c36d632" + integrity sha512-gBZy34i2MJ7RSMgoW1FPxCP2y5Ke7eMCCZZPrPW7DScA9fjMtJZAzIizziYP+Q2swwjKCWyuL3cnalpf+iz4jQ== + +"@bugsnag/react-native@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@bugsnag/react-native/-/react-native-7.6.0.tgz#13f00bb238abf44fcd5af26f32a33cf59bd6d9e3" + integrity sha512-NhXNH3cBeSVjKVBKOaWGwbYkIPZi+DrRTpF3M3oxgBnXmadfz942DqK8hj5pOfEtyoPFK7+AY7UVzQ3/47Z07g== + dependencies: + "@bugsnag/core" "^7.6.0" + "@bugsnag/delivery-react-native" "^7.6.0" + "@bugsnag/plugin-console-breadcrumbs" "^7.6.0" + "@bugsnag/plugin-network-breadcrumbs" "^7.6.0" + "@bugsnag/plugin-react" "^7.6.0" + "@bugsnag/plugin-react-native-client-sync" "^7.6.0" + "@bugsnag/plugin-react-native-event-sync" "^7.6.0" + "@bugsnag/plugin-react-native-global-error-handler" "^7.6.0" + "@bugsnag/plugin-react-native-hermes" "^7.6.0" + "@bugsnag/plugin-react-native-session" "^7.6.0" + "@bugsnag/plugin-react-native-unhandled-rejection" "^7.6.0" + iserror "^0.0.2" + +"@bugsnag/safe-json-stringify@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@bugsnag/safe-json-stringify/-/safe-json-stringify-6.0.0.tgz#22abdcd83e008c369902976730c34c150148a758" + integrity sha512-htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA== + "@cnakazawa/watch@^1.0.3": version "1.0.4" resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a" @@ -2209,15 +2298,6 @@ buffer@^5.4.3, buffer@^5.5.0: base64-js "^1.0.2" ieee754 "^1.1.4" -bugsnag-react-native@^2.23.10: - version "2.23.10" - resolved "https://registry.yarnpkg.com/bugsnag-react-native/-/bugsnag-react-native-2.23.10.tgz#f2156f15182d1e81d076386e9bff5b02a2db5153" - integrity sha512-Z47+dSitce8CpJa7rpDMP06tm3045LtIwaJ/nYtKFk+SnbL4qdPad8j4JCC65XL2P/wSOxHfMGYw1lPA4j+lWA== - dependencies: - iserror "^0.0.2" - promise "^7" - prop-types "^15.6.0" - bytebuffer@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/bytebuffer/-/bytebuffer-5.0.1.tgz#582eea4b1a873b6d020a48d58df85f0bba6cfddd" @@ -3280,6 +3360,13 @@ error-ex@^1.2.0, error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" +error-stack-parser@^2.0.3: + version "2.0.6" + resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.6.tgz#5a99a707bd7a4c58a797902d48d82803ede6aad8" + integrity sha512-d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ== + dependencies: + stackframe "^1.1.1" + errorhandler@^1.5.0: version "1.5.1" resolved "https://registry.yarnpkg.com/errorhandler/-/errorhandler-1.5.1.tgz#b9ba5d17cf90744cd1e851357a6e75bf806a9a91" @@ -4960,7 +5047,7 @@ isarray@^2.0.1: resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== -iserror@^0.0.2: +iserror@0.0.2, iserror@^0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/iserror/-/iserror-0.0.2.tgz#bd53451fe2f668b9f2402c1966787aaa2c7c0bf5" integrity sha1-vVNFH+L2aLnyQCwZZnh6qix8C/U= @@ -7350,7 +7437,7 @@ progress@^2.0.0: resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== -promise@^7, promise@^7.1.1: +promise@^7.1.1: version "7.3.1" resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg== @@ -8780,11 +8867,23 @@ sshpk@^1.7.0: safer-buffer "^2.0.2" tweetnacl "~0.14.0" +stack-generator@^2.0.3: + version "2.0.5" + resolved "https://registry.yarnpkg.com/stack-generator/-/stack-generator-2.0.5.tgz#fb00e5b4ee97de603e0773ea78ce944d81596c36" + integrity sha512-/t1ebrbHkrLrDuNMdeAcsvynWgoH/i4o8EGGfX7dEYDoTXOYVAkEpFdtshlvabzc6JlJ8Kf9YdFEoz7JkzGN9Q== + dependencies: + stackframe "^1.1.1" + stack-utils@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8" integrity sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA== +stackframe@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.2.0.tgz#52429492d63c62eb989804c11552e3d22e779303" + integrity sha512-GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA== + stacktrace-parser@0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/stacktrace-parser/-/stacktrace-parser-0.1.4.tgz#01397922e5f62ecf30845522c95c4fe1d25e7d4e" From adfd599afb28d581b540651825ec714b90220b27 Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 25 Jan 2021 20:29:17 +0200 Subject: [PATCH 332/362] add sourcemap upload --- android/app/build.gradle | 12 +++++++++++- android/build.gradle | 2 +- ios/Ecency.xcodeproj/project.pbxproj | 20 +++++++++++++++++++- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 255229b4d..d5ecd9c52 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,7 +1,7 @@ apply plugin: "com.android.application" apply plugin: 'com.google.gms.google-services' apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle" -//apply plugin: 'com.bugsnag.android.gradle' +apply plugin: 'com.bugsnag.android.gradle' import com.android.build.OutputFile @@ -197,6 +197,16 @@ android { } } + bugsnag { + variantFilter { variant -> + // disables plugin for all variants of the 'staging' productFlavor + def name = variant.name.toLowerCase() + if (name.contains("staging") || name.contains("debug")) { + enabled = false + } + } + uploadReactNativeMappings = true + } packagingOptions { pickFirst '**/armeabi-v7a/libc++_shared.so' diff --git a/android/build.gradle b/android/build.gradle index a34caeec6..e6d2b7f5f 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -30,7 +30,7 @@ buildscript { classpath('com.android.tools.build:gradle:4.0.1') classpath 'com.google.gms:google-services:4.3.3' - classpath 'com.bugsnag:bugsnag-android-gradle-plugin:4.+' + classpath 'com.bugsnag:bugsnag-android-gradle-plugin:5.+' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/ios/Ecency.xcodeproj/project.pbxproj b/ios/Ecency.xcodeproj/project.pbxproj index c74c86d75..1b5682073 100644 --- a/ios/Ecency.xcodeproj/project.pbxproj +++ b/ios/Ecency.xcodeproj/project.pbxproj @@ -454,6 +454,7 @@ 53FB8F8B28F502EE3B240FD6 /* [CP] Copy Pods Resources */, 4436D72554B718932B21C9FD /* [CP-User] [RNFB] Core Configuration */, 58C9F50524CE017800A026DD /* Embed App Extensions */, + 05BAAAEE25BF43F80072EA01 /* ShellScript */, ); buildRules = ( ); @@ -690,7 +691,24 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n"; + shellScript = "export EXTRA_PACKAGER_ARGS=\"--sourcemap-output $CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/main.jsbundle.map\"\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n"; + }; + 05BAAAEE25BF43F80072EA01 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n../node_modules/@bugsnag/react-native/bugsnag-react-native-xcode.sh\n"; }; 180EA60986CD4BBD6C799872 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; From 601a02ff48d0ac776e3c2aa7de30e4888b0c2832 Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 25 Jan 2021 20:44:15 +0200 Subject: [PATCH 333/362] android build issue? --- android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index d5ecd9c52..95d914f72 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -243,4 +243,4 @@ task copyDownloadableDepsToLibs(type: Copy) { apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) apply from: "../../node_modules/react-native-vector-icons/fonts.gradle" -apply from: "../../node_modules/@bugsnag/react-native/bugsnag-react-native.gradle" \ No newline at end of file +//apply from: "../../node_modules/@bugsnag/react-native/bugsnag-react-native.gradle" \ No newline at end of file From b0d35526ca293f29cdd35f4af7274cf1c4964a0a Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 25 Jan 2021 20:52:20 +0200 Subject: [PATCH 334/362] auto update symbol uploads --- android/app/build.gradle | 2 +- ios/Ecency.xcodeproj/project.pbxproj | 2 +- package.json | 1 + yarn.lock | 134 ++++++++++++++++++++++++++- 4 files changed, 133 insertions(+), 6 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 95d914f72..974244ce6 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -204,8 +204,8 @@ android { if (name.contains("staging") || name.contains("debug")) { enabled = false } + uploadReactNativeMappings = true } - uploadReactNativeMappings = true } packagingOptions { diff --git a/ios/Ecency.xcodeproj/project.pbxproj b/ios/Ecency.xcodeproj/project.pbxproj index 1b5682073..0d22138a1 100644 --- a/ios/Ecency.xcodeproj/project.pbxproj +++ b/ios/Ecency.xcodeproj/project.pbxproj @@ -827,7 +827,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh"; + shellScript = "export EXTRA_PACKAGER_ARGS=\"--sourcemap-output $CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/main.jsbundle.map\"\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh"; }; 777B3928177A0EE7EA1ABCF9 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; diff --git a/package.json b/package.json index 04a36a486..9b99e25d8 100644 --- a/package.json +++ b/package.json @@ -121,6 +121,7 @@ "@babel/core": "^7.6.2", "@babel/runtime": "^7.6.2", "@bam.tech/react-native-make": "^2.0.0", + "@bugsnag/source-maps": "^2.0.0", "@react-native-community/eslint-config": "^0.0.5", "babel-eslint": "^10.0.1", "babel-jest": "^24.9.0", diff --git a/yarn.lock b/yarn.lock index d9a0e3c23..843a6b888 100644 --- a/yarn.lock +++ b/yarn.lock @@ -779,6 +779,19 @@ resolved "https://registry.yarnpkg.com/@bugsnag/safe-json-stringify/-/safe-json-stringify-6.0.0.tgz#22abdcd83e008c369902976730c34c150148a758" integrity sha512-htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA== +"@bugsnag/source-maps@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@bugsnag/source-maps/-/source-maps-2.0.0.tgz#4fab86263c586ee86ef9ccfbf7a30b406d02b377" + integrity sha512-CY0Pzt9migcfOq1X/hgKKcScBs11h3lDnHNKG8DZVzIcL/J9/3B4FA9s22V6ztSjEjZL1K+tbbaNf/ia3xD86w== + dependencies: + command-line-args "^5.1.1" + command-line-usage "^6.1.0" + concat-stream "^2.0.0" + consola "^2.15.0" + form-data "^3.0.0" + glob "^7.1.6" + read-pkg-up "^7.0.1" + "@cnakazawa/watch@^1.0.3": version "1.0.4" resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a" @@ -1796,6 +1809,16 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= +array-back@^3.0.1: + version "3.1.0" + resolved "https://registry.yarnpkg.com/array-back/-/array-back-3.1.0.tgz#b8859d7a508871c9a7b2cf42f99428f65e96bfb0" + integrity sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q== + +array-back@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/array-back/-/array-back-4.0.1.tgz#9b80312935a52062e1a233a9c7abeb5481b30e90" + integrity sha512-Z/JnaVEXv+A9xabHzN43FiiiWEE7gPCRXMrVmRm00tWbjZRul1iHm7ECzlyNq1p4a4ATXz+G9FJ3GqGOkOV3fg== + array-equal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93" @@ -2619,7 +2642,7 @@ colorspace@1.0.x: color "0.8.x" text-hex "0.0.x" -combined-stream@^1.0.6, combined-stream@~1.0.6: +combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== @@ -2631,6 +2654,26 @@ command-exists@^1.2.8: resolved "https://registry.yarnpkg.com/command-exists/-/command-exists-1.2.9.tgz#c50725af3808c8ab0260fd60b01fbfa25b954f69" integrity sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w== +command-line-args@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/command-line-args/-/command-line-args-5.1.1.tgz#88e793e5bb3ceb30754a86863f0401ac92fd369a" + integrity sha512-hL/eG8lrll1Qy1ezvkant+trihbGnaKaeEjj6Scyr3DN+RC7iQ5Rz84IeLERfAWDGo0HBSNAakczwgCilDXnWg== + dependencies: + array-back "^3.0.1" + find-replace "^3.0.0" + lodash.camelcase "^4.3.0" + typical "^4.0.0" + +command-line-usage@^6.1.0: + version "6.1.1" + resolved "https://registry.yarnpkg.com/command-line-usage/-/command-line-usage-6.1.1.tgz#c908e28686108917758a49f45efb4f02f76bc03f" + integrity sha512-F59pEuAR9o1SF/bD0dQBDluhpT4jJQNWUHEuVBqpDmCUo6gPjCi+m9fCWnWZVR/oG6cMTUms4h+3NPl74wGXvA== + dependencies: + array-back "^4.0.1" + chalk "^2.4.2" + table-layout "^1.0.1" + typical "^5.2.0" + commander@^2.14.1, commander@^2.19.0, commander@^2.20.3, commander@^2.9.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" @@ -2696,6 +2739,16 @@ concat-stream@^1.6.0, concat-stream@^1.6.2: readable-stream "^2.2.2" typedarray "^0.0.6" +concat-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz#414cf5af790a48c60ab9be4527d56d5e41133cb1" + integrity sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A== + dependencies: + buffer-from "^1.0.0" + inherits "^2.0.3" + readable-stream "^3.0.2" + typedarray "^0.0.6" + concat-with-sourcemaps@*: version "1.1.0" resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e" @@ -2726,6 +2779,11 @@ connect@^3.6.5: parseurl "~1.3.3" utils-merge "1.0.1" +consola@^2.15.0: + version "2.15.0" + resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.0.tgz#40fc4eefa4d2f8ef2e2806147f056ea207fcc0e9" + integrity sha512-vlcSGgdYS26mPf7qNi+dCisbhiyDnrN1zaRbw3CSuc2wGOMEGGPsp46PdRG5gqXwgtJfjxDkxRNAgRPr1B77vQ== + console-control-strings@^1.0.0, console-control-strings@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" @@ -3015,7 +3073,7 @@ deep-diff@^0.3.5: resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-0.3.8.tgz#c01de63efb0eec9798801d40c7e0dae25b582c84" integrity sha1-wB3mPvsO7JeYgB1Ax+Da4ltYLIQ= -deep-extend@^0.6.0: +deep-extend@^0.6.0, deep-extend@~0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== @@ -4111,6 +4169,13 @@ find-parent-dir@^0.3.0: resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54" integrity sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ= +find-replace@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/find-replace/-/find-replace-3.0.0.tgz#3e7e23d3b05167a76f770c9fbd5258b0def68c38" + integrity sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ== + dependencies: + array-back "^3.0.1" + find-up@^2.0.0, find-up@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" @@ -4183,6 +4248,15 @@ forever-agent@~0.6.1: resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= +form-data@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.0.tgz#31b7e39c85f1355b7139ee0c647cf0de7f83c682" + integrity sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + form-data@~2.3.2: version "2.3.3" resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" @@ -4385,7 +4459,7 @@ glob@7.0.6: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.1.1, glob@^7.1.2, glob@^7.1.3: +glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.6: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -5913,6 +5987,11 @@ lodash._reinterpolate@^3.0.0: resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= +lodash.camelcase@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" + integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= + lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" @@ -8028,6 +8107,15 @@ read-pkg-up@^4.0.0: find-up "^3.0.0" read-pkg "^3.0.0" +read-pkg-up@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507" + integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg== + dependencies: + find-up "^4.1.0" + read-pkg "^5.2.0" + type-fest "^0.8.1" + read-pkg@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8" @@ -8069,7 +8157,7 @@ readable-stream@^2.0.1, readable-stream@^2.0.6, readable-stream@^2.2.2, readable string_decoder "~1.1.1" util-deprecate "~1.0.1" -readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: +readable-stream@^3.0.2, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== @@ -8085,6 +8173,11 @@ realpath-native@^1.1.0: dependencies: util.promisify "^1.0.0" +reduce-flatten@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/reduce-flatten/-/reduce-flatten-2.0.0.tgz#734fd84e65f375d7ca4465c69798c25c9d10ae27" + integrity sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w== + redux-devtools-extension@^2.13.5: version "2.13.8" resolved "https://registry.yarnpkg.com/redux-devtools-extension/-/redux-devtools-extension-2.13.8.tgz#37b982688626e5e4993ff87220c9bbb7cd2d96e1" @@ -9137,6 +9230,16 @@ symbol-tree@^3.2.2: resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== +table-layout@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/table-layout/-/table-layout-1.0.1.tgz#8411181ee951278ad0638aea2f779a9ce42894f9" + integrity sha512-dEquqYNJiGwY7iPfZ3wbXDI944iqanTSchrACLL2nOB+1r+h1Nzu2eH+DuPPvWvm5Ry7iAPeFlgEtP5bIp5U7Q== + dependencies: + array-back "^4.0.1" + deep-extend "~0.6.0" + typical "^5.2.0" + wordwrapjs "^4.0.0" + table@^5.2.3: version "5.4.6" resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e" @@ -9349,6 +9452,11 @@ type-fest@^0.7.1: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.7.1.tgz#8dda65feaf03ed78f0a3f9678f1869147f7c5c48" integrity sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg== +type-fest@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" + integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== + typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" @@ -9359,6 +9467,16 @@ typescript@^3.2.1: resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa" integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw== +typical@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/typical/-/typical-4.0.0.tgz#cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4" + integrity sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw== + +typical@^5.0.0, typical@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/typical/-/typical-5.2.0.tgz#4daaac4f2b5315460804f0acf6cb69c52bb93066" + integrity sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg== + ua-parser-js@^0.7.18: version "0.7.21" resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.21.tgz#853cf9ce93f642f67174273cc34565ae6f308777" @@ -9663,6 +9781,14 @@ wordwrap@^1.0.0: resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= +wordwrapjs@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/wordwrapjs/-/wordwrapjs-4.0.0.tgz#9aa9394155993476e831ba8e59fb5795ebde6800" + integrity sha512-Svqw723a3R34KvsMgpjFBYCgNOSdcW3mQFK4wIfhGQhtaFVOJmdYoXgi63ne3dTlWgatVcUc7t4HtQ/+bUVIzQ== + dependencies: + reduce-flatten "^2.0.0" + typical "^5.0.0" + wrap-ansi@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" From c2f21e584e994d53b50c71233314c40f2c8ffe7b Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 25 Jan 2021 21:00:45 +0200 Subject: [PATCH 335/362] bugsnag gradle added --- android/app/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/android/app/build.gradle b/android/app/build.gradle index 974244ce6..f920bb314 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -224,6 +224,7 @@ dependencies { implementation 'com.android.support:multidex:2.0.1' implementation project(':@react-native-community_viewpager') implementation 'com.google.firebase:firebase-analytics:17.2.3' + implementation 'com.bugsnag:bugsnag-android:5.5.0' if (enableHermes) { def hermesPath = "../../node_modules/hermes-engine/android/"; From 193407f334a6c362db4576ae99b31e72954613c3 Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 25 Jan 2021 21:14:02 +0200 Subject: [PATCH 336/362] bugsnag gradle update --- android/app/build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index f920bb314..c91260af7 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -224,7 +224,6 @@ dependencies { implementation 'com.android.support:multidex:2.0.1' implementation project(':@react-native-community_viewpager') implementation 'com.google.firebase:firebase-analytics:17.2.3' - implementation 'com.bugsnag:bugsnag-android:5.5.0' if (enableHermes) { def hermesPath = "../../node_modules/hermes-engine/android/"; @@ -244,4 +243,4 @@ task copyDownloadableDepsToLibs(type: Copy) { apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) apply from: "../../node_modules/react-native-vector-icons/fonts.gradle" -//apply from: "../../node_modules/@bugsnag/react-native/bugsnag-react-native.gradle" \ No newline at end of file +apply from: "../../node_modules/@bugsnag/react-native/bugsnag-react-native.gradle" \ No newline at end of file From 340a911acb6c3c95179ac2ea79b50f7719927e54 Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 25 Jan 2021 21:43:07 +0200 Subject: [PATCH 337/362] gradle update one more time --- android/app/build.gradle | 4 +++- .../main/java/app/esteem/mobile/android/MainApplication.java | 2 ++ android/build.gradle | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index c91260af7..6c81af71b 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -203,7 +203,9 @@ android { def name = variant.name.toLowerCase() if (name.contains("staging") || name.contains("debug")) { enabled = false - } + + uploadReactNativeMappings = true +} uploadReactNativeMappings = true } } diff --git a/android/app/src/main/java/app/esteem/mobile/android/MainApplication.java b/android/app/src/main/java/app/esteem/mobile/android/MainApplication.java index 41c7c11cb..9a8c91b45 100644 --- a/android/app/src/main/java/app/esteem/mobile/android/MainApplication.java +++ b/android/app/src/main/java/app/esteem/mobile/android/MainApplication.java @@ -9,6 +9,7 @@ import com.facebook.react.ReactNativeHost; import com.facebook.react.ReactPackage; import com.facebook.soloader.SoLoader; import androidx.multidex.MultiDexApplication; +import com.bugsnag.android.Bugsnag; //See below, Webview debugging //import android.webkit.WebView; @@ -54,6 +55,7 @@ public class MainApplication extends MultiDexApplication implements ReactApplica SoLoader.init(this, /* native exopackage */ false); // Uncomment below line to Debug Webview // WebView.setWebContentsDebuggingEnabled(true); + Bugsnag.start(this); initializeFlipper(this); // Remove this line if you don't want Flipper enabled } diff --git a/android/build.gradle b/android/build.gradle index e6d2b7f5f..10e7b23b1 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -28,6 +28,7 @@ buildscript { } dependencies { classpath('com.android.tools.build:gradle:4.0.1') + classpath("com.bugsnag:bugsnag-android-gradle-plugin:5.+") classpath 'com.google.gms:google-services:4.3.3' classpath 'com.bugsnag:bugsnag-android-gradle-plugin:5.+' From f720b296a3fc314efc666bc8f41430914510929a Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 25 Jan 2021 22:00:53 +0200 Subject: [PATCH 338/362] remove intl hook --- src/screens/searchResult/screen/tabs/best/view/postsResults.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/screens/searchResult/screen/tabs/best/view/postsResults.js b/src/screens/searchResult/screen/tabs/best/view/postsResults.js index b32dd1749..0df0da2a9 100644 --- a/src/screens/searchResult/screen/tabs/best/view/postsResults.js +++ b/src/screens/searchResult/screen/tabs/best/view/postsResults.js @@ -2,7 +2,6 @@ import React, { useState } from 'react'; import { SafeAreaView, FlatList, View, Text, TouchableOpacity } from 'react-native'; import get from 'lodash/get'; import isUndefined from 'lodash/isUndefined'; -import { useIntl } from 'react-intl'; import Highlighter from 'react-native-highlight-words'; // Components @@ -20,8 +19,6 @@ import styles from './postsResultsStyles'; const filterOptions = ['relevance', 'popularity', 'newest']; const PostsResults = ({ navigation, searchValue }) => { - const intl = useIntl(); - const _renderItem = (item, index) => { const reputation = get(item, 'author_rep', undefined) || get(item, 'author_reputation', undefined); From efbfa10ca782f475579f9fb0f76f5cfb22b13fee Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 25 Jan 2021 22:02:48 +0200 Subject: [PATCH 339/362] remove intl hook --- .../searchResult/screen/tabs/topics/view/topicsResults.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/screens/searchResult/screen/tabs/topics/view/topicsResults.js b/src/screens/searchResult/screen/tabs/topics/view/topicsResults.js index 9d831f575..797257840 100644 --- a/src/screens/searchResult/screen/tabs/topics/view/topicsResults.js +++ b/src/screens/searchResult/screen/tabs/topics/view/topicsResults.js @@ -1,6 +1,5 @@ import React from 'react'; import { SafeAreaView, FlatList, View, Text, TouchableOpacity } from 'react-native'; -import { useIntl } from 'react-intl'; // Components import { ListPlaceHolder, EmptyScreen } from '../../../../../../components/basicUIElements'; @@ -11,8 +10,6 @@ import styles from './topicsResultsStyles'; const filterOptions = ['user', 'tag']; const TopicsResults = ({ navigation, searchValue }) => { - const intl = useIntl(); - const _renderTagItem = (item, index) => ( {`#${item.tag}`} From e3f2522898456a166f05382ab1acbbd23bc6c34a Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 25 Jan 2021 22:12:35 +0200 Subject: [PATCH 340/362] android build gradle duplicate removed --- android/app/build.gradle | 4 +--- android/build.gradle | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 6c81af71b..c91260af7 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -203,9 +203,7 @@ android { def name = variant.name.toLowerCase() if (name.contains("staging") || name.contains("debug")) { enabled = false - - uploadReactNativeMappings = true -} + } uploadReactNativeMappings = true } } diff --git a/android/build.gradle b/android/build.gradle index 10e7b23b1..44ccfdb9e 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -28,8 +28,6 @@ buildscript { } dependencies { classpath('com.android.tools.build:gradle:4.0.1') - classpath("com.bugsnag:bugsnag-android-gradle-plugin:5.+") - classpath 'com.google.gms:google-services:4.3.3' classpath 'com.bugsnag:bugsnag-android-gradle-plugin:5.+' // NOTE: Do not place your application dependencies here; they belong From a6585a2cbd6ec5ec1653340f9d958a0c0ee9a616 Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 25 Jan 2021 22:46:38 +0200 Subject: [PATCH 341/362] android build gradle duplicate removed2 --- android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index c91260af7..974244ce6 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -243,4 +243,4 @@ task copyDownloadableDepsToLibs(type: Copy) { apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) apply from: "../../node_modules/react-native-vector-icons/fonts.gradle" -apply from: "../../node_modules/@bugsnag/react-native/bugsnag-react-native.gradle" \ No newline at end of file +//apply from: "../../node_modules/@bugsnag/react-native/bugsnag-react-native.gradle" \ No newline at end of file From 09fd6388312214736ba876ee7cbb2912d912ec53 Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 25 Jan 2021 23:03:20 +0200 Subject: [PATCH 342/362] fix restarting issue --- ios/Podfile.lock | 6 ++++++ package.json | 1 + src/screens/application/screen/errorBoundary.js | 5 +++-- yarn.lock | 5 +++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 9a2ba2dea..a96a4fefb 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -320,6 +320,8 @@ PODS: - React - react-native-receive-sharing-intent (1.0.4): - React + - react-native-restart (0.0.17): + - React - react-native-safe-area-context (3.1.9): - React-Core - react-native-splash-screen (3.2.0): @@ -454,6 +456,7 @@ DEPENDENCIES: - react-native-matomo-sdk (from `../node_modules/react-native-matomo-sdk`) - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)" - react-native-receive-sharing-intent (from `../node_modules/react-native-receive-sharing-intent`) + - react-native-restart (from `../node_modules/react-native-restart`) - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`) - react-native-splash-screen (from `../node_modules/react-native-splash-screen`) - react-native-version-number (from `../node_modules/react-native-version-number`) @@ -568,6 +571,8 @@ EXTERNAL SOURCES: :path: "../node_modules/@react-native-community/netinfo" react-native-receive-sharing-intent: :path: "../node_modules/react-native-receive-sharing-intent" + react-native-restart: + :path: "../node_modules/react-native-restart" react-native-safe-area-context: :path: "../node_modules/react-native-safe-area-context" react-native-splash-screen: @@ -680,6 +685,7 @@ SPEC CHECKSUMS: react-native-matomo-sdk: 025c54f92e1e26a4d0acee7c3f28cb0fc7e4729c react-native-netinfo: a53b00d949b6456913aaf507d9dba90c4008c611 react-native-receive-sharing-intent: feba0a332a07977549a85aa58b496eb44368366a + react-native-restart: d19a0f8d053d065fe64cd2baebb6487111c77149 react-native-safe-area-context: b6e0e284002381d2ff29fa4fff42b4d8282e3c94 react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865 react-native-version-number: b415bbec6a13f2df62bf978e85bc0d699462f37f diff --git a/package.json b/package.json index 9b99e25d8..d54689170 100644 --- a/package.json +++ b/package.json @@ -90,6 +90,7 @@ "react-native-qrcode-svg": "^6.0.3", "react-native-reanimated": "^1.3.0", "react-native-receive-sharing-intent": "ecency/react-native-receive-sharing-intent", + "react-native-restart": "0.0.17", "react-native-safe-area-context": "^3.1.9", "react-native-screens": "^2.9.0", "react-native-scrollable-tab-view": "ecency/react-native-scrollable-tab-view", diff --git a/src/screens/application/screen/errorBoundary.js b/src/screens/application/screen/errorBoundary.js index 9011e0389..4bc0d6c9f 100644 --- a/src/screens/application/screen/errorBoundary.js +++ b/src/screens/application/screen/errorBoundary.js @@ -1,6 +1,7 @@ import React, { Fragment } from 'react'; -import { Text, View, NativeModules, TouchableHighlight } from 'react-native'; +import { Text, View, TouchableHighlight } from 'react-native'; import { injectIntl } from 'react-intl'; +import RNRestart from 'react-native-restart'; import { Icon } from '../../../components'; @@ -43,7 +44,7 @@ class ErrorBoundary extends React.Component { id: 'alert.something_wrong_alt', })} - NativeModules.DevSettings.reload()}> + RNRestart.Restart()}> {intl.formatMessage({ diff --git a/yarn.lock b/yarn.lock index 843a6b888..57ae33028 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7863,6 +7863,11 @@ react-native-redash@^14.2.4: normalize-svg-path "^1.0.1" parse-svg-path "^0.1.2" +react-native-restart@0.0.17: + version "0.0.17" + resolved "https://registry.yarnpkg.com/react-native-restart/-/react-native-restart-0.0.17.tgz#c1f38e019d1a2114248d496698e7951e9435ba91" + integrity sha512-UwFPDssMFoyDbF2aLARIHWt5g/o0TtxCXK9WIY+0iNpkgG9qWd+n80XBwXioNCdgy39ZQ5yfJBJRwtMLDgABag== + react-native-safe-area-context@^3.1.9: version "3.1.9" resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-3.1.9.tgz#48864ea976b0fa57142a2cc523e1fd3314e7247e" From c3f4bc04356a3d767f0afc00e5445cbd343cfe3d Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 25 Jan 2021 23:26:46 +0200 Subject: [PATCH 343/362] fix gradle on appcenter#1 --- android/app/build.gradle | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 974244ce6..b436431e6 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,7 +1,7 @@ apply plugin: "com.android.application" apply plugin: 'com.google.gms.google-services' apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle" -apply plugin: 'com.bugsnag.android.gradle' +//apply plugin: 'com.bugsnag.android.gradle' import com.android.build.OutputFile @@ -218,12 +218,13 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) - implementation "com.facebook.react:react-native:+" // From node_modules + implementation 'com.facebook.react:react-native:+' // From node_modules implementation 'androidx.appcompat:appcompat:1.1.0-rc01' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02' implementation 'com.android.support:multidex:2.0.1' implementation project(':@react-native-community_viewpager') implementation 'com.google.firebase:firebase-analytics:17.2.3' + //implementation 'com.bugsnag:bugsnag-android:5.+' if (enableHermes) { def hermesPath = "../../node_modules/hermes-engine/android/"; @@ -243,4 +244,4 @@ task copyDownloadableDepsToLibs(type: Copy) { apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) apply from: "../../node_modules/react-native-vector-icons/fonts.gradle" -//apply from: "../../node_modules/@bugsnag/react-native/bugsnag-react-native.gradle" \ No newline at end of file +apply from: "../../node_modules/@bugsnag/react-native/bugsnag-react-native.gradle" \ No newline at end of file From 1dfddafea2631ff4d976576b3ad5fc0a7ff890e8 Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 25 Jan 2021 23:38:45 +0200 Subject: [PATCH 344/362] highlight user titles --- .../basicUIElements/view/userListItem/userListItem.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/components/basicUIElements/view/userListItem/userListItem.js b/src/components/basicUIElements/view/userListItem/userListItem.js index a638fde97..228bb8afb 100644 --- a/src/components/basicUIElements/view/userListItem/userListItem.js +++ b/src/components/basicUIElements/view/userListItem/userListItem.js @@ -46,7 +46,15 @@ const UserListItem = ({ {itemIndex && {itemIndex}} - {text || username} + {!searchValue && {text || username}} + {!!searchValue && ( + + )} {!!searchValue && ( Date: Mon, 25 Jan 2021 23:40:25 +0200 Subject: [PATCH 345/362] fix gradle on appcenter#2 --- android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index b436431e6..bdfdc448a 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -224,7 +224,7 @@ dependencies { implementation 'com.android.support:multidex:2.0.1' implementation project(':@react-native-community_viewpager') implementation 'com.google.firebase:firebase-analytics:17.2.3' - //implementation 'com.bugsnag:bugsnag-android:5.+' + implementation 'com.bugsnag:bugsnag-android:5.+' if (enableHermes) { def hermesPath = "../../node_modules/hermes-engine/android/"; From 703d15814e25f610f471c802baca91742a8e4e61 Mon Sep 17 00:00:00 2001 From: feruz Date: Mon, 25 Jan 2021 23:57:13 +0200 Subject: [PATCH 346/362] fix gradle on appcenter#3 --- android/app/build.gradle | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index bdfdc448a..54507ad82 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -179,6 +179,9 @@ android { // Caution! In production, you need to generate your own keystore file. // see https://facebook.github.io/react-native/docs/signed-apk-android. // signingConfig signingConfigs.release + bugsnag { + uploadReactNativeMappings = true + } minifyEnabled enableProguardInReleaseBuilds proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" } @@ -197,16 +200,6 @@ android { } } - bugsnag { - variantFilter { variant -> - // disables plugin for all variants of the 'staging' productFlavor - def name = variant.name.toLowerCase() - if (name.contains("staging") || name.contains("debug")) { - enabled = false - } - uploadReactNativeMappings = true - } - } packagingOptions { pickFirst '**/armeabi-v7a/libc++_shared.so' From a9cf2744384cbc3b997e4cdb05942597e43d7bc8 Mon Sep 17 00:00:00 2001 From: feruz Date: Tue, 26 Jan 2021 00:16:51 +0200 Subject: [PATCH 347/362] fix gradle on appcenter#4 --- android/app/build.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 54507ad82..bd5a434df 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,7 +1,7 @@ apply plugin: "com.android.application" apply plugin: 'com.google.gms.google-services' apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle" -//apply plugin: 'com.bugsnag.android.gradle' +apply plugin: 'com.bugsnag.android.gradle' import com.android.build.OutputFile @@ -179,9 +179,6 @@ android { // Caution! In production, you need to generate your own keystore file. // see https://facebook.github.io/react-native/docs/signed-apk-android. // signingConfig signingConfigs.release - bugsnag { - uploadReactNativeMappings = true - } minifyEnabled enableProguardInReleaseBuilds proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" } @@ -197,7 +194,6 @@ android { output.versionCodeOverride = versionCodes.get(abi) * 1048576 + defaultConfig.versionCode } - } } @@ -237,4 +233,8 @@ task copyDownloadableDepsToLibs(type: Copy) { apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) apply from: "../../node_modules/react-native-vector-icons/fonts.gradle" -apply from: "../../node_modules/@bugsnag/react-native/bugsnag-react-native.gradle" \ No newline at end of file +apply from: "../../node_modules/@bugsnag/react-native/bugsnag-react-native.gradle" + +bugsnag { + uploadReactNativeMappings = true +} \ No newline at end of file From b120291c8fe1205432e7e553c2bac7895943c90d Mon Sep 17 00:00:00 2001 From: feruz Date: Tue, 26 Jan 2021 09:47:25 +0200 Subject: [PATCH 348/362] fix gradle on appcenter#5 --- android/app/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index bd5a434df..f39db36fb 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -213,7 +213,6 @@ dependencies { implementation 'com.android.support:multidex:2.0.1' implementation project(':@react-native-community_viewpager') implementation 'com.google.firebase:firebase-analytics:17.2.3' - implementation 'com.bugsnag:bugsnag-android:5.+' if (enableHermes) { def hermesPath = "../../node_modules/hermes-engine/android/"; From a98ace2bc86295ff4eb9a601282f80216faa20a6 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 26 Jan 2021 12:07:06 +0200 Subject: [PATCH 349/362] New translations en-US.json (Estonian) --- src/config/locales/et-EE.json | 38 +++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/config/locales/et-EE.json b/src/config/locales/et-EE.json index 30301f6e4..a87842558 100644 --- a/src/config/locales/et-EE.json +++ b/src/config/locales/et-EE.json @@ -38,7 +38,7 @@ "post_desc": "You can earn point by posting regularly. Posting gives you upto 15 points.", "comment_desc": "Each comment you make helps you to grow your audience and also earns you upto 5 points.", "checkin_desc": "Checking in regularly gives you 0.25 points.", - "vote_desc": "By voting you give reward to other creators and also earn back upto 0.01 x vote weight points.", + "vote_desc": "Hääletades tasustate teisi loojaid ja teenite ka ise kuni 0,01 x hääle kaalupunkti.", "reblog_desc": "Share what post you like with your friends and earn points.", "login_desc": "When you login into app first time you earn 100 points.", "checkin_extra_desc": "Consistent use of app gives you extra chances to earn more points, be more active and earn more.", @@ -49,7 +49,7 @@ "to": "Kellele", "estimated_value_desc": "According to purchase value", "estimated_value": "Estimated value", - "estimated_amount": "Vote value", + "estimated_amount": "Hääle väärtus", "amount_information": "Drag the slider to adjust the amount", "amount": "Kogus", "memo": "Märge", @@ -61,16 +61,16 @@ "transfer_token": "Ülekanne", "purchase_estm": "OSTA PUNKTE", "points": "Kingi kellelegi punkte", - "transfer_to_saving": "To Saving", + "transfer_to_saving": "Hoiusesse", "powerUp": "Lisa võimsust", - "withdraw_to_saving": "Withdraw Saving", + "withdraw_to_saving": "Võta hoius välja", "steemconnect_title": "Hivesigner Transfer", "next": "EDASI", "delegate": "Delegate", "power_down": "Väljaluülitus", - "withdraw_steem": "Withdraw HIVE", - "withdraw_sbd": "Withdraw HBD", - "transfer_to_savings": "To Savings", + "withdraw_steem": "Võta välja HIVE", + "withdraw_sbd": "Võta välja HBD", + "transfer_to_savings": "Hoiusesse", "convert": "Konverteeri", "escrow_transfer": "Escrow Transfer", "escrow_dispute": "Escrow Dispute", @@ -111,7 +111,7 @@ "notification": { "vote": "hääletatud", "unvote": "hääl eemaldatud", - "reply": "replied to", + "reply": "vastas", "mention": "mainis", "follow": "hakkas sind jälgima", "unfollow": "enam ei jälgi sind", @@ -130,16 +130,16 @@ "this_week": "Sel nädalal", "this_month": "Sel kuul", "older_then": "Vanem kui kuu", - "activities": "All", + "activities": "Kõik", "replies": "Vastused", - "mentions": "Mentions", + "mentions": "Mainimised", "reblogs": "Reblogs", - "noactivity": "No recent activity" + "noactivity": "Hiljutised tegevused puuduvad" }, "leaderboard": { - "daily": "DAILY", - "weekly": "WEEKLY", - "monthly": "MONTHLY" + "daily": "PÄEV", + "weekly": "NÄDAL", + "monthly": "KUU" }, "messages": { "comingsoon": "Sõnumite funktsionaalus ei ole veel valimis!" @@ -356,7 +356,7 @@ "external_link": "Ava veebilehitsejas", "not_existing_post": "The post does not exist! Please check permlink and author.", "google_play_version": "We noticed that your device has old version of Google Play. Please update Google Play services and try again!", - "rc_down": "Not enough resource credits to perform an action! \n\nBoost your account to continue enjoy the experience. Do you want to boost your account, now?", + "rc_down": "Toimingu jaoks pole piisavalt ressursipunkte!\n\nVõimendage oma kontot, et jätkata nautimisega. Kas soovite kohe võimendada oma kontot?", "payloadTooLarge": "File size too big, please resize or upload smaller image", "qoutaExceeded": "Upload quota exceeded", "invalidImage": "Invalid image, try different file", @@ -496,7 +496,7 @@ "next": "EDASI", "account": { "title": "Võimenda kasutajat", - "desc": "30 days delegation will boost your votes and social activities and give you more actions with more Resource Credits." + "desc": "30-päevane volitus suurendab teie häält ja sotsiaalset tegevusi ning annab teile rohkem tegevusi koos rohkemate ressursipunktidega." } }, "free_estm": { @@ -518,9 +518,9 @@ "title": "Boost" }, "voters_dropdown": { - "rewards": "REWARDS", - "percent": "PERCENT", - "time": "TIME" + "rewards": "TASUD", + "percent": "PROTSENT", + "time": "AEG" }, "reblog": { "title": "Reblog Info" From be77ba174db3912203edf5afb7955b59ad341d65 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 26 Jan 2021 12:16:11 +0200 Subject: [PATCH 350/362] New translations en-US.json (Estonian) --- src/config/locales/et-EE.json | 50 +++++++++++++++++------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/config/locales/et-EE.json b/src/config/locales/et-EE.json index a87842558..ab66736f1 100644 --- a/src/config/locales/et-EE.json +++ b/src/config/locales/et-EE.json @@ -105,7 +105,7 @@ "btc": { "title": "BTC", "buy": "OSTA BTC", - "address": "RECEIVE" + "address": "VÕTA VASTU" } }, "notification": { @@ -158,18 +158,18 @@ "hours": "tundi", "voting_power": "Hääletusjõud", "login_to_see": "Nägemiseks logi sisse", - "follow_people": "Follow some people to fill your feed", - "follow_communities": "Join some communities to fill your feed", + "follow_people": "Jälgi inimesi, et täita oma voog", + "follow_communities": "Liitu kogukondadega, et täita oma voogu", "havent_commented": "ei ole veel midagi kommenteerinud", "havent_posted": "ei ole veel midagi postitanud", "steem_power": "Hive Power", "next_power_text": "Järgmise väljaluülitus on", "days": "päeva", "day": "päev", - "steem_dollars": "Hive Dollars", + "steem_dollars": "Hive Dollarid", "savings": "Säästud", "edit": { - "display_name": "Display Name", + "display_name": "Kuvatav Nimi", "about": "Teave", "location": "Asukoht", "website": "Koduleht" @@ -217,7 +217,7 @@ "signin_title": "Et saada osa kõikidest Ecency funktsioonidest", "username": "Kasutajanimi", "password": "Parool või WIF", - "description": "By signing in, you agree to our Terms of Services and Privacy Policies.", + "description": "Logides sisse, nõustute meie kasutustingimuste ja privaatsuseeskirjadega.", "cancel": "tühista", "login": "LOGI SISSE", "steemconnect_description": "If you don't want to keep your password encrypted and saved on your device, you can use Hivesigner.", @@ -252,7 +252,7 @@ "schedules": "Ajakavad", "gallery": "Galerii", "settings": "Seaded", - "communities": "Communities", + "communities": "Kogukonnad", "add_account": "Lisa konto", "logout": "Logi välja", "cancel": "Tühista", @@ -362,19 +362,19 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Midagi läks valesti.", "something_wrong_alt": "Proovi https://ecency.com", - "something_wrong_reload": "Reload", - "can_not_be_empty": "Title and body can not be empty!" + "something_wrong_reload": "Värskenda", + "can_not_be_empty": "Pealkiri ja sisu ei tohi olla tühjad!" }, "post": { "reblog_alert": "Oled sa kindel, et soovid seda jagada?", - "removed_hint": "Content is not available", - "copy_link": "Copy link", + "removed_hint": "Sisu pole kättesaadav", + "copy_link": "Kopeeri link", "reblogged": "jagatud %s poolt", "sponsored": "SPONSOREERITUD", - "open_thread": "Open thread", - "image": "Image", + "open_thread": "Ava lõim", + "image": "Pilt", "link": "Link", - "gallery_mode": "Gallery mode", + "gallery_mode": "Galerii", "save_to_local": "Download to device", "image_saved": "Image saved to Photo Gallery", "image_saved_error": "Error Saving Image", @@ -387,17 +387,17 @@ "deleted": "Draft deleted" }, "schedules": { - "title": "Schedules", - "empty_list": "Nothing here", - "deleted": "Scheduled post deleted", - "move": "Move to drafts", - "moved": "Moved to drafts" + "title": "Planeeritud", + "empty_list": "Siin pole midagi", + "deleted": "Ajastatud postitus kustutatud", + "move": "Teisalda mustanditesse", + "moved": "Teisaldatud mustanditesse" }, "bookmarks": { - "title": "Bookmarks", - "load_error": "Could not load bookmarks", - "empty_list": "Nothing here", - "deleted": "Bookmark removed", + "title": "Järjehoidjad", + "load_error": "Järjehoidjad ei saanud laadida", + "empty_list": "Siin pole midagi", + "deleted": "Järjehoidja eemaldatud", "search": "Search in bookmarks", "added": "Added to bookmarks", "add": "Add to bookmarks" @@ -476,8 +476,8 @@ "steemconnect_title": "Hivesigner Transfer", "estimated_weekly": "Estimated Weekly", "destination_accounts": "Destination Accounts", - "stop_information": "Are you sure want to stop?", - "percent": "Percent", + "stop_information": "Oled kindel, et soovid peatada?", + "percent": "Protsent", "auto_vests": "Auto Vests", "save": "SALVESTA", "percent_information": "Percent info", From 3377b58a7678102ce0f61c772b794076bd263f8c Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 26 Jan 2021 12:25:00 +0200 Subject: [PATCH 351/362] New translations en-US.json (Estonian) --- src/config/locales/et-EE.json | 46 +++++++++++++++++------------------ 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/config/locales/et-EE.json b/src/config/locales/et-EE.json index ab66736f1..904c387d8 100644 --- a/src/config/locales/et-EE.json +++ b/src/config/locales/et-EE.json @@ -3,7 +3,7 @@ "curation_reward": "Kuraatori tasu", "author_reward": "Autoritasu", "comment_benefactor_reward": "Benefactor Reward", - "claim_reward_balance": "Claim Reward ", + "claim_reward_balance": "Lunasta tasu ", "transfer": "Ülekanne", "transfer_to_vesting": "To Vesting", "transfer_from_savings": "Hoiusest", @@ -375,16 +375,16 @@ "image": "Pilt", "link": "Link", "gallery_mode": "Galerii", - "save_to_local": "Download to device", + "save_to_local": "Lae enda seadmesse", "image_saved": "Image saved to Photo Gallery", "image_saved_error": "Error Saving Image", - "wrong_link": "Wrong link" + "wrong_link": "Vale link" }, "drafts": { - "title": "Drafts", - "load_error": "Could not load drafts", - "empty_list": "Nothing here", - "deleted": "Draft deleted" + "title": "Mustandid", + "load_error": "Mustandite laadimine ei õnnestunud", + "empty_list": "Siin pole midagi", + "deleted": "Mustand kustutatud" }, "schedules": { "title": "Planeeritud", @@ -406,10 +406,10 @@ "added": "Reported objectionable content" }, "favorites": { - "title": "Favorites", - "load_error": "Could not load favorites", + "title": "Lemmikud", + "load_error": "Lemmikute laadimine ebaõnnestus", "empty_list": "Nothing here", - "search": "Search in favorites" + "search": "Otsi lemmikute hulgast" }, "auth": { "invalid_pin": "Invalid pin code, please check and try again", @@ -467,12 +467,12 @@ "to_placeholder": "Kasutajanimi", "memo_placeholder": "Jäta oma märkmed siia", "transfer_token": "Ülekanne", - "purchase_estm": "Purchase Points", - "convert": "Convert HBD to HIVE", + "purchase_estm": "Osta punkte", + "convert": "Vaheta HBD HIVEks", "points": "Gift Points to someone", "transfer_to_saving": "Kanna säästudesse", "powerUp": "Lisa võimsust", - "withdraw_to_saving": "Withdraw To Saving", + "withdraw_to_saving": "Liiguta hoiusesse", "steemconnect_title": "Hivesigner Transfer", "estimated_weekly": "Estimated Weekly", "destination_accounts": "Destination Accounts", @@ -480,9 +480,9 @@ "percent": "Protsent", "auto_vests": "Auto Vests", "save": "SALVESTA", - "percent_information": "Percent info", + "percent_information": "Protsendi info", "next": "EDASI", - "delegate": "Delegate", + "delegate": "Volita", "power_down": "Power Down", "withdraw_steem": "Võta HIVE välja", "withdraw_sbd": "Võta HIVE Dollar välja", @@ -500,17 +500,17 @@ } }, "free_estm": { - "title": "Free Points", - "button": "SPIN & WIN", - "get_spin": "5 SPINS", - "spin_right": "Spin Left", - "timer_text": "Next free spin in" + "title": "Tasuta punktid", + "button": "KEERUTA & VÕIDA", + "get_spin": "5 KEERUTUST", + "spin_right": "Keerutust järgi", + "timer_text": "Järgmine tasuta keerutus" }, "promote": { "title": "Promote", - "days": "days", - "user": "User", - "permlink": "Post", + "days": "päeva", + "user": "Kasutaja", + "permlink": "Postita", "permlinkPlaceholder": "username/permlink", "information": "Are you sure to promote?" }, From ffdc4ce12755f8c5472695423c6117a48f235a2d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 26 Jan 2021 12:46:23 +0200 Subject: [PATCH 352/362] New translations en-US.json (Estonian) --- src/config/locales/et-EE.json | 118 +++++++++++++++++----------------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/src/config/locales/et-EE.json b/src/config/locales/et-EE.json index 904c387d8..1e3d50b06 100644 --- a/src/config/locales/et-EE.json +++ b/src/config/locales/et-EE.json @@ -5,7 +5,7 @@ "comment_benefactor_reward": "Benefactor Reward", "claim_reward_balance": "Lunasta tasu ", "transfer": "Ülekanne", - "transfer_to_vesting": "To Vesting", + "transfer_to_vesting": "Teenimisse", "transfer_from_savings": "Hoiusest", "withdraw_vesting": "Väljaluülitus", "fill_order": "Täida Tellimus", @@ -13,7 +13,7 @@ "comment": "Kommenteeri", "checkin": "Kasutus", "vote": "Hääleta", - "reblog": "Taaspostita", + "reblog": "Jaga", "login": "Sisselogimine", "incoming_transfer_title": "Saabuv ülekanne", "outgoing_transfer_title": "Väljuv ülekanne", @@ -21,25 +21,25 @@ "delegation": "Volitus", "delegations": "Volitused", "delegation_title": "Volitustasu", - "delegation_desc": "Earn Points everyday for delegation", + "delegation_desc": "Teeni punkte igapäevaselt volitamisega", "post_title": "Punktid postitustest", "comment_title": "Punktid kommentaaridest", "vote_title": "Punktid hääletustest", - "reblog_title": "Punktid taaspostitustest", + "reblog_title": "Punktid jagamise eest", "login_title": "Punktid sisselogimisest", "checkin_title": "Punktid sisse logimise eest", "referral": "Soovitaja", - "referral_title": "Referral rewards", - "referral_desc": "Invite friends and earn Points", + "referral_title": "Soovitaja tasu", + "referral_desc": "Kutsu sõbrad ja kogu punkte", "checkin_extra_title": "Kasutusboonus", - "no_activity": "No recent activity", + "no_activity": "Hiljutised tegevused puuduvad", "outgoing_transfer_description": "", "incoming_transfer_description": "", "post_desc": "You can earn point by posting regularly. Posting gives you upto 15 points.", "comment_desc": "Each comment you make helps you to grow your audience and also earns you upto 5 points.", "checkin_desc": "Checking in regularly gives you 0.25 points.", "vote_desc": "Hääletades tasustate teisi loojaid ja teenite ka ise kuni 0,01 x hääle kaalupunkti.", - "reblog_desc": "Share what post you like with your friends and earn points.", + "reblog_desc": "Jaga meeldivat postitust enda sõpradega ning teeni punkte.", "login_desc": "When you login into app first time you earn 100 points.", "checkin_extra_desc": "Consistent use of app gives you extra chances to earn more points, be more active and earn more.", "dropdown_transfer": "Kingi", @@ -66,21 +66,21 @@ "withdraw_to_saving": "Võta hoius välja", "steemconnect_title": "Hivesigner Transfer", "next": "EDASI", - "delegate": "Delegate", + "delegate": "Volita", "power_down": "Väljaluülitus", "withdraw_steem": "Võta välja HIVE", "withdraw_sbd": "Võta välja HBD", "transfer_to_savings": "Hoiusesse", "convert": "Konverteeri", - "escrow_transfer": "Escrow Transfer", - "escrow_dispute": "Escrow Dispute", - "escrow_release": "Escrow Release", - "escrow_approve": "Escrow Approve", - "cancel_transfer_from_savings": "Cancel From Savings", + "escrow_transfer": "Deposiidi ülekanne", + "escrow_dispute": "Deposiidi Vaidlustamine", + "escrow_release": "Deposiidi Vabastamine", + "escrow_approve": "Deposiidi Kinnitamine", + "cancel_transfer_from_savings": "Tühista ülekanne Hoiusest", "delegate_vesting_shares": "Volitus", - "fill_convert_request": "Convert Executed", - "fill_transfer_from_savings": "Savings Executed", - "fill_vesting_withdraw": "PowerDown executed", + "fill_convert_request": "Vahetamine alustatud", + "fill_transfer_from_savings": "Hoius alustatud", + "fill_vesting_withdraw": "PowerDown alustatud", "estm": { "title": "Punktid", "buy": "OSTA PUNKTE" @@ -133,7 +133,7 @@ "activities": "Kõik", "replies": "Vastused", "mentions": "Mainimised", - "reblogs": "Reblogs", + "reblogs": "Jagatud", "noactivity": "Hiljutised tegevused puuduvad" }, "leaderboard": { @@ -188,7 +188,7 @@ "vote": "Hääleta", "comment": "Kommenteeri", "mention": "Maini", - "reblog": "Taaspostita", + "reblog": "Jaha", "transfers": "Ülekanded" }, "pincode": "Pincode", @@ -415,18 +415,18 @@ "invalid_pin": "Invalid pin code, please check and try again", "invalid_username": "Invalid username, please check and try again", "already_logged": "You are already logged in, please try to add another account", - "invalid_credentials": "Invalid credentials, please check and try again", - "unknow_error": "Unknown error, please write to support@ecency.com" + "invalid_credentials": "Vigased andmed, palun kontrolli ja proovi uuesti", + "unknow_error": "Tundmatu viga, palun kirjuta meile support@ecency.com" }, "payout": { - "potential_payout": "Potential Payout", - "promoted": "Promoted", - "author_payout": "Author Payout", - "curation_payout": "Curation Payout", + "potential_payout": "Potentsiaalne Väljamakse", + "promoted": "Sponsitud", + "author_payout": "Autoritasu", + "curation_payout": "Hääletajate tasu", "payout_date": "Väljamakse", "beneficiaries": "Kasusaajad", "warn_zero_payout": "Kogus peab väljamakseks olema vähemalt $0.02", - "breakdown": "Breakdown" + "breakdown": "Analüüs" }, "post_dropdown": { "copy": "kopeeri link", @@ -457,28 +457,28 @@ "transfer": { "from": "Kellelt", "to": "Kellele", - "amount_information": "Drag the slider to adjust the amount", + "amount_information": "Koguse muutmiseks liiguta liugurit", "amount": "Kogus", "memo": "Märge", "information": "Oled kindel, et soovid raha üle kanda?", "amount_desc": "Saldo", "memo_desc": "See märge on avalik", - "convert_desc": "Convert takes 3.5 days and NOT recommended IF HBD price is higher than $1", + "convert_desc": "Vahetamine võtab 3,5 päeva ja pole soovitatav kui HBD hind on kõrgem kui $1", "to_placeholder": "Kasutajanimi", "memo_placeholder": "Jäta oma märkmed siia", "transfer_token": "Ülekanne", "purchase_estm": "Osta punkte", "convert": "Vaheta HBD HIVEks", - "points": "Gift Points to someone", + "points": "Kingi kellelegi punkte", "transfer_to_saving": "Kanna säästudesse", "powerUp": "Lisa võimsust", "withdraw_to_saving": "Liiguta hoiusesse", - "steemconnect_title": "Hivesigner Transfer", - "estimated_weekly": "Estimated Weekly", - "destination_accounts": "Destination Accounts", + "steemconnect_title": "Hivesigneri ülekanne", + "estimated_weekly": "Prognoositud nädalane", + "destination_accounts": "Saaja Kontod", "stop_information": "Oled kindel, et soovid peatada?", "percent": "Protsent", - "auto_vests": "Auto Vests", + "auto_vests": "Automaatne Tulu", "save": "SALVESTA", "percent_information": "Protsendi info", "next": "EDASI", @@ -507,15 +507,15 @@ "timer_text": "Järgmine tasuta keerutus" }, "promote": { - "title": "Promote", + "title": "Reklaami", "days": "päeva", "user": "Kasutaja", "permlink": "Postita", - "permlinkPlaceholder": "username/permlink", - "information": "Are you sure to promote?" + "permlinkPlaceholder": "kasutajanimi/permlink", + "information": "Olete kindel, et soovite reklaamida?" }, "boostPost": { - "title": "Boost" + "title": "Võimenda" }, "voters_dropdown": { "rewards": "TASUD", @@ -523,37 +523,37 @@ "time": "AEG" }, "reblog": { - "title": "Reblog Info" + "title": "Jaga infot" }, "dsteem": { "date_error": { - "device_time": "Your device time;", - "current_time": "Current time;", - "information": "We noticed that your device has incorrect date or time. Please fix Date & Time or Set Automatically and try again." + "device_time": "Seadme kellaaeg;", + "current_time": "Praegune kellaaeg;", + "information": "Märkasime, et teie seadme kellaaeg ja kuupäev on vale. Muuda kellaaeg ja kuupäev või säti automaatseks ning proovi siis uuesti." } }, "comments": { "title": "Kommentaarid", - "reveal_comment": "Reveal comment", - "read_more": "Read more comments", - "more_replies": "more replies" + "reveal_comment": "Näita kommentaari", + "read_more": "Näita rohkem kommentaare", + "more_replies": "rohkem vastuseid" }, "search_result": { - "others": "Others", + "others": "Muud", "best": { - "title": "Best" + "title": "Parimad" }, "people": { - "title": "People" + "title": "Inimesed" }, "topics": { - "title": "Topics" + "title": "Teemad" }, "communities": { - "title": "Groups", - "subscribe": "Join", - "unsubscribe": "Leave", - "subscribers": "Members", + "title": "Grupid", + "subscribe": "Liitu", + "unsubscribe": "Lahku", + "subscribers": "Liikmed", "posters": "Postitajad", "posts": "Post" }, @@ -583,16 +583,16 @@ "unfollow": "Lõpeta jälgimine" }, "communities": { - "joined": "Membership", - "discover": "Discover" + "joined": "Liikmelisus", + "discover": "Avasta" }, "empty_screen": { - "nothing_here": "Nothing here" + "nothing_here": "Siin pole midagi" }, "beneficiary_modal": { - "percent": "Percent", - "username": "Username", - "addAccount": "Add Account", - "save": "Save" + "percent": "Protsent", + "username": "Kasutajanimi", + "addAccount": "Lisa konto", + "save": "Salvesta" } } From 49d4d46e9da4a4ac7af031da926a26030f0c615d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 26 Jan 2021 12:57:46 +0200 Subject: [PATCH 353/362] New translations en-US.json (Estonian) --- src/config/locales/et-EE.json | 54 +++++++++++++++++------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/src/config/locales/et-EE.json b/src/config/locales/et-EE.json index 1e3d50b06..e7d563325 100644 --- a/src/config/locales/et-EE.json +++ b/src/config/locales/et-EE.json @@ -2,7 +2,7 @@ "wallet": { "curation_reward": "Kuraatori tasu", "author_reward": "Autoritasu", - "comment_benefactor_reward": "Benefactor Reward", + "comment_benefactor_reward": "Kasusaaja tasu", "claim_reward_balance": "Lunasta tasu ", "transfer": "Ülekanne", "transfer_to_vesting": "Teenimisse", @@ -35,12 +35,12 @@ "no_activity": "Hiljutised tegevused puuduvad", "outgoing_transfer_description": "", "incoming_transfer_description": "", - "post_desc": "You can earn point by posting regularly. Posting gives you upto 15 points.", + "post_desc": "Teeni punkte regulaarselt postitamisega. Postitamine annab kuni 15 punkti.", "comment_desc": "Each comment you make helps you to grow your audience and also earns you upto 5 points.", - "checkin_desc": "Checking in regularly gives you 0.25 points.", + "checkin_desc": "Regulaarselt sisse logides saad 0,25 punkti.", "vote_desc": "Hääletades tasustate teisi loojaid ja teenite ka ise kuni 0,01 x hääle kaalupunkti.", "reblog_desc": "Jaga meeldivat postitust enda sõpradega ning teeni punkte.", - "login_desc": "When you login into app first time you earn 100 points.", + "login_desc": "Esimest korda rakendusse sisse logides teenid 100 punkti.", "checkin_extra_desc": "Consistent use of app gives you extra chances to earn more points, be more active and earn more.", "dropdown_transfer": "Kingi", "dropdown_promote": "Reklaami", @@ -48,9 +48,9 @@ "from": "Kellelt", "to": "Kellele", "estimated_value_desc": "According to purchase value", - "estimated_value": "Estimated value", + "estimated_value": "Hinnanguline väärtus", "estimated_amount": "Hääle väärtus", - "amount_information": "Drag the slider to adjust the amount", + "amount_information": "Koguse muutmiseks liiguta liugurit", "amount": "Kogus", "memo": "Märge", "information": "Oled kindel, et soovid raha üle kanda?", @@ -64,7 +64,7 @@ "transfer_to_saving": "Hoiusesse", "powerUp": "Lisa võimsust", "withdraw_to_saving": "Võta hoius välja", - "steemconnect_title": "Hivesigner Transfer", + "steemconnect_title": "Hivesigneri ülekanne", "next": "EDASI", "delegate": "Volita", "power_down": "Väljaluülitus", @@ -299,7 +299,7 @@ "my_blog": "Minu blogi", "my_communities": "Minu kogukonnad", "top_communities": "Top kogukonnad", - "schedule_modal_title": "Schedule Post" + "schedule_modal_title": "Ajasta postitus" }, "pincode": { "enter_text": "Enter pin to unlock", @@ -318,8 +318,8 @@ "success_shared": "Valmis! Sisu esitatud!", "success_moved": "Teisaldatud mustanditesse", "permission_denied": "Juurdepääs keelatud", - "permission_text": "Please, go to phone Settings and change Ecency app permissions.", - "key_warning": "Operation requires active key or master password, please relogin!", + "permission_text": "Palun mine telefoniSeadetesse ning muuda Ecency rakenduse õiguseid.", + "key_warning": "Tegevus nõuab aktiivset võtit või master parooli, palun sisene uuesti!", "success_rebloged": "Rebloged!", "already_rebloged": "Sa oled seda juba jaganud!", "success_favorite": "Lisatud lemmikuks!", @@ -337,8 +337,8 @@ "warning": "Hoiatus", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", - "clear_alert": "Are you sure you want to clear?", - "clear_user_alert": "Are you sure you want to clear all user data?", + "clear_alert": "Kas soovid tõesti selle tühjendada?", + "clear_user_alert": "Oled kindel, et soovid puhastada kõik kasutajaandmed?", "clear": "Tühjenda", "cancel": "Tühista", "delete": "Kustuta", @@ -349,17 +349,17 @@ "same_user": "See konto on juba nimekirja lisatud", "unknow_error": "Ilmnes tõrge", "error": "Tõrge", - "fetch_error": "Connection issue, change server and restart", + "fetch_error": "Ühenduse viga, muuda serverit ja taaskäivita rakendus", "connection_fail": "Ühendus nurjus!", "connection_success": "Edukalt ühendatud!", "checking": "Kontrollin...", "external_link": "Ava veebilehitsejas", - "not_existing_post": "The post does not exist! Please check permlink and author.", - "google_play_version": "We noticed that your device has old version of Google Play. Please update Google Play services and try again!", + "not_existing_post": "Seda postitust ei eksisteeri! Palun kontrolli linki ja autorit.", + "google_play_version": "Märkasime, et teie seadmes on Google Play vanem versioon. Palun uuenda Google Play services ja proovi uuesti!", "rc_down": "Toimingu jaoks pole piisavalt ressursipunkte!\n\nVõimendage oma kontot, et jätkata nautimisega. Kas soovite kohe võimendada oma kontot?", - "payloadTooLarge": "File size too big, please resize or upload smaller image", - "qoutaExceeded": "Upload quota exceeded", - "invalidImage": "Invalid image, try different file", + "payloadTooLarge": "Fail liiga suur, palun vähenda suurust või lae üles väiksem pilt", + "qoutaExceeded": "Üleslaadimise limiit ületatud", + "invalidImage": "Pilt ei sobi, proovi teist faili", "something_wrong": "Midagi läks valesti.", "something_wrong_alt": "Proovi https://ecency.com", "something_wrong_reload": "Värskenda", @@ -376,8 +376,8 @@ "link": "Link", "gallery_mode": "Galerii", "save_to_local": "Lae enda seadmesse", - "image_saved": "Image saved to Photo Gallery", - "image_saved_error": "Error Saving Image", + "image_saved": "Pilt salvestatud Galeriisse", + "image_saved_error": "Pildi salvestamine ebaõnnestus", "wrong_link": "Vale link" }, "drafts": { @@ -398,23 +398,23 @@ "load_error": "Järjehoidjad ei saanud laadida", "empty_list": "Siin pole midagi", "deleted": "Järjehoidja eemaldatud", - "search": "Search in bookmarks", - "added": "Added to bookmarks", - "add": "Add to bookmarks" + "search": "Otsi järjehoidjatest", + "added": "Lisatud järjehoidjatesse", + "add": "Lisa järjehoidjatesse" }, "report": { - "added": "Reported objectionable content" + "added": "Teavitatud ebasobivast sisust" }, "favorites": { "title": "Lemmikud", "load_error": "Lemmikute laadimine ebaõnnestus", - "empty_list": "Nothing here", + "empty_list": "Siin pole midagi", "search": "Otsi lemmikute hulgast" }, "auth": { "invalid_pin": "Invalid pin code, please check and try again", - "invalid_username": "Invalid username, please check and try again", - "already_logged": "You are already logged in, please try to add another account", + "invalid_username": "Vigane kasutajanimi, palun kontrolli üle ja proovi uuesti", + "already_logged": "Oled juba sisse logitud, palun proovi lisada teine kasutaja", "invalid_credentials": "Vigased andmed, palun kontrolli ja proovi uuesti", "unknow_error": "Tundmatu viga, palun kirjuta meile support@ecency.com" }, From c94b03940bd6274f555ad10336ecf4bc596ab9c4 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 26 Jan 2021 13:03:09 +0200 Subject: [PATCH 354/362] New translations en-US.json (Estonian) --- src/config/locales/et-EE.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/config/locales/et-EE.json b/src/config/locales/et-EE.json index e7d563325..ce85a6012 100644 --- a/src/config/locales/et-EE.json +++ b/src/config/locales/et-EE.json @@ -36,18 +36,18 @@ "outgoing_transfer_description": "", "incoming_transfer_description": "", "post_desc": "Teeni punkte regulaarselt postitamisega. Postitamine annab kuni 15 punkti.", - "comment_desc": "Each comment you make helps you to grow your audience and also earns you upto 5 points.", + "comment_desc": "Iga kirjutatud kommentaar aitab kasvatada sinu kogukonda ning teenid 5 punkti.", "checkin_desc": "Regulaarselt sisse logides saad 0,25 punkti.", "vote_desc": "Hääletades tasustate teisi loojaid ja teenite ka ise kuni 0,01 x hääle kaalupunkti.", "reblog_desc": "Jaga meeldivat postitust enda sõpradega ning teeni punkte.", "login_desc": "Esimest korda rakendusse sisse logides teenid 100 punkti.", - "checkin_extra_desc": "Consistent use of app gives you extra chances to earn more points, be more active and earn more.", + "checkin_extra_desc": "Regulaarne rakenduse kasutamine annab lisavõimaluse teenida rohkem punkte, ole aktiivne ning teeni rohkem.", "dropdown_transfer": "Kingi", "dropdown_promote": "Reklaami", "dropdown_boost": "Võimenda", "from": "Kellelt", "to": "Kellele", - "estimated_value_desc": "According to purchase value", + "estimated_value_desc": "Vastavalt ostu väärtusele", "estimated_value": "Hinnanguline väärtus", "estimated_amount": "Hääle väärtus", "amount_information": "Koguse muutmiseks liiguta liugurit", @@ -220,7 +220,7 @@ "description": "Logides sisse, nõustute meie kasutustingimuste ja privaatsuseeskirjadega.", "cancel": "tühista", "login": "LOGI SISSE", - "steemconnect_description": "If you don't want to keep your password encrypted and saved on your device, you can use Hivesigner.", + "steemconnect_description": "Kui sa ei soovi hoida oma parooli krüpteerituna ja salvestatuna oma seadmes, kasuta Hivesigner'it.", "steemconnect_fee_description": "info" }, "register": { @@ -229,9 +229,9 @@ "username": "Vali kasutajanimi", "mail": "Kirjuta oma e-posti aadress", "ref_user": "Kutsutud kasutaja (Vabatahtlik)", - "500_error": "Your request could not be processed, signup queue is likely full! Try again in few minutes...", + "500_error": "Toiming ebaõnnestus, registreerumise järjekord on täis! Proovi uuesti mõne minuti pärast...", "title_description": "Üks kasutaja kõige haldamiseks", - "form_description": "By signing up with us, you agree to our Terms of Service and Privacy Policies." + "form_description": "Registreerudes nõustute meie kasutustingimuste ja privaatsuseeskirjadega." }, "home": { "feed": "Sein", @@ -283,7 +283,7 @@ "limited_tags": "10 silti lubatud, eemalda mõned", "limited_length": "Sildi maksimum pikkus võib olla 24", "limited_dash": "Kasuta ühte kriipsu igas sildis", - "limited_space": "Use space to separate tags", + "limited_space": "Kasuta tühikut, et eraldada silte", "limited_lowercase": "Kasuta siltides ainult väiketähti", "limited_characters": "Kasuta ainult väiketähti, numbreid ja ühte kriipsu", "limited_firstchar": "Silt peab algama tähega", From 25319f3ee79a5ccc46322904b5d2d88b7bd835f2 Mon Sep 17 00:00:00 2001 From: Mustafa Buyukcelebi Date: Tue, 26 Jan 2021 21:11:09 +0300 Subject: [PATCH 355/362] Fix for android app center build --- android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index f39db36fb..3ee1fe25f 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,7 +1,6 @@ apply plugin: "com.android.application" apply plugin: 'com.google.gms.google-services' apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle" -apply plugin: 'com.bugsnag.android.gradle' import com.android.build.OutputFile @@ -84,6 +83,7 @@ project.ext.react = [ ] apply from: "../../node_modules/react-native/react.gradle" +apply plugin: 'com.bugsnag.android.gradle' /** * Set this to true to create two separate APKs instead of one: From 1e24601e75d7bfde5d7997bec33fecc3b99beb71 Mon Sep 17 00:00:00 2001 From: feruz Date: Tue, 26 Jan 2021 22:38:40 +0200 Subject: [PATCH 356/362] fix gradle on appcenter#6 --- android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 3ee1fe25f..2b1841b1c 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -83,6 +83,7 @@ project.ext.react = [ ] apply from: "../../node_modules/react-native/react.gradle" +apply from: "../../node_modules/@bugsnag/react-native/bugsnag-react-native.gradle" apply plugin: 'com.bugsnag.android.gradle' /** @@ -232,7 +233,6 @@ task copyDownloadableDepsToLibs(type: Copy) { apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) apply from: "../../node_modules/react-native-vector-icons/fonts.gradle" -apply from: "../../node_modules/@bugsnag/react-native/bugsnag-react-native.gradle" bugsnag { uploadReactNativeMappings = true From 66c641afb0011738a3a154e00c20be480f0fc698 Mon Sep 17 00:00:00 2001 From: feruz Date: Tue, 26 Jan 2021 22:43:01 +0200 Subject: [PATCH 357/362] fix gradle on appcenter#7 --- android/build.gradle | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/android/build.gradle b/android/build.gradle index 44ccfdb9e..3defd2aa1 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -63,6 +63,13 @@ subprojects {project -> } } } + if (project.name.contains('bugsnag')) { + buildscript { + repositories { + maven { url 'https://maven.google.com' } + } + } + } ext { def npmVersion = getNpmVersionArray() versionMajor = npmVersion[0] From c8476598cbf97b08b86f24ac0e58fc188d531145 Mon Sep 17 00:00:00 2001 From: feruz Date: Tue, 26 Jan 2021 23:40:38 +0200 Subject: [PATCH 358/362] fix gradle on appcenter#8 --- .vscode/settings.json | 9 ++++++++- android/build.gradle | 9 +-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index df53ee357..5e095a299 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,5 +2,12 @@ "eslint.validate": [ "javascript", "javascriptreact" - ] + ], + "java.configuration.updateBuildConfiguration": "interactive", + "files.exclude": { + "**/.classpath": true, + "**/.project": true, + "**/.settings": true, + "**/.factorypath": true + } } \ No newline at end of file diff --git a/android/build.gradle b/android/build.gradle index 3defd2aa1..de26880d9 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -28,8 +28,8 @@ buildscript { } dependencies { classpath('com.android.tools.build:gradle:4.0.1') + classpath("com.bugsnag:bugsnag-android-gradle-plugin:5.+") classpath 'com.google.gms:google-services:4.3.3' - classpath 'com.bugsnag:bugsnag-android-gradle-plugin:5.+' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -63,13 +63,6 @@ subprojects {project -> } } } - if (project.name.contains('bugsnag')) { - buildscript { - repositories { - maven { url 'https://maven.google.com' } - } - } - } ext { def npmVersion = getNpmVersionArray() versionMajor = npmVersion[0] From 8609888e069e43a814108791eb74f40e84c63ef7 Mon Sep 17 00:00:00 2001 From: feruz Date: Wed, 27 Jan 2021 10:16:47 +0200 Subject: [PATCH 359/362] downgrade bugsnag --- android/app/build.gradle | 5 +- .../mobile/android/MainApplication.java | 2 - android/build.gradle | 2 +- ios/Ecency.xcodeproj/project.pbxproj | 4 +- ios/Ecency/AppDelegate.m | 4 +- ios/Ecency/Info.plist | 7 +- ios/Podfile.lock | 11 +- package.json | 3 +- src/config/bugsnag.js | 16 +- yarn.lock | 255 ++---------------- 10 files changed, 39 insertions(+), 270 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 2b1841b1c..1916ffb2f 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,6 +1,7 @@ apply plugin: "com.android.application" apply plugin: 'com.google.gms.google-services' apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle" +apply plugin: 'com.bugsnag.android.gradle' import com.android.build.OutputFile @@ -83,8 +84,6 @@ project.ext.react = [ ] apply from: "../../node_modules/react-native/react.gradle" -apply from: "../../node_modules/@bugsnag/react-native/bugsnag-react-native.gradle" -apply plugin: 'com.bugsnag.android.gradle' /** * Set this to true to create two separate APKs instead of one: @@ -236,4 +235,4 @@ apply from: "../../node_modules/react-native-vector-icons/fonts.gradle" bugsnag { uploadReactNativeMappings = true -} \ No newline at end of file +} diff --git a/android/app/src/main/java/app/esteem/mobile/android/MainApplication.java b/android/app/src/main/java/app/esteem/mobile/android/MainApplication.java index 9a8c91b45..41c7c11cb 100644 --- a/android/app/src/main/java/app/esteem/mobile/android/MainApplication.java +++ b/android/app/src/main/java/app/esteem/mobile/android/MainApplication.java @@ -9,7 +9,6 @@ import com.facebook.react.ReactNativeHost; import com.facebook.react.ReactPackage; import com.facebook.soloader.SoLoader; import androidx.multidex.MultiDexApplication; -import com.bugsnag.android.Bugsnag; //See below, Webview debugging //import android.webkit.WebView; @@ -55,7 +54,6 @@ public class MainApplication extends MultiDexApplication implements ReactApplica SoLoader.init(this, /* native exopackage */ false); // Uncomment below line to Debug Webview // WebView.setWebContentsDebuggingEnabled(true); - Bugsnag.start(this); initializeFlipper(this); // Remove this line if you don't want Flipper enabled } diff --git a/android/build.gradle b/android/build.gradle index de26880d9..981b4171b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -28,8 +28,8 @@ buildscript { } dependencies { classpath('com.android.tools.build:gradle:4.0.1') - classpath("com.bugsnag:bugsnag-android-gradle-plugin:5.+") classpath 'com.google.gms:google-services:4.3.3' + classpath 'com.bugsnag:bugsnag-android-gradle-plugin:4.+' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/ios/Ecency.xcodeproj/project.pbxproj b/ios/Ecency.xcodeproj/project.pbxproj index 0d22138a1..f54548ab3 100644 --- a/ios/Ecency.xcodeproj/project.pbxproj +++ b/ios/Ecency.xcodeproj/project.pbxproj @@ -691,7 +691,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "export EXTRA_PACKAGER_ARGS=\"--sourcemap-output $CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/main.jsbundle.map\"\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n"; + shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n"; }; 05BAAAEE25BF43F80072EA01 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -708,7 +708,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n../node_modules/@bugsnag/react-native/bugsnag-react-native-xcode.sh\n"; + shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n"; }; 180EA60986CD4BBD6C799872 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; diff --git a/ios/Ecency/AppDelegate.m b/ios/Ecency/AppDelegate.m index 68219b0b8..1a1955b85 100644 --- a/ios/Ecency/AppDelegate.m +++ b/ios/Ecency/AppDelegate.m @@ -11,8 +11,8 @@ #import #import #import +#import #import -#import #import #import @@ -36,7 +36,7 @@ [AppCenterReactNative register]; [AppCenterReactNativeAnalytics registerWithInitiallyEnabled:true]; [AppCenterReactNativeCrashes registerWithAutomaticProcessing]; - [Bugsnag start]; + [BugsnagReactNative start]; RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions]; RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge moduleName:@"Ecency" diff --git a/ios/Ecency/Info.plist b/ios/Ecency/Info.plist index ef7b60443..c55bf7b10 100644 --- a/ios/Ecency/Info.plist +++ b/ios/Ecency/Info.plist @@ -2,11 +2,8 @@ - bugsnag - - apiKey - 88a8a25738939a80ba49f1d5289dbc80 - + BugsnagAPIKey + 88a8a25738939a80ba49f1d5289dbc80 CFBundleDevelopmentRegion en CFBundleDisplayName diff --git a/ios/Podfile.lock b/ios/Podfile.lock index a96a4fefb..486726254 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -18,7 +18,10 @@ PODS: - AppCenterReactNativeShared (3.1.0): - AppCenter/Core (= 3.3.1) - boost-for-react-native (1.63.0) - - BugsnagReactNative (7.6.0): + - BugsnagReactNative (2.23.10): + - BugsnagReactNative/Core (= 2.23.10) + - React + - BugsnagReactNative/Core (2.23.10): - React - BVLinearGradient (2.5.6): - React @@ -430,7 +433,7 @@ DEPENDENCIES: - appcenter-analytics (from `../node_modules/appcenter-analytics/ios`) - appcenter-core (from `../node_modules/appcenter/ios`) - appcenter-crashes (from `../node_modules/appcenter-crashes/ios`) - - "BugsnagReactNative (from `../node_modules/@bugsnag/react-native`)" + - BugsnagReactNative (from `../node_modules/bugsnag-react-native`) - BVLinearGradient (from `../node_modules/react-native-linear-gradient`) - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) @@ -524,7 +527,7 @@ EXTERNAL SOURCES: appcenter-crashes: :path: "../node_modules/appcenter-crashes/ios" BugsnagReactNative: - :path: "../node_modules/@bugsnag/react-native" + :path: "../node_modules/bugsnag-react-native" BVLinearGradient: :path: "../node_modules/react-native-linear-gradient" DoubleConversion: @@ -645,7 +648,7 @@ SPEC CHECKSUMS: appcenter-crashes: 10790bf670f79150f1654d79f76c10a8b4936688 AppCenterReactNativeShared: 2ec88a4ac2c52cdbc828a1f9c16244b534c84026 boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c - BugsnagReactNative: 0750207f412264f772997ceac9bbad36e100b828 + BugsnagReactNative: 98fb350df4bb0c94cce903023531a1a5cc11fa51 BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872 DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2 FBLazyVector: aaeaf388755e4f29cd74acbc9e3b8da6d807c37f diff --git a/package.json b/package.json index d54689170..efe6fe4fd 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,6 @@ }, "dependencies": { "@babel/runtime": "^7.5.5", - "@bugsnag/react-native": "^7.6.0", "@ecency/render-helper": "^2.0.15", "@esteemapp/dhive": "0.15.0", "@esteemapp/react-native-autocomplete-input": "^4.2.1", @@ -52,6 +51,7 @@ "appcenter-crashes": "^3.1.0", "axios": "^0.18.0", "buffer": "^5.4.3", + "bugsnag-react-native": "^2.23.10", "core-js": "3.6.4", "crypto-js": "^3.1.9-1", "currency-symbol-map": "^4.0.4", @@ -122,7 +122,6 @@ "@babel/core": "^7.6.2", "@babel/runtime": "^7.6.2", "@bam.tech/react-native-make": "^2.0.0", - "@bugsnag/source-maps": "^2.0.0", "@react-native-community/eslint-config": "^0.0.5", "babel-eslint": "^10.0.1", "babel-jest": "^24.9.0", diff --git a/src/config/bugsnag.js b/src/config/bugsnag.js index 1680fb9fc..48aeb8adf 100644 --- a/src/config/bugsnag.js +++ b/src/config/bugsnag.js @@ -1,12 +1,10 @@ -import Bugsnag from '@bugsnag/react-native'; +import { Client, Configuration } from 'bugsnag-react-native'; import Config from 'react-native-config'; -const configuration = { - apiKey: Config.BUGSNAG_API_KEY, - consoleBreadcrumbsEnabled: true, - notifyReleaseStages: ['beta', 'production'], -}; +const configuration = new Configuration(); +configuration.apiKey = Config.BUGSNAG_API_KEY; +configuration.consoleBreadcrumbsEnabled = true; +configuration.notifyReleaseStages = ['beta', 'production']; -Bugsnag.start(configuration); - -export default Bugsnag; +const client = new Client(configuration); +export default client; diff --git a/yarn.lock b/yarn.lock index 57ae33028..216ab37d7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -690,108 +690,6 @@ sharp "^0.23.0" universal-analytics "^0.4.20" -"@bugsnag/core@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@bugsnag/core/-/core-7.6.0.tgz#f18deb534ea5f95c1e02bdb3656e1e6605b16334" - integrity sha512-hBYAZJw4ScqoyM1jA1x/m2e4iS2EqYEs0I2hdzBCZFv2ls17ILmU58eRSyVdUfyzbv0J7Hi6DwwBGC4Yb6ROZA== - dependencies: - "@bugsnag/cuid" "^3.0.0" - "@bugsnag/safe-json-stringify" "^6.0.0" - error-stack-parser "^2.0.3" - iserror "0.0.2" - stack-generator "^2.0.3" - -"@bugsnag/cuid@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@bugsnag/cuid/-/cuid-3.0.0.tgz#2ee7642a30aee6dc86f5e7f824653741e42e5c35" - integrity sha512-LOt8aaBI+KvOQGneBtpuCz3YqzyEAehd1f3nC5yr9TIYW1+IzYKa2xWS4EiMz5pPOnRPHkyyS5t/wmSmN51Gjg== - -"@bugsnag/delivery-react-native@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@bugsnag/delivery-react-native/-/delivery-react-native-7.6.0.tgz#4f4214d32f1b3bc848cab1c08b2b6646bd15aa77" - integrity sha512-9o0Kc0kB85lqz9KpyRUTNbZH+l//qgGr/8j8otGOJn8rMbHp0ya///m9gIIM/Q9sls7gxNdKAqrH3s/kRuvC9w== - -"@bugsnag/plugin-console-breadcrumbs@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@bugsnag/plugin-console-breadcrumbs/-/plugin-console-breadcrumbs-7.6.0.tgz#c497ab92faafb1e1e06b7937250f93d0c44bb5de" - integrity sha512-5GtRRrfgUTARQl2lwDmtWemhKpm6ybCrCrlSuYPenBsBkWLAZ5eI0CPFfcGysbbrjzVvstVluVzQoUGWOA8YPg== - -"@bugsnag/plugin-network-breadcrumbs@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@bugsnag/plugin-network-breadcrumbs/-/plugin-network-breadcrumbs-7.6.0.tgz#85c7ea203a7ab2e94041ecd7631cb1df68936781" - integrity sha512-arbia/1PYlzR9y8sjhxSCmMtd8MOw7Q3EPIhDJUcQ7FYcTQgMZgv7b+1zOkX1uPEPuwuQGFLj8PVfAXQ3K5qeA== - -"@bugsnag/plugin-react-native-client-sync@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@bugsnag/plugin-react-native-client-sync/-/plugin-react-native-client-sync-7.6.0.tgz#b5278105c48f311904cfa45c99757ea70ffaa2ce" - integrity sha512-AyCxDG9uax4O6InhC0pt6ytG7FAeywGXlKATMqTJvK0ahIPg9um57EPsvOIhY8cxSKQtVABCvwDB4qA2evCc+w== - -"@bugsnag/plugin-react-native-event-sync@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@bugsnag/plugin-react-native-event-sync/-/plugin-react-native-event-sync-7.6.0.tgz#1a71ca61e37f49b6e839357036d4b079b7758490" - integrity sha512-8aqCHeNIGjwIJ69zGRS1FiqfM0OpMAPo3SF61gPvhODnPzQqjEhDFojaMSGMi2/YWMCb5augg9MXvI2sPjC2og== - -"@bugsnag/plugin-react-native-global-error-handler@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@bugsnag/plugin-react-native-global-error-handler/-/plugin-react-native-global-error-handler-7.6.0.tgz#9eb0617cc99c40a86f81759a0b02a4ece6b64414" - integrity sha512-Al5AJv/h/ZSpnMAZI2SJyPB4xH8wkkOVWKOTAOHpjzXw0aFuSA1ZDdLZDnysr2dKqm/b5NYLP9paB/Zhitk1Sg== - -"@bugsnag/plugin-react-native-hermes@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@bugsnag/plugin-react-native-hermes/-/plugin-react-native-hermes-7.6.0.tgz#1d7c0982e636600ab29c32c9fbdb95f1e31bb347" - integrity sha512-vXUuC7LzjP6NsxHs0pjjjTTXiqMSqQc/e1XwJGBZFEGd4aJx+2BIg0iY7wcpeE1FghJz36NgonL3lb2v9283dA== - -"@bugsnag/plugin-react-native-session@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@bugsnag/plugin-react-native-session/-/plugin-react-native-session-7.6.0.tgz#71dcc2c58298cba202abcaf0bffd8ef473033d00" - integrity sha512-jzJan0acUUmjW608tMxM28aj/Dv9J6+MNbEBso8pCFqT17w7rzRD0gRX7hkd5i1V3V5ZQxIjqHeZkBUSre+x6Q== - -"@bugsnag/plugin-react-native-unhandled-rejection@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@bugsnag/plugin-react-native-unhandled-rejection/-/plugin-react-native-unhandled-rejection-7.6.0.tgz#948518dade8c0ce68bf738c1d2073c09c6b7ba91" - integrity sha512-KpDy+YNXbvkqTJ1mWk8rY2QFkR7+WkW/uK5moPTdCdwegxImsjaD0mMhfOmW3s5lqn7k4D6bvUdIjml8B9+Msg== - -"@bugsnag/plugin-react@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@bugsnag/plugin-react/-/plugin-react-7.6.0.tgz#27448c03170f99a68c35ec923e75ad323c36d632" - integrity sha512-gBZy34i2MJ7RSMgoW1FPxCP2y5Ke7eMCCZZPrPW7DScA9fjMtJZAzIizziYP+Q2swwjKCWyuL3cnalpf+iz4jQ== - -"@bugsnag/react-native@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@bugsnag/react-native/-/react-native-7.6.0.tgz#13f00bb238abf44fcd5af26f32a33cf59bd6d9e3" - integrity sha512-NhXNH3cBeSVjKVBKOaWGwbYkIPZi+DrRTpF3M3oxgBnXmadfz942DqK8hj5pOfEtyoPFK7+AY7UVzQ3/47Z07g== - dependencies: - "@bugsnag/core" "^7.6.0" - "@bugsnag/delivery-react-native" "^7.6.0" - "@bugsnag/plugin-console-breadcrumbs" "^7.6.0" - "@bugsnag/plugin-network-breadcrumbs" "^7.6.0" - "@bugsnag/plugin-react" "^7.6.0" - "@bugsnag/plugin-react-native-client-sync" "^7.6.0" - "@bugsnag/plugin-react-native-event-sync" "^7.6.0" - "@bugsnag/plugin-react-native-global-error-handler" "^7.6.0" - "@bugsnag/plugin-react-native-hermes" "^7.6.0" - "@bugsnag/plugin-react-native-session" "^7.6.0" - "@bugsnag/plugin-react-native-unhandled-rejection" "^7.6.0" - iserror "^0.0.2" - -"@bugsnag/safe-json-stringify@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@bugsnag/safe-json-stringify/-/safe-json-stringify-6.0.0.tgz#22abdcd83e008c369902976730c34c150148a758" - integrity sha512-htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA== - -"@bugsnag/source-maps@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@bugsnag/source-maps/-/source-maps-2.0.0.tgz#4fab86263c586ee86ef9ccfbf7a30b406d02b377" - integrity sha512-CY0Pzt9migcfOq1X/hgKKcScBs11h3lDnHNKG8DZVzIcL/J9/3B4FA9s22V6ztSjEjZL1K+tbbaNf/ia3xD86w== - dependencies: - command-line-args "^5.1.1" - command-line-usage "^6.1.0" - concat-stream "^2.0.0" - consola "^2.15.0" - form-data "^3.0.0" - glob "^7.1.6" - read-pkg-up "^7.0.1" - "@cnakazawa/watch@^1.0.3": version "1.0.4" resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a" @@ -1809,16 +1707,6 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= -array-back@^3.0.1: - version "3.1.0" - resolved "https://registry.yarnpkg.com/array-back/-/array-back-3.1.0.tgz#b8859d7a508871c9a7b2cf42f99428f65e96bfb0" - integrity sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q== - -array-back@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/array-back/-/array-back-4.0.1.tgz#9b80312935a52062e1a233a9c7abeb5481b30e90" - integrity sha512-Z/JnaVEXv+A9xabHzN43FiiiWEE7gPCRXMrVmRm00tWbjZRul1iHm7ECzlyNq1p4a4ATXz+G9FJ3GqGOkOV3fg== - array-equal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93" @@ -2321,6 +2209,15 @@ buffer@^5.4.3, buffer@^5.5.0: base64-js "^1.0.2" ieee754 "^1.1.4" +bugsnag-react-native@^2.23.10: + version "2.23.10" + resolved "https://registry.yarnpkg.com/bugsnag-react-native/-/bugsnag-react-native-2.23.10.tgz#f2156f15182d1e81d076386e9bff5b02a2db5153" + integrity sha512-Z47+dSitce8CpJa7rpDMP06tm3045LtIwaJ/nYtKFk+SnbL4qdPad8j4JCC65XL2P/wSOxHfMGYw1lPA4j+lWA== + dependencies: + iserror "^0.0.2" + promise "^7" + prop-types "^15.6.0" + bytebuffer@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/bytebuffer/-/bytebuffer-5.0.1.tgz#582eea4b1a873b6d020a48d58df85f0bba6cfddd" @@ -2642,7 +2539,7 @@ colorspace@1.0.x: color "0.8.x" text-hex "0.0.x" -combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6: +combined-stream@^1.0.6, combined-stream@~1.0.6: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== @@ -2654,26 +2551,6 @@ command-exists@^1.2.8: resolved "https://registry.yarnpkg.com/command-exists/-/command-exists-1.2.9.tgz#c50725af3808c8ab0260fd60b01fbfa25b954f69" integrity sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w== -command-line-args@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/command-line-args/-/command-line-args-5.1.1.tgz#88e793e5bb3ceb30754a86863f0401ac92fd369a" - integrity sha512-hL/eG8lrll1Qy1ezvkant+trihbGnaKaeEjj6Scyr3DN+RC7iQ5Rz84IeLERfAWDGo0HBSNAakczwgCilDXnWg== - dependencies: - array-back "^3.0.1" - find-replace "^3.0.0" - lodash.camelcase "^4.3.0" - typical "^4.0.0" - -command-line-usage@^6.1.0: - version "6.1.1" - resolved "https://registry.yarnpkg.com/command-line-usage/-/command-line-usage-6.1.1.tgz#c908e28686108917758a49f45efb4f02f76bc03f" - integrity sha512-F59pEuAR9o1SF/bD0dQBDluhpT4jJQNWUHEuVBqpDmCUo6gPjCi+m9fCWnWZVR/oG6cMTUms4h+3NPl74wGXvA== - dependencies: - array-back "^4.0.1" - chalk "^2.4.2" - table-layout "^1.0.1" - typical "^5.2.0" - commander@^2.14.1, commander@^2.19.0, commander@^2.20.3, commander@^2.9.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" @@ -2739,16 +2616,6 @@ concat-stream@^1.6.0, concat-stream@^1.6.2: readable-stream "^2.2.2" typedarray "^0.0.6" -concat-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz#414cf5af790a48c60ab9be4527d56d5e41133cb1" - integrity sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A== - dependencies: - buffer-from "^1.0.0" - inherits "^2.0.3" - readable-stream "^3.0.2" - typedarray "^0.0.6" - concat-with-sourcemaps@*: version "1.1.0" resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e" @@ -2779,11 +2646,6 @@ connect@^3.6.5: parseurl "~1.3.3" utils-merge "1.0.1" -consola@^2.15.0: - version "2.15.0" - resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.0.tgz#40fc4eefa4d2f8ef2e2806147f056ea207fcc0e9" - integrity sha512-vlcSGgdYS26mPf7qNi+dCisbhiyDnrN1zaRbw3CSuc2wGOMEGGPsp46PdRG5gqXwgtJfjxDkxRNAgRPr1B77vQ== - console-control-strings@^1.0.0, console-control-strings@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" @@ -3073,7 +2935,7 @@ deep-diff@^0.3.5: resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-0.3.8.tgz#c01de63efb0eec9798801d40c7e0dae25b582c84" integrity sha1-wB3mPvsO7JeYgB1Ax+Da4ltYLIQ= -deep-extend@^0.6.0, deep-extend@~0.6.0: +deep-extend@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== @@ -3418,13 +3280,6 @@ error-ex@^1.2.0, error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -error-stack-parser@^2.0.3: - version "2.0.6" - resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.6.tgz#5a99a707bd7a4c58a797902d48d82803ede6aad8" - integrity sha512-d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ== - dependencies: - stackframe "^1.1.1" - errorhandler@^1.5.0: version "1.5.1" resolved "https://registry.yarnpkg.com/errorhandler/-/errorhandler-1.5.1.tgz#b9ba5d17cf90744cd1e851357a6e75bf806a9a91" @@ -4169,13 +4024,6 @@ find-parent-dir@^0.3.0: resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54" integrity sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ= -find-replace@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/find-replace/-/find-replace-3.0.0.tgz#3e7e23d3b05167a76f770c9fbd5258b0def68c38" - integrity sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ== - dependencies: - array-back "^3.0.1" - find-up@^2.0.0, find-up@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" @@ -4248,15 +4096,6 @@ forever-agent@~0.6.1: resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= -form-data@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.0.tgz#31b7e39c85f1355b7139ee0c647cf0de7f83c682" - integrity sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.8" - mime-types "^2.1.12" - form-data@~2.3.2: version "2.3.3" resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" @@ -4459,7 +4298,7 @@ glob@7.0.6: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.6: +glob@^7.1.1, glob@^7.1.2, glob@^7.1.3: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -5121,7 +4960,7 @@ isarray@^2.0.1: resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== -iserror@0.0.2, iserror@^0.0.2: +iserror@^0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/iserror/-/iserror-0.0.2.tgz#bd53451fe2f668b9f2402c1966787aaa2c7c0bf5" integrity sha1-vVNFH+L2aLnyQCwZZnh6qix8C/U= @@ -5987,11 +5826,6 @@ lodash._reinterpolate@^3.0.0: resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= -lodash.camelcase@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" - integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= - lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" @@ -7516,7 +7350,7 @@ progress@^2.0.0: resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== -promise@^7.1.1: +promise@^7, promise@^7.1.1: version "7.3.1" resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg== @@ -8112,15 +7946,6 @@ read-pkg-up@^4.0.0: find-up "^3.0.0" read-pkg "^3.0.0" -read-pkg-up@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507" - integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg== - dependencies: - find-up "^4.1.0" - read-pkg "^5.2.0" - type-fest "^0.8.1" - read-pkg@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8" @@ -8162,7 +7987,7 @@ readable-stream@^2.0.1, readable-stream@^2.0.6, readable-stream@^2.2.2, readable string_decoder "~1.1.1" util-deprecate "~1.0.1" -readable-stream@^3.0.2, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: +readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== @@ -8178,11 +8003,6 @@ realpath-native@^1.1.0: dependencies: util.promisify "^1.0.0" -reduce-flatten@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/reduce-flatten/-/reduce-flatten-2.0.0.tgz#734fd84e65f375d7ca4465c69798c25c9d10ae27" - integrity sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w== - redux-devtools-extension@^2.13.5: version "2.13.8" resolved "https://registry.yarnpkg.com/redux-devtools-extension/-/redux-devtools-extension-2.13.8.tgz#37b982688626e5e4993ff87220c9bbb7cd2d96e1" @@ -8965,23 +8785,11 @@ sshpk@^1.7.0: safer-buffer "^2.0.2" tweetnacl "~0.14.0" -stack-generator@^2.0.3: - version "2.0.5" - resolved "https://registry.yarnpkg.com/stack-generator/-/stack-generator-2.0.5.tgz#fb00e5b4ee97de603e0773ea78ce944d81596c36" - integrity sha512-/t1ebrbHkrLrDuNMdeAcsvynWgoH/i4o8EGGfX7dEYDoTXOYVAkEpFdtshlvabzc6JlJ8Kf9YdFEoz7JkzGN9Q== - dependencies: - stackframe "^1.1.1" - stack-utils@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8" integrity sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA== -stackframe@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.2.0.tgz#52429492d63c62eb989804c11552e3d22e779303" - integrity sha512-GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA== - stacktrace-parser@0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/stacktrace-parser/-/stacktrace-parser-0.1.4.tgz#01397922e5f62ecf30845522c95c4fe1d25e7d4e" @@ -9235,16 +9043,6 @@ symbol-tree@^3.2.2: resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== -table-layout@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/table-layout/-/table-layout-1.0.1.tgz#8411181ee951278ad0638aea2f779a9ce42894f9" - integrity sha512-dEquqYNJiGwY7iPfZ3wbXDI944iqanTSchrACLL2nOB+1r+h1Nzu2eH+DuPPvWvm5Ry7iAPeFlgEtP5bIp5U7Q== - dependencies: - array-back "^4.0.1" - deep-extend "~0.6.0" - typical "^5.2.0" - wordwrapjs "^4.0.0" - table@^5.2.3: version "5.4.6" resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e" @@ -9457,11 +9255,6 @@ type-fest@^0.7.1: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.7.1.tgz#8dda65feaf03ed78f0a3f9678f1869147f7c5c48" integrity sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg== -type-fest@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" - integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== - typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" @@ -9472,16 +9265,6 @@ typescript@^3.2.1: resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa" integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw== -typical@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/typical/-/typical-4.0.0.tgz#cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4" - integrity sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw== - -typical@^5.0.0, typical@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/typical/-/typical-5.2.0.tgz#4daaac4f2b5315460804f0acf6cb69c52bb93066" - integrity sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg== - ua-parser-js@^0.7.18: version "0.7.21" resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.21.tgz#853cf9ce93f642f67174273cc34565ae6f308777" @@ -9786,14 +9569,6 @@ wordwrap@^1.0.0: resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= -wordwrapjs@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/wordwrapjs/-/wordwrapjs-4.0.0.tgz#9aa9394155993476e831ba8e59fb5795ebde6800" - integrity sha512-Svqw723a3R34KvsMgpjFBYCgNOSdcW3mQFK4wIfhGQhtaFVOJmdYoXgi63ne3dTlWgatVcUc7t4HtQ/+bUVIzQ== - dependencies: - reduce-flatten "^2.0.0" - typical "^5.0.0" - wrap-ansi@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" From 84619b2d3a8aa2d0ca459a908af4c048801bbb24 Mon Sep 17 00:00:00 2001 From: feruz Date: Wed, 27 Jan 2021 10:56:38 +0200 Subject: [PATCH 360/362] remove gradle deprecated line --- android/app/build.gradle | 4 ---- 1 file changed, 4 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 1916ffb2f..02d9790fd 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -232,7 +232,3 @@ task copyDownloadableDepsToLibs(type: Copy) { apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) apply from: "../../node_modules/react-native-vector-icons/fonts.gradle" - -bugsnag { - uploadReactNativeMappings = true -} From 29a6a8483005d0155de90f81cad30dd9cb74868d Mon Sep 17 00:00:00 2001 From: feruz Date: Thu, 28 Jan 2021 23:48:54 +0200 Subject: [PATCH 361/362] try fastimage animated --- src/components/postCard/view/postCardView.js | 2 +- src/components/progressiveImage/index.js | 7 +++++-- src/utils/postParser.js | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/components/postCard/view/postCardView.js b/src/components/postCard/view/postCardView.js index 3b2a2e3aa..2758e6e0c 100644 --- a/src/components/postCard/view/postCardView.js +++ b/src/components/postCard/view/postCardView.js @@ -72,7 +72,7 @@ const PostCardView = ({ } //console.log(content) ImageSize.getSize(content.thumbnail).then((size) => { - setCalcImgHeight((size.height / size.width) * dim.width); + setCalcImgHeight(Math.floor((size.height / size.width) * dim.width)); }); return { image: content.image, thumbnail: content.thumbnail }; } else { diff --git a/src/components/progressiveImage/index.js b/src/components/progressiveImage/index.js index 4d8c2c02e..9ab4de0aa 100644 --- a/src/components/progressiveImage/index.js +++ b/src/components/progressiveImage/index.js @@ -1,5 +1,6 @@ import React from 'react'; import { View, StyleSheet, Animated } from 'react-native'; +import FastImage from 'react-native-fast-image'; const styles = StyleSheet.create({ imageOverlay: { @@ -16,6 +17,8 @@ const styles = StyleSheet.create({ }, }); +const AnimatedFastImage = Animated.createAnimatedComponent(FastImage); + class ProgressiveImage extends React.Component { thumbnailAnimated = new Animated.Value(0); @@ -38,14 +41,14 @@ class ProgressiveImage extends React.Component { return ( - - post.json_metadata = {}; } post.image = catchPostImage(post.body, 600, 500, webp ? 'webp' : 'match'); - post.thumbnail = catchPostImage(post.body, 6, 5, webp ? 'webp' : 'match'); + post.thumbnail = catchPostImage(post.body, 10, 7, webp ? 'webp' : 'match'); post.author_reputation = getReputation(post.author_reputation); post.avatar = getResizedAvatar(get(post, 'author')); if (!isList) { From 5f5184203264623474acdc6622a452e04dd9c6d2 Mon Sep 17 00:00:00 2001 From: feruz Date: Fri, 29 Jan 2021 00:25:50 +0200 Subject: [PATCH 362/362] floor size height --- src/components/postListItem/view/postListItemView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/postListItem/view/postListItemView.js b/src/components/postListItem/view/postListItemView.js index 0a4d70dd8..826d962cf 100644 --- a/src/components/postListItem/view/postListItemView.js +++ b/src/components/postListItem/view/postListItemView.js @@ -44,7 +44,7 @@ const PostListItemView = ({ if (image) { if (!_isMounted) { ImageSize.getSize(thumbnail.uri).then((size) => { - setCalcImgHeight((size.height / size.width) * dim.width); + setCalcImgHeight(Math.floor((size.height / size.width) * dim.width)); }); } }