diff --git a/app/screens/edit_profile/components/email_field.tsx b/app/screens/edit_profile/components/email_field.tsx index 8778b0db6..94ee46ac1 100644 --- a/app/screens/edit_profile/components/email_field.tsx +++ b/app/screens/edit_profile/components/email_field.tsx @@ -15,7 +15,7 @@ import type {FloatingTextInputRef} from '@components/floating_text_input_label'; const services: Record = { gitlab: 'GitLab', google: 'Google Apps', - office365: 'Office 365', + office365: 'Entra ID', ldap: 'AD/LDAP', saml: 'SAML', }; diff --git a/app/screens/login/sso_options.tsx b/app/screens/login/sso_options.tsx index 302987326..9ec3bc321 100644 --- a/app/screens/login/sso_options.tsx +++ b/app/screens/login/sso_options.tsx @@ -46,8 +46,8 @@ const SsoOptions = ({goToSso, ssoOnly, ssoOptions, theme}: Props) => { sso.imageSrc = require('@assets/images/Icon_Google.png'); break; case Sso.OFFICE365: - sso.text = formatMessage({id: 'mobile.login_options.office365', defaultMessage: 'Office 365'}); - sso.imageSrc = require('@assets/images/Icon_Office.png'); + sso.text = formatMessage({id: 'mobile.login_options.entraid', defaultMessage: 'Entra ID'}); + sso.imageSrc = require('@assets/images/Icon_EntraID.png'); break; case Sso.OPENID: sso.text = options.text || formatMessage({id: 'mobile.login_options.openid', defaultMessage: 'Open ID'}); diff --git a/assets/base/i18n/en.json b/assets/base/i18n/en.json index 27e7df620..6adffcd30 100644 --- a/assets/base/i18n/en.json +++ b/assets/base/i18n/en.json @@ -657,11 +657,11 @@ "mobile.link.error.title": "Error", "mobile.login_options.cant_heading": "Can't Log In", "mobile.login_options.enter_credentials": "Enter your login details below.", + "mobile.login_options.entraid": "Entra ID", "mobile.login_options.gitlab": "GitLab", "mobile.login_options.google": "Google", "mobile.login_options.heading": "Log In to Your Account", "mobile.login_options.none": "You can't log in to your account yet. At least one login option must be configured. Contact your System Admin for assistance.", - "mobile.login_options.office365": "Office 365", "mobile.login_options.openid": "Open ID", "mobile.login_options.saml": "SAML", "mobile.login_options.select_option": "Select a login option below.", diff --git a/assets/base/images/Icon_EntraID.png b/assets/base/images/Icon_EntraID.png new file mode 100644 index 000000000..87732bcbd Binary files /dev/null and b/assets/base/images/Icon_EntraID.png differ diff --git a/assets/base/images/Icon_EntraID@2x.png b/assets/base/images/Icon_EntraID@2x.png new file mode 100644 index 000000000..a0d68a601 Binary files /dev/null and b/assets/base/images/Icon_EntraID@2x.png differ diff --git a/assets/base/images/Icon_EntraID@3x.png b/assets/base/images/Icon_EntraID@3x.png new file mode 100644 index 000000000..0e0e149d1 Binary files /dev/null and b/assets/base/images/Icon_EntraID@3x.png differ diff --git a/assets/base/images/Icon_Office.png b/assets/base/images/Icon_Office.png deleted file mode 100644 index f5b90ab55..000000000 Binary files a/assets/base/images/Icon_Office.png and /dev/null differ diff --git a/assets/base/images/Icon_Office@2x.png b/assets/base/images/Icon_Office@2x.png deleted file mode 100644 index 28f8e4237..000000000 Binary files a/assets/base/images/Icon_Office@2x.png and /dev/null differ diff --git a/assets/base/images/Icon_Office@3x.png b/assets/base/images/Icon_Office@3x.png deleted file mode 100644 index 18db79a37..000000000 Binary files a/assets/base/images/Icon_Office@3x.png and /dev/null differ