Merge branch 'development' into nt/comments-cache

src/components/dropdownButton/view/dropdownButtonStyles.js

@@ -82,4 +82,8 @@ export default EStyleSheet.create({
     color: '$primaryDarkGray',
     textAlign: 'left',
   },
+  childrenWrapper: {
+    flexDirection: 'row',
+    alignItems: 'center',
+  },
 });

src/components/dropdownButton/view/dropdownButtonView.tsx

@@ -97,12 +97,17 @@ const DropdownButtonView = ({
       adjustFrame={(style: any) => adjustDropdownFrame(style) }
     >
       {isHasChildIcon && !isLoading ? (
-        <View style={[styles.iconWrapper, childIconWrapperStyle && childIconWrapperStyle]}>
-          <Icon
-            style={[styles.dropdownIcon, iconStyle]}
-            iconType="MaterialIcons"
-            name={!iconName ? 'arrow-drop-down' : iconName}
-          />
+        <View style={styles.childrenWrapper}>
+          <Text style={[textStyle || styles.buttonText]}>
+            {defaultText}
+          </Text>
+          <View style={[styles.iconWrapper, childIconWrapperStyle && childIconWrapperStyle]}>
+            <Icon
+              style={[styles.dropdownIcon, iconStyle]}
+              iconType="MaterialIcons"
+              name={!iconName ? 'arrow-drop-down' : iconName}
+            />
+          </View>
         </View>
       ) : (
         isHasChildIcon && <ActivityIndicator />

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',

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

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,

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,

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

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 {