ecency/ecency-mobile
1
1
Fork 0
mirror of https://github.com/ecency/ecency-mobile.git synced 2024-11-26 09:13:33 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:esteemapp/esteem-mobile into development

Browse Source
This commit is contained in:
Mustafa Buyukcelebi 2019-09-24 10:50:13 +03:00
commit 793e24b948
13 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/build.gradle
View File

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

4
ios/eSteem-tvOS/Info.plist
View File

@ -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>

4
ios/eSteem-tvOSTests/Info.plist
View File

@ -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>

4
ios/eSteem.xcodeproj/project.pbxproj
View File

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

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

Binary file not shown.

4
ios/eSteem/Info.plist
View File

@ -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>

4
ios/eSteemTests/Info.plist
View File

@ -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>

2
package.json
View File

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

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

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

2
src/providers/steem/steemConnect.js
View File

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

10
src/screens/login/container/loginContainer.js
View File

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

2
src/utils/editor.js
View File

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

2
src/utils/post.js
View File

@ -1,5 +1,5 @@
export const getPostUrl = url => {
const BASE_URL = 'https://steemit.com';
const BASE_URL = 'https://esteem.app';
return BASE_URL + url;
};