diff --git a/android/app/build.gradle b/android/app/build.gradle index 8e887fe2a..cebfc432f 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -114,7 +114,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode versionMajor * 10000 + versionMinor * 100 + versionPatch - versionName "2.2.1" + versionName "2.2.2" vectorDrawables.useSupportLibrary = true resValue "string", "build_config_package", "app.esteem.mobile.android" } diff --git a/ios/eSteem-tvOS/Info.plist b/ios/eSteem-tvOS/Info.plist index 08636c3c7..95f56a058 100755 --- a/ios/eSteem-tvOS/Info.plist +++ b/ios/eSteem-tvOS/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.2.1 + 2.2.2 CFBundleSignature ???? CFBundleVersion - 6 + 7 LSRequiresIPhoneOS UILaunchStoryboardName diff --git a/ios/eSteem-tvOSTests/Info.plist b/ios/eSteem-tvOSTests/Info.plist index 1e8320d76..075200b8b 100755 --- a/ios/eSteem-tvOSTests/Info.plist +++ b/ios/eSteem-tvOSTests/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 2.2.1 + 2.2.2 CFBundleSignature ???? CFBundleVersion - 6 + 7 diff --git a/ios/eSteem.xcodeproj/project.pbxproj b/ios/eSteem.xcodeproj/project.pbxproj index 5284060e0..e91685e36 100644 --- a/ios/eSteem.xcodeproj/project.pbxproj +++ b/ios/eSteem.xcodeproj/project.pbxproj @@ -1965,7 +1965,7 @@ CODE_SIGN_ENTITLEMENTS = eSteem/eSteem.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 6; + CURRENT_PROJECT_VERSION = 7; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = 75B6RXTKGT; GCC_NO_COMMON_BLOCKS = NO; @@ -2008,7 +2008,7 @@ CODE_SIGN_ENTITLEMENTS = eSteem/eSteem.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 6; + CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = 75B6RXTKGT; GCC_NO_COMMON_BLOCKS = NO; HEADER_SEARCH_PATHS = ( diff --git a/ios/eSteem.xcworkspace/xcuserdata/f.xcuserdatad/UserInterfaceState.xcuserstate b/ios/eSteem.xcworkspace/xcuserdata/f.xcuserdatad/UserInterfaceState.xcuserstate index 7358af23f..7adf6ba56 100644 Binary files a/ios/eSteem.xcworkspace/xcuserdata/f.xcuserdatad/UserInterfaceState.xcuserstate and b/ios/eSteem.xcworkspace/xcuserdata/f.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/ios/eSteem/Info.plist b/ios/eSteem/Info.plist index 6a11f73bb..c5bcc0278 100755 --- a/ios/eSteem/Info.plist +++ b/ios/eSteem/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.2.1 + 2.2.2 CFBundleSignature ???? CFBundleURLTypes @@ -31,7 +31,7 @@ CFBundleVersion - 1672 + 1674 CodePushDeploymentKey 13ThFZsgwk6UZp6mIe95IDbnfw8iHy1jfsn-E LSRequiresIPhoneOS diff --git a/ios/eSteemTests/Info.plist b/ios/eSteemTests/Info.plist index ea06e9fcf..79cb7659f 100755 --- a/ios/eSteemTests/Info.plist +++ b/ios/eSteemTests/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 2.2.1 + 2.2.2 CFBundleSignature ???? CFBundleVersion - 6 + 7 diff --git a/package.json b/package.json index 5b991048f..29e89558b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "eSteem", - "version": "2.2.1", + "version": "2.2.2", "private": true, "rnpm": { "assets": [ diff --git a/src/components/avatarHeader/avatarHeaderView.js b/src/components/avatarHeader/avatarHeaderView.js index 33bba49fe..7e4f9683c 100644 --- a/src/components/avatarHeader/avatarHeaderView.js +++ b/src/components/avatarHeader/avatarHeaderView.js @@ -1,6 +1,6 @@ import React from 'react'; import { withNavigation } from 'react-navigation'; -import { View, Text } from 'react-native'; +import { View, Text, SafeAreaView } from 'react-native'; import LinearGradient from 'react-native-linear-gradient'; import { UserAvatar } from '../userAvatar'; @@ -23,36 +23,38 @@ const AvatarHeader = ({ colors={['#357ce6', '#2d5aa0']} style={styles.headerView} > - - - - + + - - {!!name && {name}} - {`@${username} (${reputation})`} + + + + + {!!name && {name}} + {`@${username} (${reputation})`} + - + ); diff --git a/src/components/comments/container/commentsContainer.js b/src/components/comments/container/commentsContainer.js index a4be6dbe7..dbc2c84a3 100644 --- a/src/components/comments/container/commentsContainer.js +++ b/src/components/comments/container/commentsContainer.js @@ -199,7 +199,7 @@ class CommentsContainer extends Component { const { dispatch, intl, navigation, isOwnProfile } = this.props; if (index === 0) { - writeToClipboard(`https://steemit.com${get(selectedComment, 'url')}`).then(() => { + writeToClipboard(`https://esteem.app${get(selectedComment, 'url')}`).then(() => { dispatch( toastNotification( intl.formatMessage({ diff --git a/src/components/markdownEditor/view/markdownEditorView.js b/src/components/markdownEditor/view/markdownEditorView.js index 7bd5d4b39..c644b78a3 100644 --- a/src/components/markdownEditor/view/markdownEditorView.js +++ b/src/components/markdownEditor/view/markdownEditorView.js @@ -63,9 +63,9 @@ export default class MarkdownEditorView extends Component { componentDidUpdate(prevProps, prevState) { const { text } = this.state; - const { isFormValid, handleIsFormValid } = this.props; + const { handleIsFormValid } = this.props; - if (prevState.text !== text && !isFormValid) { + if (prevState.text !== text) { const nextText = text.replace(prevState.text, ''); if (nextText && nextText.length > 0) { @@ -81,14 +81,6 @@ export default class MarkdownEditorView extends Component { // Component functions _changeText = input => { const { onChange, handleOnTextChange, handleIsValid, componentID } = this.props; - const { textUpdated } = this.state; - - if (textUpdated) { - this.setState({ - textUpdated: false, - }); - return; - } this.setState({ text: input }); diff --git a/src/components/profileSummary/view/profileSummaryView.js b/src/components/profileSummary/view/profileSummaryView.js index be5083475..6901dccd7 100644 --- a/src/components/profileSummary/view/profileSummaryView.js +++ b/src/components/profileSummary/view/profileSummaryView.js @@ -93,9 +93,9 @@ class ProfileSummaryView extends PureComponent { const location = get(about, 'location', ''); const ABOUT_DATA = [ - { text: date, icon: 'calendar' }, - { text: link, icon: 'earth', onPress: () => this._handleOnPressLink(link) }, - { text: location, icon: 'near-me' }, + { id: 1, text: date, icon: 'calendar' }, + { id: 2, text: link, icon: 'earth', onPress: () => this._handleOnPressLink(link) }, + { id: 3, text: location, icon: 'near-me' }, ]; const rowLength = @@ -115,6 +115,7 @@ class ProfileSummaryView extends PureComponent { { beneficiaries: [ { account: 'esteemapp', - weight: 1000, // 10% + weight: 300, // 3% }, ], }, diff --git a/src/screens/login/container/loginContainer.js b/src/screens/login/container/loginContainer.js index 3818e4053..4d97e2271 100644 --- a/src/screens/login/container/loginContainer.js +++ b/src/screens/login/container/loginContainer.js @@ -3,6 +3,7 @@ import { Alert, Linking, Platform } from 'react-native'; import { connect } from 'react-redux'; import { injectIntl } from 'react-intl'; import AppCenter from 'appcenter'; +import Config from 'react-native-config'; // Services and Actions import { login } from '../../../providers/steem/auth'; @@ -13,9 +14,14 @@ import { addOtherAccount, updateCurrentAccount, } from '../../../redux/actions/accountAction'; -import { login as loginAction, openPinCodeModal } from '../../../redux/actions/applicationActions'; +import { + login as loginAction, + openPinCodeModal, + setPinCode, +} from '../../../redux/actions/applicationActions'; import { setPushTokenSaved } from '../../../realm/realm'; import { setPushToken } from '../../../providers/esteem/esteem'; +import { encryptKey } from '../../../utils/crypto'; // Middleware @@ -62,6 +68,8 @@ class LoginContainer extends PureComponent { if (isPinCodeOpen) { dispatch(openPinCodeModal({ navigateTo: ROUTES.DRAWER.MAIN })); } else { + const encryptedPin = encryptKey(Config.DEFAULT_PIN, Config.PIN_KEY); + dispatch(setPinCode(encryptedPin)); navigation.navigate({ routeName: ROUTES.DRAWER.MAIN, }); diff --git a/src/screens/profile/screen/profileScreen.js b/src/screens/profile/screen/profileScreen.js index 854b4f393..aeddf8a86 100644 --- a/src/screens/profile/screen/profileScreen.js +++ b/src/screens/profile/screen/profileScreen.js @@ -1,90 +1,80 @@ -import React, { PureComponent } from 'react'; -import { injectIntl } from 'react-intl'; +import React from 'react'; import { Profile } from '../../../components'; import { ProfileContainer } from '../../../containers'; -class ProfileScreen extends PureComponent { - constructor(props) { - super(props); - this.state = {}; - } +const ProfileScreen = () => ( + + {({ + about, + activePage, + avatar, + changeForceLoadPostState, + comments, + currency, + currencyRate, + currencySymbol, + error, + follows, + forceLoadPost, + getReplies, + handleFollowUnfollowUser, + handleMuteUnmuteUser, + handleOnBackPress, + handleOnFavoritePress, + handleOnFollowsPress, + handleOnPressProfileEdit, + isDarkTheme, + isFavorite, + isFollowing, + isLoggedIn, + isMuted, + isOwnProfile, + isProfileLoading, + isReady, + quickProfile, + resourceCredits, + selectedUser, + setEstimatedWalletValue, + username, + votingPower, + }) => ( + + )} + +); - render() { - return ( - - {({ - about, - activePage, - avatar, - changeForceLoadPostState, - comments, - currency, - currencyRate, - currencySymbol, - error, - follows, - forceLoadPost, - getReplies, - handleFollowUnfollowUser, - handleMuteUnmuteUser, - handleOnBackPress, - handleOnFavoritePress, - handleOnFollowsPress, - handleOnPressProfileEdit, - isDarkTheme, - isFavorite, - isFollowing, - isLoggedIn, - isMuted, - isOwnProfile, - isProfileLoading, - isReady, - quickProfile, - resourceCredits, - selectedUser, - setEstimatedWalletValue, - username, - votingPower, - }) => ( - - )} - - ); - } -} - -export default injectIntl(ProfileScreen); +export default ProfileScreen; diff --git a/src/utils/editor.js b/src/utils/editor.js index 0a87d2e24..b051aaa5c 100644 --- a/src/utils/editor.js +++ b/src/utils/editor.js @@ -65,7 +65,7 @@ export const makeOptions = (author, permlink, operationType) => { permlink, max_accepted_payout: '1000000.000 SBD', percent_steem_dollars: 10000, - extensions: [[0, { beneficiaries: [{ account: 'esteemapp', weight: 1000 }] }]], + extensions: [[0, { beneficiaries: [{ account: 'esteemapp', weight: 300 }] }]], }; switch (operationType) { diff --git a/src/utils/post.js b/src/utils/post.js index 58e4df014..5c14cfd66 100644 --- a/src/utils/post.js +++ b/src/utils/post.js @@ -1,5 +1,5 @@ export const getPostUrl = url => { - const BASE_URL = 'https://steemit.com'; + const BASE_URL = 'https://esteem.app'; return BASE_URL + url; };