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

Merge pull request #1118 from esteemapp/bugfix/steemconnect

Browse Source 
Bugfix/steemconnect
This commit is contained in:
uğur erdal 2019-08-29 22:19:21 +03:00 committed by GitHub
commit df271ff1bb
3 changed files with 46 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/containers/pointsContainer.js
View File

@ -228,12 +228,8 @@ class PointsContainer extends Component {
}) })
.catch(error => { .catch(error => {
if (error) { if (error) {
Alert.alert( this.setState({ isLoading: false });
`Fetching data from server failed, please try again or notify us at info@esteem.app \n${error.message.substr( dispatch(toastNotification(intl.formatMessage({ id: 'alert.fail' })));
0,
20,
)}`,
);
} }
}); });
}; };

52
src/screens/boostPost/screen/boostPostScreen.js
View File

@ -117,12 +117,25 @@ class BoostPostScreen extends PureComponent {
const _permlink = get(seperatedPermlink, '[1]'); const _permlink = get(seperatedPermlink, '[1]');
const amount = 150 + 50 * factor; const amount = 150 + 50 * factor;
if (get(currentAccount, 'local.authType') === 'steemConnect') { let userFromRealm;
if (selectedUser) {
userFromRealm = await getUserDataWithUsername(selectedUser);
}
const user = userFromRealm
? {
name: selectedUser,
local: userFromRealm[0],
}
: currentAccount;
if (get(user, 'local.authType') === 'steemConnect') {
const json = JSON.stringify({ const json = JSON.stringify({
user: selectedUser, user: get(user, 'name'),
_author, author: _author,
_permlink, permlink: _permlink,
amount, amount: `${amount.toFixed(3)} POINT`,
}); });
const uri = `sign/custom-json?authority=active&required_auths=%5B%22${selectedUser}%22%5D&required_posting_auths=%5B%5D&id=esteem_boost&json=${encodeURIComponent( const uri = `sign/custom-json?authority=active&required_auths=%5B%22${selectedUser}%22%5D&required_posting_auths=%5B%5D&id=esteem_boost&json=${encodeURIComponent(
@ -134,20 +147,7 @@ class BoostPostScreen extends PureComponent {
SCPath: uri, SCPath: uri,
}); });
} else if (boost) { } else if (boost) {
let userFromRealm; boost(amount, _permlink, _author, user);
if (selectedUser) {
userFromRealm = await getUserDataWithUsername(selectedUser);
}
const user = userFromRealm
? {
name: selectedUser,
local: userFromRealm[0],
}
: currentAccount;
if (amount && _permlink) boost(amount, _permlink, _author, user);
} }
}; };
@ -262,10 +262,10 @@ class BoostPostScreen extends PureComponent {
<MainButton <MainButton
style={styles.quickButtons} style={styles.quickButtons}
isDisable={!(_balance / 50 > factor + 4)} isDisable={!((balance || _balance) / 50 > factor + 4)}
onPress={() => onPress={() =>
this.setState({ this.setState({
factor: _balance / 50 > factor + 4 ? factor + 1 : factor, factor: (balance || _balance) / 50 > factor + 4 ? factor + 1 : factor,
}) })
} }
> >
@ -283,9 +283,11 @@ class BoostPostScreen extends PureComponent {
<MainButton <MainButton
style={styles.button} style={styles.button}
isDisable={ isDisable={
(!permlink ? !get(navigationParams, 'permlink') : permlink) && !(
_balance < 150 && (get(navigationParams, 'permlink') || permlink) &&
(isLoading || !isValid) (balance || _balance) > 150 &&
(!isLoading || isValid)
)
} }
onPress={() => this.startActionSheet.current.show()} onPress={() => this.startActionSheet.current.show()}
isLoading={isLoading} isLoading={isLoading}
@ -307,7 +309,7 @@ class BoostPostScreen extends PureComponent {
cancelButtonIndex={1} cancelButtonIndex={1}
destructiveButtonIndex={0} destructiveButtonIndex={0}
onPress={index => { onPress={index => {
index === 0 && if (index === 0)
this._boost(boost, currentAccount, getUserDataWithUsername, navigationParams); this._boost(boost, currentAccount, getUserDataWithUsername, navigationParams);
}} }}
/> />

34
src/screens/promote/screen/promoteScreen.js
View File

@ -116,11 +116,24 @@ class PointsScreen extends PureComponent {
const _author = get(seperatedPermlink, '[0]'); const _author = get(seperatedPermlink, '[0]');
const _permlink = get(seperatedPermlink, '[1]'); const _permlink = get(seperatedPermlink, '[1]');
if (get(currentAccount, 'local.authType') === 'steemConnect') { let userFromRealm;
if (selectedUser) {
userFromRealm = await getUserDataWithUsername(selectedUser);
}
const user = userFromRealm
? {
name: selectedUser,
local: userFromRealm[0],
}
: currentAccount;
if (get(user, 'local.authType') === 'steemConnect') {
const json = JSON.stringify({ const json = JSON.stringify({
user: selectedUser, user: get(user, 'name'),
_author, author: _author,
_permlink, permlink: _permlink,
duration: day, duration: day,
}); });
@ -133,19 +146,6 @@ class PointsScreen extends PureComponent {
SCPath: uri, SCPath: uri,
}); });
} else if (promote) { } else if (promote) {
let userFromRealm;
if (selectedUser) {
userFromRealm = await getUserDataWithUsername(selectedUser);
}
const user = userFromRealm
? {
name: selectedUser,
local: userFromRealm[0],
}
: currentAccount;
promote(day, _permlink, _author, user); promote(day, _permlink, _author, user);
} }
}; };