Merge branch 'master' of https://github.com/esteemapp/esteem-mobile into enhancment/redeem

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"
     }

ios/eSteem-tvOS/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.1</string>
+	<string>2.2.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>6</string>
+	<string>7</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true />
 	<key>UILaunchStoryboardName</key>

ios/eSteem-tvOSTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.1</string>
+	<string>2.2.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>6</string>
+	<string>7</string>
 </dict>
 </plist>

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 = (

ios/eSteem/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.1</string>
+	<string>2.2.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1672</string>
+	<string>1674</string>
 	<key>CodePushDeploymentKey</key>
 	<string>13ThFZsgwk6UZp6mIe95IDbnfw8iHy1jfsn-E</string>
 	<key>LSRequiresIPhoneOS</key>

ios/eSteemTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.1</string>
+	<string>2.2.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>6</string>
+	<string>7</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eSteem",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "private": true,
   "rnpm": {
     "assets": [

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({

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 });
 

src/config/locales/hu-HU.json

@@ -269,7 +269,7 @@
   },
   "payout": {
     "potential_payout": "Lehetséges Kifizetés",
-    "promoted": "Támogatott",
+    "promoted": "Promovált",
     "author_payout": "Szerzői Kifizetés",
     "curation_payout": "Kurátori Kifizetés",
     "payout_date": "Kifizetés"

src/providers/steem/auth.js

@@ -128,7 +128,7 @@ export const loginWithSC2 = async (code, isPinCodeOpen) => {
       postingKey: '',
       activeKey: '',
       memoKey: '',
-      accessToken: scTokens.access_token,
+      accessToken: '',
     };
 
     if (isPinCodeOpen) {
@@ -177,7 +177,9 @@ export const setUserDataWithPinCode = async data => {
         get(userData, 'memoKey') ||
         get(userData, 'postingKey');
 
-      data.password = decryptKey(publicKey, data.pinCode);
+      if (publicKey) {
+        data.password = decryptKey(publicKey, data.pinCode);
+      }
     }
 
     const updatedUserData = getUpdatedUserData(userData, data);

src/providers/steem/steemConnect.js

@@ -90,7 +90,7 @@ export const prepareBeneficiaries = post => {
           beneficiaries: [
             {
               account: 'esteemapp',
-              weight: 1000, // 10%
+              weight: 300, // 3%
             },
           ],
         },

src/screens/application/container/applicationContainer.js

@@ -131,7 +131,7 @@ class ApplicationContainer extends Component {
       if (nextProps.isDarkTheme) {
         changeNavigationBarColor('#1e2835');
       } else {
-        changeNavigationBarColor('#FFFFFF');
+        changeNavigationBarColor('#FFFFFF', true);
       }
     }
 

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,
             });

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) {

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;
 };