From 2ce9a31c49597685715af8fb5d73b8d588dd04ef Mon Sep 17 00:00:00 2001 From: Ali Toshmatov Date: Thu, 1 Jun 2023 16:21:29 +0500 Subject: [PATCH 1/5] Added image, and modifyied qr to have border --- .../images/expensify-logo-round-transparent.png | Bin 0 -> 11762 bytes src/components/QRCode/index.js | 3 ++- src/pages/ShareCodePage.js | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 assets/images/expensify-logo-round-transparent.png diff --git a/assets/images/expensify-logo-round-transparent.png b/assets/images/expensify-logo-round-transparent.png new file mode 100644 index 0000000000000000000000000000000000000000..cfad187e38ef30e7f48de4c8e2d925a745775720 GIT binary patch literal 11762 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 From dcc92f1b322c5dbd2695a3444d1ae5efbbe0d376 Mon Sep 17 00:00:00 2001 From: Ali Toshmatov Date: Thu, 1 Jun 2023 16:26:31 +0500 Subject: [PATCH 2/5] Updated two step authentication verify page to use same logo --- src/pages/ShareCodePage.js | 4 ++-- src/pages/settings/Security/TwoFactorAuth/VerifyPage.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/ShareCodePage.js b/src/pages/ShareCodePage.js index e339e461e521..ed7a813b855b 100644 --- a/src/pages/ShareCodePage.js +++ b/src/pages/ShareCodePage.js @@ -9,7 +9,7 @@ import compose from '../libs/compose'; import reportPropTypes from './reportPropTypes'; import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsDefaultProps, withCurrentUserPersonalDetailsPropTypes} from '../components/withCurrentUserPersonalDetails'; import styles from '../styles/styles'; -import logo from '../../assets/images/expensify-logo-round-transparent.png'; +import expensifyLogo from '../../assets/images/expensify-logo-round-transparent.png'; import * as ReportUtils from '../libs/ReportUtils'; import MenuItem from '../components/MenuItem'; import Clipboard from '../libs/Clipboard'; @@ -61,7 +61,7 @@ class ShareCodePage extends React.Component { url={url} title={isReport ? this.props.report.reportName : this.props.currentUserPersonalDetails.displayName} subtitle={isReport ? subtitle : this.props.session.email} - logo={isReport ? logo : UserUtils.getAvatarUrl(this.props.currentUserPersonalDetails.avatar, this.props.currentUserPersonalDetails.login)} + logo={isReport ? expensifyLogo : UserUtils.getAvatarUrl(this.props.currentUserPersonalDetails.avatar, this.props.currentUserPersonalDetails.login)} /> diff --git a/src/pages/settings/Security/TwoFactorAuth/VerifyPage.js b/src/pages/settings/Security/TwoFactorAuth/VerifyPage.js index 395faa1816bf..3086ba3ccc16 100644 --- a/src/pages/settings/Security/TwoFactorAuth/VerifyPage.js +++ b/src/pages/settings/Security/TwoFactorAuth/VerifyPage.js @@ -18,7 +18,7 @@ import Clipboard from '../../../../libs/Clipboard'; import FixedFooter from '../../../../components/FixedFooter'; import TwoFactorAuthForm from './TwoFactorAuthForm'; import QRCode from '../../../../components/QRCode'; -import expensifyLogo from '../../../../../assets/images/expensify-logo-round-dark.png'; +import expensifyLogo from '../../../../../assets/images/expensify-logo-round-transparent.png'; const propTypes = { ...withLocalizePropTypes, From d892f094a1ed19b49db209b405f39cabbf8e1e56 Mon Sep 17 00:00:00 2001 From: Ali Toshmatov Date: Fri, 2 Jun 2023 21:43:35 +0500 Subject: [PATCH 3/5] Updated qr code to have logo size provided in props --- src/components/QRCode/index.js | 14 ++++++++++++-- src/components/QRShare/index.js | 2 ++ src/components/QRShare/propTypes.js | 8 ++++++++ src/pages/ShareCodePage.js | 2 ++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/components/QRCode/index.js b/src/components/QRCode/index.js index d7d6408f361a..2ef21c2f4043 100644 --- a/src/components/QRCode/index.js +++ b/src/components/QRCode/index.js @@ -13,6 +13,14 @@ const propTypes = { * Follows ImageProps href from react-native-svg that is used by react-native-qrcode-svg. */ logo: PropTypes.oneOfType([PropTypes.shape({uri: PropTypes.string}), PropTypes.number, PropTypes.string]), + /** + * The size ratio of logo to QR code + */ + logoRatio: PropTypes.number, + /** + * The size ratio of margin around logo to QR code + */ + logoMarginRatio: PropTypes.number, /** * The QRCode size */ @@ -38,6 +46,8 @@ const defaultProps = { color: defaultTheme.text, backgroundColor: defaultTheme.highlightBG, getRef: undefined, + logoRatio: 0.25, + logoMarginRatio: 0.02, }; function QRCode(props) { @@ -48,8 +58,8 @@ function QRCode(props) { size={props.size} logo={props.logo} logoBackgroundColor={props.backgroundColor} - logoSize={props.size * 0.3} - logoMargin={props.size * 0.02} + logoSize={props.size * props.logoRatio} + logoMargin={props.size * props.logoMarginRatio} logoBorderRadius={props.size} backgroundColor={props.backgroundColor} color={props.color} diff --git a/src/components/QRShare/index.js b/src/components/QRShare/index.js index 784e32d5410e..0a942c951d9d 100644 --- a/src/components/QRShare/index.js +++ b/src/components/QRShare/index.js @@ -60,6 +60,8 @@ class QRShare extends Component { url={this.props.url} logo={this.props.logo} size={this.state.qrCodeSize} + logoRatio={this.props.logoRatio} + logoMarginRatio={this.props.logoMarginRatio} /> From d70faf71365f80d4c7211db37e28fee88af648ad Mon Sep 17 00:00:00 2001 From: Ali Toshmatov Date: Fri, 2 Jun 2023 21:45:43 +0500 Subject: [PATCH 4/5] Updated verify page with logoRatio --- src/pages/settings/Security/TwoFactorAuth/VerifyPage.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/settings/Security/TwoFactorAuth/VerifyPage.js b/src/pages/settings/Security/TwoFactorAuth/VerifyPage.js index 3086ba3ccc16..948934504981 100644 --- a/src/pages/settings/Security/TwoFactorAuth/VerifyPage.js +++ b/src/pages/settings/Security/TwoFactorAuth/VerifyPage.js @@ -110,6 +110,8 @@ function VerifyPage(props) { {props.translate('twoFactorAuth.addKey')} From 538406c25d770333f559283f4ab3669d55b751ff Mon Sep 17 00:00:00 2001 From: Ali Toshmatov Date: Sun, 4 Jun 2023 12:22:17 +0500 Subject: [PATCH 5/5] Extracted values into CONST --- src/CONST.js | 6 ++++++ src/components/QRCode/index.js | 5 +++-- src/pages/ShareCodePage.js | 4 ++-- src/pages/settings/Security/TwoFactorAuth/VerifyPage.js | 5 +++-- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/CONST.js b/src/CONST.js index 4557c66a42cc..42e27f7ad28f 100755 --- a/src/CONST.js +++ b/src/CONST.js @@ -2443,6 +2443,12 @@ const CONST = { FLAG_SEVERITY_HARASSMENT: 'harassment', FLAG_SEVERITY_ASSAULT: 'assault', }, + QR: { + DEFAULT_LOGO_SIZE_RATIO: 0.25, + DEFAULT_LOGO_MARGIN_RATIO: 0.02, + EXPENSIFY_LOGO_SIZE_RATIO: 0.22, + EXPENSIFY_LOGO_MARGIN_RATIO: 0.03, + }, }; export default CONST; diff --git a/src/components/QRCode/index.js b/src/components/QRCode/index.js index 2ef21c2f4043..f27cf28066ef 100644 --- a/src/components/QRCode/index.js +++ b/src/components/QRCode/index.js @@ -2,6 +2,7 @@ import React from 'react'; import QRCodeLibrary from 'react-native-qrcode-svg'; import PropTypes from 'prop-types'; import defaultTheme from '../../styles/themes/default'; +import CONST from '../../CONST'; const propTypes = { /** @@ -46,8 +47,8 @@ const defaultProps = { color: defaultTheme.text, backgroundColor: defaultTheme.highlightBG, getRef: undefined, - logoRatio: 0.25, - logoMarginRatio: 0.02, + logoRatio: CONST.QR.DEFAULT_LOGO_SIZE_RATIO, + logoMarginRatio: CONST.QR.DEFAULT_LOGO_MARGIN_RATIO, }; function QRCode(props) { diff --git a/src/pages/ShareCodePage.js b/src/pages/ShareCodePage.js index 4c3ffc536098..84eefb986330 100644 --- a/src/pages/ShareCodePage.js +++ b/src/pages/ShareCodePage.js @@ -62,8 +62,8 @@ class ShareCodePage extends React.Component { title={isReport ? this.props.report.reportName : this.props.currentUserPersonalDetails.displayName} subtitle={isReport ? subtitle : this.props.session.email} logo={isReport ? expensifyLogo : UserUtils.getAvatarUrl(this.props.currentUserPersonalDetails.avatar, this.props.currentUserPersonalDetails.login)} - logoRatio={isReport ? 0.22 : 0.25} - logoMarginRatio={isReport ? 0.03 : 0.02} + logoRatio={isReport ? CONST.QR.EXPENSIFY_LOGO_SIZE_RATIO : CONST.QR.DEFAULT_LOGO_SIZE_RATIO} + logoMarginRatio={isReport ? CONST.QR.EXPENSIFY_LOGO_MARGIN_RATIO : CONST.QR.DEFAULT_LOGO_MARGIN_RATIO} /> diff --git a/src/pages/settings/Security/TwoFactorAuth/VerifyPage.js b/src/pages/settings/Security/TwoFactorAuth/VerifyPage.js index 948934504981..e3273939e02b 100644 --- a/src/pages/settings/Security/TwoFactorAuth/VerifyPage.js +++ b/src/pages/settings/Security/TwoFactorAuth/VerifyPage.js @@ -19,6 +19,7 @@ import FixedFooter from '../../../../components/FixedFooter'; import TwoFactorAuthForm from './TwoFactorAuthForm'; import QRCode from '../../../../components/QRCode'; import expensifyLogo from '../../../../../assets/images/expensify-logo-round-transparent.png'; +import CONST from '../../../../CONST'; const propTypes = { ...withLocalizePropTypes, @@ -110,8 +111,8 @@ function VerifyPage(props) { {props.translate('twoFactorAuth.addKey')}