From 9a16e05c54f9d3d7bc53c25f325de329af668288 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Sat, 17 Aug 2019 12:03:15 -0400
Subject: [PATCH] Fix Regression right buttons color on Android navbar when
 enable (#3138)

---
 app/screens/create_channel/create_channel.js     | 1 +
 app/screens/edit_channel/edit_channel.js         | 1 +
 app/screens/edit_post/edit_post.js               | 1 +
 app/screens/edit_profile/edit_profile.js         | 1 +
 app/screens/terms_of_service/terms_of_service.js | 1 +
 app/screens/user_profile/user_profile.js         | 1 +
 6 files changed, 6 insertions(+)

diff --git a/app/screens/create_channel/create_channel.js b/app/screens/create_channel/create_channel.js
index 7ff26e6ee..e4aaf99d0 100644
--- a/app/screens/create_channel/create_channel.js
+++ b/app/screens/create_channel/create_channel.js
@@ -63,6 +63,7 @@ export default class CreateChannel extends PureComponent {
         };
 
         this.rightButton.text = context.intl.formatMessage({id: 'mobile.create_channel', defaultMessage: 'Create'});
+        this.rightButton.color = props.theme.sidebarHeaderTextColor;
 
         if (props.closeButton) {
             this.left = {...this.leftButton, icon: props.closeButton};
diff --git a/app/screens/edit_channel/edit_channel.js b/app/screens/edit_channel/edit_channel.js
index a38b0090a..9f10fcedc 100644
--- a/app/screens/edit_channel/edit_channel.js
+++ b/app/screens/edit_channel/edit_channel.js
@@ -99,6 +99,7 @@ export default class EditChannel extends PureComponent {
             header,
         };
 
+        this.rightButton.color = props.theme.sidebarHeaderTextColor;
         this.rightButton.text = context.intl.formatMessage({id: 'mobile.edit_channel', defaultMessage: 'Save'});
 
         const buttons = {
diff --git a/app/screens/edit_post/edit_post.js b/app/screens/edit_post/edit_post.js
index 871814904..45a781da4 100644
--- a/app/screens/edit_post/edit_post.js
+++ b/app/screens/edit_post/edit_post.js
@@ -53,6 +53,7 @@ export default class EditPost extends PureComponent {
         super(props);
 
         this.state = {message: props.post.message};
+        this.rightButton.color = props.theme.sidebarHeaderTextColor;
         this.rightButton.text = context.intl.formatMessage({id: 'edit_post.save', defaultMessage: 'Save'});
 
         props.actions.setButtons(props.componentId, {
diff --git a/app/screens/edit_profile/edit_profile.js b/app/screens/edit_profile/edit_profile.js
index e55b514b1..75f42530d 100644
--- a/app/screens/edit_profile/edit_profile.js
+++ b/app/screens/edit_profile/edit_profile.js
@@ -119,6 +119,7 @@ export default class EditProfile extends PureComponent {
         const buttons = {
             rightButtons: [this.rightButton],
         };
+        this.rightButton.color = props.theme.sidebarHeaderTextColor;
         this.rightButton.text = context.intl.formatMessage({id: t('mobile.account.settings.save'), defaultMessage: 'Save'});
 
         props.actions.setButtons(props.componentId, buttons);
diff --git a/app/screens/terms_of_service/terms_of_service.js b/app/screens/terms_of_service/terms_of_service.js
index 7294e0781..ceebcb7b7 100644
--- a/app/screens/terms_of_service/terms_of_service.js
+++ b/app/screens/terms_of_service/terms_of_service.js
@@ -63,6 +63,7 @@ export default class TermsOfService extends PureComponent {
         };
 
         this.rightButton.text = context.intl.formatMessage({id: 'terms_of_service.agreeButton', defaultMessage: 'I Agree'});
+        this.rightButton.color = props.theme.sidebarHeaderTextColor;
         this.leftButton.icon = props.closeButton;
 
         this.setNavigatorButtons(false);
diff --git a/app/screens/user_profile/user_profile.js b/app/screens/user_profile/user_profile.js
index 067a7b927..1e1f7d1fb 100644
--- a/app/screens/user_profile/user_profile.js
+++ b/app/screens/user_profile/user_profile.js
@@ -67,6 +67,7 @@ export default class UserProfile extends PureComponent {
         super(props);
 
         if (props.isMyUser) {
+            this.rightButton.color = props.theme.sidebarHeaderTextColor;
             this.rightButton.text = context.intl.formatMessage({id: 'mobile.routes.user_profile.edit', defaultMessage: 'Edit'});
 
             const buttons = {