From c31ec8a711b38d24f95a86ffdf655ce7d338c98d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20V=C3=A9lez?= Date: Mon, 9 Sep 2024 11:52:18 +0200 Subject: [PATCH] MM-60312- rename ssoOffice 365 to sso EntraId (#8209) * MM-60312- rename ssoOffice 365 to sso EntraId * address pr comments, remove old icon and fix i18n --- .../edit_profile/components/email_field.tsx | 2 +- app/screens/login/sso_options.tsx | 4 ++-- assets/base/i18n/en.json | 2 +- assets/base/images/Icon_EntraID.png | Bin 0 -> 449 bytes assets/base/images/Icon_EntraID@2x.png | Bin 0 -> 785 bytes assets/base/images/Icon_EntraID@3x.png | Bin 0 -> 1126 bytes assets/base/images/Icon_Office.png | Bin 395 -> 0 bytes assets/base/images/Icon_Office@2x.png | Bin 607 -> 0 bytes assets/base/images/Icon_Office@3x.png | Bin 895 -> 0 bytes 9 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 assets/base/images/Icon_EntraID.png create mode 100644 assets/base/images/Icon_EntraID@2x.png create mode 100644 assets/base/images/Icon_EntraID@3x.png delete mode 100644 assets/base/images/Icon_Office.png delete mode 100644 assets/base/images/Icon_Office@2x.png delete mode 100644 assets/base/images/Icon_Office@3x.png 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 0000000000000000000000000000000000000000..87732bcbd2e09847f9f851e344735ef73e6b55c1 GIT binary patch literal 449 zcmV;y0Y3hTP)Px$dr3q=R5(wq)W1suF%$>z?>h$<>*ONT#XrGG_6H@$ITfPx%%Sl8*R9HvN*gsDcK@6=x6|Lm>^Q90fuGMq^_FM8oLYyV=an&Y$;oMsw3#!p-jd_Pu#;=MXUB zLyWi&k^%32mNT*mb5CCGy}^e*&8Fs4JbV)1Y+oW~4na>}?+;v3E~G$419e;pmwVk?4T4;o)Kq-_7rrh44MVFP_QX9S0;I!HEfwlAeG z3Mzu)`?q{r^W)~As3#`#&tDI3u-0TvzOy4&q=cCeu=!~V8bg?6ZttXb`T7Z5U_CE$%1d2AdrK*b_U@6+g0ekJ4}Z3 z0=YO08v=2pLOOwUa5^v*(h3aqI<>*hj{)4AC~r3vLG{M+ZXLYF(asE-Fxr>qvP$Nf4{G^pAwMT>oBdDUfXa1G0m86!YCmN zAhjrbI9G}lstz&-QgPUbvDf*AD}w48Zu=2boULLxDc0w5DjR{`(}{lL{~1BGE(@qG z@<9_6NhvXcTDfLAT}Ts%h0$F*BsFVu4LnffMN$`u*P2irNG%9Q(dF%i-DYez!veZ6 zHmGm}#zYP8uOG#1Z<69iIH9SQrf|-KuBZ)h#XH%0SfI8ZeUTsiU08qg9QKa_jnW|# z0%(T?{dx)%VLRPbz)u`pVCZB`I#GY!*lL}-I$e6vBS_)&hhhMGW;$)b4Fc6gmv1f3 zpS^M^{|6Bc6*2Rs6ksT7`aQ`&9SR@{C=*DES`-j3#%Q{bt_Zq{Ak-q!wQpwW^b^CHrK>~#JUV0mvMaJ)sS&QNOA_faXPE)p|uPx(AW1|)RA@u(n$JsAQ546|a{^ZhlAB5qOo+C%jT$$#Y2iPSwQ&A~7+pkvL2YW` zCU6x6g-#nMM%_eEE7Kh5myl3M5U5b|;ymXLci!CJ=bq<6?`B}${c%3`d+s^s-I)ZA zSxb%?FPs2#D}MJ=T24z)ef;YC8(gbZ8JXc;Q=Y#tg#~DuLKzKsvasE;qc2S-{#Hin zMSvFqJk?B5#i|S>1LOBaL9+v+vaLQ?%BzkPnAIlM$?t5X zOXAGBD2#m)fcn4b;R&wu%m!?N%?GVK949mjuqsHoD%|Oprn4L=D>|?XtW9A~=%~Q1 zu+G5PF|yLpfPG+Xz{#(lnaJsxp+m7FLPr7CHFHAV&wft3|5ZG42jHmofbB?*wB$-uh8!e%@wd}_6!RMa%~pjIK-Od4#bHP@oTx@H1Kx8};xT3||$LN_+Ss)AO2W4NG|z!X?rka7uH`92&u zx(B!jSQmu_d~E10;G$rCfMe(A4semMzQ8e|GhnV&{=-`hO3;d^YR8Psr702G1Y}d&q;PCig`F92J4*NbLLcJN zK5ni8rUoUG&Eh&JO5tJK9F^KKFo*lfHpzEiQEO=*@EDhPw)Fs@=lwYP+mg))5!BXS zF2qVTswL}fReOGmGF|{sixM6D*6U?xJb!Q7o1o{mt6S?8Pdkd^WqH@%jzX;2ZGMG! zkDg{jxA!c0%YOl_s$J*VbzX|v2)b2k0Dg)V6WFF|5U?2J3y$uKu=y4V*m`M~U)So= zDi0W&ygxH`^ICQ6##OC@An5Mqmo8Q1&O~4*_f;7e1S}>(@WBhC)xq)6>?;J!J|)-H z?MNuFkNZXk#tFwKACz0rDgz{5K`j6{SXI&))+vT+`#}2uQ&nXFmfhS1+!5G2DA}?O z=?qiUwg5+QUzRg$+EJ66>wsgrZ{fhEpr!z3Q~H=bC#e*F^GHY2{88#ANBnI0g7Xx1Xa_W{r~^~07*qoM6N<$f@>lRY5)KL literal 0 HcmV?d00001 diff --git a/assets/base/images/Icon_Office.png b/assets/base/images/Icon_Office.png deleted file mode 100644 index f5b90ab556fa69837d9eb03ae134e06b619f6f10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 395 zcmV;60d)R}P)gFSJVNy_TffV55>n|CT(AQM({dLlO-m3kmPzOV$H3BC;ldYOA8GNR;)U ziG1p@r%skA<00q7wP7q(q}7^16hf3_uE{FP;>bM>tM8y5xD^lp!d^WO;YZ+B>DTn> zD9u0X06YLYC_LDOj643I2AGLU%wG(%v&=&~>(gyMye?Ln)VvsW;TpVbKUgbS(e?002ovPDHLkV1gAHqI&=U diff --git a/assets/base/images/Icon_Office@2x.png b/assets/base/images/Icon_Office@2x.png deleted file mode 100644 index 28f8e423781b444aa552be1250f373a4d2283a20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 607 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEoCO|{#S9E$svykh8Km+7D9BhG zAF~$cM?pOh}j@O;cTaom;r?c|6FVOK5v7~D^;Wbws{H1{Ul ziLdJ~tK<)`{wFM``r=}?U()yR&6hiKZ-|zx$d;(TB@t^KwMpd9%d|u9mY&@4E>?l{ zZM|j8?e^?VSC{lwuPREqd{#!cf8NU673*)eDIR*()%X01YX7Y@tXuiL=RcgwT9943 zt5Nx+xRQjrbmP4J5&G*|6J`{1p5JE3KdIc