From 66036d77e96c3db2e54be2fd79129790ec2adb18 Mon Sep 17 00:00:00 2001 From: Sadaqat Ali Date: Tue, 1 Feb 2022 08:35:35 +0500 Subject: [PATCH 1/2] fixed dropdown touch bug in seetings screen --- .../dropdownButton/view/dropdownButtonStyles.js | 4 ++++ .../dropdownButton/view/dropdownButtonView.tsx | 17 +++++++++++------ .../settingsItem/view/settingsItemStyles.js | 2 ++ .../settingsItem/view/settingsItemView.js | 1 + 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/components/dropdownButton/view/dropdownButtonStyles.js b/src/components/dropdownButton/view/dropdownButtonStyles.js index 4de9a3e5b..3b0327c54 100644 --- a/src/components/dropdownButton/view/dropdownButtonStyles.js +++ b/src/components/dropdownButton/view/dropdownButtonStyles.js @@ -82,4 +82,8 @@ export default EStyleSheet.create({ color: '$primaryDarkGray', textAlign: 'left', }, + childrenWrapper: { + flexDirection: 'row', + alignItems: 'center', + }, }); diff --git a/src/components/dropdownButton/view/dropdownButtonView.tsx b/src/components/dropdownButton/view/dropdownButtonView.tsx index bcab9f215..d7a0070b2 100644 --- a/src/components/dropdownButton/view/dropdownButtonView.tsx +++ b/src/components/dropdownButton/view/dropdownButtonView.tsx @@ -97,12 +97,17 @@ const DropdownButtonView = ({ adjustFrame={(style: any) => adjustDropdownFrame(style) } > {isHasChildIcon && !isLoading ? ( - - + + + {defaultText} + + + + ) : ( isHasChildIcon && diff --git a/src/components/settingsItem/view/settingsItemStyles.js b/src/components/settingsItem/view/settingsItemStyles.js index e49a5de81..2ea14f0c6 100644 --- a/src/components/settingsItem/view/settingsItemStyles.js +++ b/src/components/settingsItem/view/settingsItemStyles.js @@ -19,6 +19,7 @@ export default EStyleSheet.create({ paddingLeft: 16, paddingHorizontal: 14, color: '$primaryDarkGray', + flex: 1, }, rowTextStyle: { fontSize: 12, @@ -43,6 +44,7 @@ export default EStyleSheet.create({ flexGrow: 1, height: 'auto', width: 150, + justifyContent: 'center', }, textStyle: { color: '$primaryBlue', diff --git a/src/components/settingsItem/view/settingsItemView.js b/src/components/settingsItem/view/settingsItemView.js index 82d5d47c1..8f6b1fa6b 100644 --- a/src/components/settingsItem/view/settingsItemView.js +++ b/src/components/settingsItem/view/settingsItemView.js @@ -51,6 +51,7 @@ class SettingsItemView extends PureComponent { textStyle={styles.dropdownText} options={options} onSelect={(e) => handleOnChange(e, type, actionType)} + isHasChildIcon /> ); From 2f2b01f01bf40832022ff9a2cca580e98fb0ad1d Mon Sep 17 00:00:00 2001 From: feruz Date: Fri, 4 Feb 2022 14:26:37 +0200 Subject: [PATCH 2/2] rename custom_json ops --- src/containers/redeemContainer.js | 2 +- src/providers/hive/dhive.js | 6 +++--- src/screens/transfer/screen/transferScreen.js | 2 +- src/screens/transfer/screen/transferTokenScreen.js | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/containers/redeemContainer.js b/src/containers/redeemContainer.js index 585f6dc9c..203101120 100644 --- a/src/containers/redeemContainer.js +++ b/src/containers/redeemContainer.js @@ -58,7 +58,7 @@ class RedeemContainer extends Component { permlink, ...specificParam, }); - const uriType = redeemType === 'promote' ? 'esteem_promote' : 'esteem_boost'; + const uriType = redeemType === 'promote' ? 'ecency_promote' : 'ecency_boost'; const uri = `sign/custom-json?authority=active&required_auths=%5B%22${get( user, diff --git a/src/providers/hive/dhive.js b/src/providers/hive/dhive.js index 0993e2f99..d3aa95ac3 100644 --- a/src/providers/hive/dhive.js +++ b/src/providers/hive/dhive.js @@ -1562,7 +1562,7 @@ export const transferPoint = (currentAccount, pinCode, data) => { const privateKey = PrivateKey.fromString(key); const op = { - id: 'esteem_point_transfer', + id: 'ecency_point_transfer', json, required_auths: [username], required_posting_auths: [], @@ -1585,7 +1585,7 @@ export const promote = (currentAccount, pinCode, duration, permlink, author) => const user = get(currentAccount, 'name'); const json = { - id: 'esteem_promote', + id: 'ecency_promote', json: JSON.stringify({ user, author, @@ -1614,7 +1614,7 @@ export const boost = (currentAccount, pinCode, point, permlink, author) => { const user = get(currentAccount, 'name'); const json = { - id: 'esteem_boost', + id: 'ecency_boost', json: JSON.stringify({ user, author, diff --git a/src/screens/transfer/screen/transferScreen.js b/src/screens/transfer/screen/transferScreen.js index 6ca7aa983..f230fcd20 100644 --- a/src/screens/transfer/screen/transferScreen.js +++ b/src/screens/transfer/screen/transferScreen.js @@ -156,7 +156,7 @@ const TransferView = ({ path = `sign/custom-json?authority=active&required_auths=%5B%22${get( selectedAccount, 'name', - )}%22%5D&required_posting_auths=%5B%5D&id=esteem_point_transfer&json=${encodeURIComponent( + )}%22%5D&required_posting_auths=%5B%5D&id=ecency_point_transfer&json=${encodeURIComponent( json, )}`; } else if (transferType === 'transfer_to_savings') { diff --git a/src/screens/transfer/screen/transferTokenScreen.js b/src/screens/transfer/screen/transferTokenScreen.js index 0fc2abfed..40ddb77df 100644 --- a/src/screens/transfer/screen/transferTokenScreen.js +++ b/src/screens/transfer/screen/transferTokenScreen.js @@ -161,7 +161,7 @@ class TransferTokenView extends Component { path = `sign/custom-json?authority=active&required_auths=%5B%22${get( selectedAccount, 'name', - )}%22%5D&required_posting_auths=%5B%5D&id=esteem_point_transfer&json=${encodeURIComponent( + )}%22%5D&required_posting_auths=%5B%5D&id=ecency_point_transfer&json=${encodeURIComponent( json, )}`; } else {