From 5a01b0e387df923206f1e85230c2fe512a904f6c Mon Sep 17 00:00:00 2001 From: Devin <168687171+Devin-Apps@users.noreply.github.com> Date: Thu, 13 Jun 2024 21:06:41 +0530 Subject: [PATCH 1/8] Migrate from Typography to Text in signature-request-original.component.js --- .../signature-request-original.component.js | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js b/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js index 08fe9b727889..506324d8d067 100644 --- a/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js +++ b/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js @@ -18,11 +18,8 @@ import { } from '../../../../helpers/utils/util'; import { isSuspiciousResponse } from '../../../../../shared/modules/security-provider.utils'; import SiteOrigin from '../../../../components/ui/site-origin'; -import Typography from '../../../../components/ui/typography/typography'; import { PageContainerFooter } from '../../../../components/ui/page-container'; import { - TypographyVariant, - FontWeight, TextAlign, TextColor, Size, @@ -221,23 +218,22 @@ export default class SignatureRequestOriginal extends Component { ///: END:ONLY_INCLUDE_IF } - {this.context.t('sigRequest')} - - + {this.context.t('signatureRequestGuidance')} - +
{notice}
{rows.map(({ name, value }, index) => { From 86e5a5bbb64c1374fef0fde7a2cd1ed8523437fa Mon Sep 17 00:00:00 2001 From: Devin <168687171+Devin-Apps@users.noreply.github.com> Date: Thu, 13 Jun 2024 21:07:28 +0530 Subject: [PATCH 2/8] Updated snapshots --- .../__snapshots__/signature-request-original.test.js.snap | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/pages/confirmations/components/signature-request-original/__snapshots__/signature-request-original.test.js.snap b/ui/pages/confirmations/components/signature-request-original/__snapshots__/signature-request-original.test.js.snap index 397ee6f14ffd..935c691ae87b 100644 --- a/ui/pages/confirmations/components/signature-request-original/__snapshots__/signature-request-original.test.js.snap +++ b/ui/pages/confirmations/components/signature-request-original/__snapshots__/signature-request-original.test.js.snap @@ -210,15 +210,15 @@ exports[`SignatureRequestOriginal should match snapshot 1`] = `

Signature request

-
Only sign this message if you fully understand the content and trust the requesting site. -
+

From daa674de4d84569e2bdf13b7888498d2383f720c Mon Sep 17 00:00:00 2001 From: Devin <168687171+Devin-Apps@users.noreply.github.com> Date: Thu, 13 Jun 2024 21:44:26 +0530 Subject: [PATCH 3/8] Fixed import errors --- .../signature-request-original.component.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js b/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js index 506324d8d067..9c23a886b45c 100644 --- a/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js +++ b/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js @@ -20,6 +20,7 @@ import { isSuspiciousResponse } from '../../../../../shared/modules/security-pro import SiteOrigin from '../../../../components/ui/site-origin'; import { PageContainerFooter } from '../../../../components/ui/page-container'; import { + TextVariant, TextAlign, TextColor, Size, @@ -27,17 +28,16 @@ import { IconColor, Display, BlockSize, - TextVariant, BackgroundColor, ///: END:ONLY_INCLUDE_IF } from '../../../../helpers/constants/design-system'; import { ButtonLink, + Text, ///: BEGIN:ONLY_INCLUDE_IF(build-mmi) Box, Icon, IconName, - Text, ///: END:ONLY_INCLUDE_IF } from '../../../../components/component-library'; From 91e0cd69cd9c39a0f9f988c9575f7f8354d617ed Mon Sep 17 00:00:00 2001 From: "devin-ai-integration[bot]" <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2024 12:52:59 +0000 Subject: [PATCH 4/8] Fixed order of imports --- .../signature-request-original.component.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js b/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js index 9c23a886b45c..6020db9408d8 100644 --- a/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js +++ b/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js @@ -20,7 +20,6 @@ import { isSuspiciousResponse } from '../../../../../shared/modules/security-pro import SiteOrigin from '../../../../components/ui/site-origin'; import { PageContainerFooter } from '../../../../components/ui/page-container'; import { - TextVariant, TextAlign, TextColor, Size, @@ -28,6 +27,7 @@ import { IconColor, Display, BlockSize, + TextVariant, BackgroundColor, ///: END:ONLY_INCLUDE_IF } from '../../../../helpers/constants/design-system'; From 26c051be96fcbc08d647273383b259dc36ac9fd6 Mon Sep 17 00:00:00 2001 From: Devin <168687171+Devin-Apps@users.noreply.github.com> Date: Thu, 27 Jun 2024 18:35:37 +0530 Subject: [PATCH 5/8] Resolved prep-build failure --- .../signature-request-original.component.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js b/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js index e6f4c559d428..8d441e12f064 100644 --- a/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js +++ b/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js @@ -21,11 +21,11 @@ import { TextAlign, TextColor, Size, + TextVariant, ///: BEGIN:ONLY_INCLUDE_IF(build-mmi) IconColor, Display, BlockSize, - TextVariant, BackgroundColor, ///: END:ONLY_INCLUDE_IF } from '../../../../helpers/constants/design-system'; From 68adf3bd7736781001025ce09ae0ae4cea130c9a Mon Sep 17 00:00:00 2001 From: Devin <168687171+Devin-Apps@users.noreply.github.com> Date: Thu, 27 Jun 2024 18:47:07 +0530 Subject: [PATCH 6/8] Update signature-request-original.component.js --- .../signature-request-original.component.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js b/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js index 8d441e12f064..8ab04da661d8 100644 --- a/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js +++ b/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js @@ -31,11 +31,11 @@ import { } from '../../../../helpers/constants/design-system'; import { ButtonLink, - Text, ///: BEGIN:ONLY_INCLUDE_IF(build-mmi) Box, Icon, IconName, + Text, ///: END:ONLY_INCLUDE_IF } from '../../../../components/component-library'; From a8b2f4e4888ae0663b268dca11933f386bfc62a3 Mon Sep 17 00:00:00 2001 From: Devin <168687171+Devin-Apps@users.noreply.github.com> Date: Thu, 27 Jun 2024 19:36:51 +0530 Subject: [PATCH 7/8] Resolving prep-build issues --- .../signature-request-original.component.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js b/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js index 8ab04da661d8..8d441e12f064 100644 --- a/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js +++ b/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js @@ -31,11 +31,11 @@ import { } from '../../../../helpers/constants/design-system'; import { ButtonLink, + Text, ///: BEGIN:ONLY_INCLUDE_IF(build-mmi) Box, Icon, IconName, - Text, ///: END:ONLY_INCLUDE_IF } from '../../../../components/component-library'; From 8032fdd564b815a57c6cf215a0e3d9071fd54325 Mon Sep 17 00:00:00 2001 From: "devin-ai-integration[bot]" <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 00:35:30 +0000 Subject: [PATCH 8/8] Reorder imports according to environment tags in signature-request-original.component.js --- .../signature-request-original.component.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js b/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js index 8d441e12f064..8ab04da661d8 100644 --- a/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js +++ b/ui/pages/confirmations/components/signature-request-original/signature-request-original.component.js @@ -31,11 +31,11 @@ import { } from '../../../../helpers/constants/design-system'; import { ButtonLink, - Text, ///: BEGIN:ONLY_INCLUDE_IF(build-mmi) Box, Icon, IconName, + Text, ///: END:ONLY_INCLUDE_IF } from '../../../../components/component-library';