From 575653f0fdcf426753e6fbc2626691f8f336452c Mon Sep 17 00:00:00 2001 From: Amy Chen Date: Mon, 3 Feb 2025 15:06:07 -0800 Subject: [PATCH 1/9] Update Attestation content, add logout button --- .../public/images/logos/orgs/nida.svg | 46 +++++++++++++++++++ .../Attestation/AttestationFooter.tsx | 18 +------- .../StandardAttestationConfirmation.tsx | 20 ++++---- .../src/components/Header/LogoutButton.tsx | 35 ++++++++++++++ .../src/components/Header/UserButton.tsx | 6 +-- .../containers/Attestation/Attestation.tsx | 21 ++++++--- .../src/containers/Header/Header.tsx | 9 +++- src/ui-client/src/styles/custom.css | 30 +++++++++++- 8 files changed, 147 insertions(+), 38 deletions(-) create mode 100644 src/ui-client/public/images/logos/orgs/nida.svg create mode 100644 src/ui-client/src/components/Header/LogoutButton.tsx diff --git a/src/ui-client/public/images/logos/orgs/nida.svg b/src/ui-client/public/images/logos/orgs/nida.svg new file mode 100644 index 000000000..09e2e8b84 --- /dev/null +++ b/src/ui-client/public/images/logos/orgs/nida.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/ui-client/src/components/Attestation/AttestationFooter.tsx b/src/ui-client/src/components/Attestation/AttestationFooter.tsx index 63600b18d..601feedc8 100644 --- a/src/ui-client/src/components/Attestation/AttestationFooter.tsx +++ b/src/ui-client/src/components/Attestation/AttestationFooter.tsx @@ -41,22 +41,8 @@ export default class AttestationFooter extends React.PureComponent return createPortal(
- Planning to publish your results? - Great! Please cite this manuscript to ensure we can continue making Leaf even better: -
-
- - - Nicholas J Dobbins, Clifford H Spital, Robert A Black, Jason M Morrison, Bas de Veer, Elizabeth Zampino, Robert D Harrington, - Bethene D Britt, Kari A Stephens, Adam B Wilcox, Peter Tarczy-Hornoch, Sean D Mooney. - - - Leaf: an open-source, model-agnostic, data-driven web application for cohort discovery and translational biomedical research. - - - Journal of the American Medical Informatics Association, ocz165, https://doi.org/10.1093/jamia/ocz165 - - + leaf-logo + For more information about the Leaf data visualization tool, please click here.
, backdrop diff --git a/src/ui-client/src/components/Attestation/StandardAttestationConfirmation.tsx b/src/ui-client/src/components/Attestation/StandardAttestationConfirmation.tsx index fd1916c0b..fe4c90fc2 100644 --- a/src/ui-client/src/components/Attestation/StandardAttestationConfirmation.tsx +++ b/src/ui-client/src/components/Attestation/StandardAttestationConfirmation.tsx @@ -26,15 +26,15 @@ interface Props { export default class StandardAttestationConfirmation extends React.PureComponent { public render() { const c = this.props.className; - const { show, handleGoBackClick, handleIAgreeClick, isIdentified, sessionType, sessionLoadDisplay, hasAttested, isSubmittingAttestation, config } = this.props; + const { show, handleIAgreeClick, sessionLoadDisplay, hasAttested, isSubmittingAttestation, config } = this.props; const confirmationClass = `${c}-confirmation-container ${show ? 'show' : ''}` - const useDisplay = sessionType === SessionType.Research ? 'Research' : 'Quality Improvement'; - const phiDisplay = isIdentified ? 'Identified' : 'Deidentified'; + // const useDisplay = sessionType === SessionType.Research ? 'Research' : 'Quality Improvement'; + // const phiDisplay = isIdentified ? 'Identified' : 'Deidentified'; const showText = config && config.attestation.enabled; return (
- {showText && [ + {/* {showText && [
{useDisplay} - {phiDisplay}
, @@ -42,23 +42,25 @@ export default class StandardAttestationConfirmation extends React.PureComponent I attest that the information I have entered is accurate and I will use the application, Leaf, as I have indicated.

- ]} + ]} */} + {/* make this text configurable, maybe need to modify the model include this custom text, see https://github.com/uwcirg/leaf/blob/master/src/server/Model/Options/AttestationOptions.cs */} +

HIV Success uses Leaf, a self-service tool which provides a user-friendly interface to execute queries and retrieve information about study data.

{!(isSubmittingAttestation || hasAttested) &&
- {config && !config.attestation.skipModeSelection && + {/* {config && !config.attestation.skipModeSelection && - } + } */}
} diff --git a/src/ui-client/src/components/Header/LogoutButton.tsx b/src/ui-client/src/components/Header/LogoutButton.tsx new file mode 100644 index 000000000..d4b505de4 --- /dev/null +++ b/src/ui-client/src/components/Header/LogoutButton.tsx @@ -0,0 +1,35 @@ +/* Copyright (c) 2022, UW Medicine Research IT, University of Washington + * Developed by Nic Dobbins and Cliff Spital, CRIO Sean Mooney + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +import React from 'react'; +import { NavItem } from 'reactstrap'; +import { FaDoorOpen } from 'react-icons/fa'; +import { AuthorizationState } from '../../models/state/AppState'; + +interface Props { + auth?: AuthorizationState; + logoutClickHandler: () => any; +} + +export default class UserButton extends React.PureComponent { + private className = 'header'; + + public render() { + const c = this.className; + const { auth, logoutClickHandler} = this.props; + const authLogoutEnabled = auth && auth.config && auth.config.authentication.logout.enabled; + if (!authLogoutEnabled) return null; + return ( + +
+ + Log Out +
+ + ); + } +} diff --git a/src/ui-client/src/components/Header/UserButton.tsx b/src/ui-client/src/components/Header/UserButton.tsx index 8a65dcf32..89b48aca5 100644 --- a/src/ui-client/src/components/Header/UserButton.tsx +++ b/src/ui-client/src/components/Header/UserButton.tsx @@ -8,7 +8,7 @@ import React from 'react'; import { NavItem } from 'reactstrap'; import { FiUser, FiUserCheck, FiShield, FiGlobe, FiAlertOctagon, FiUsers, FiHelpCircle } from 'react-icons/fi'; -import { FaChevronDown, FaStar, FaDoorOpen } from 'react-icons/fa'; +import { FaChevronDown, FaStar } from 'react-icons/fa'; import { UserContext } from '../../models/Auth'; import ImportState from '../../models/state/Import'; import { MyLeafTabType } from '../../models/state/GeneralUiState'; @@ -122,12 +122,12 @@ export default class UserButton extends React.PureComponent {
- {auth && auth.config && auth.config.authentication.logout.enabled && + {/* {auth && auth.config && auth.config.authentication.logout.enabled &&
Log Out
- } + } */}
diff --git a/src/ui-client/src/containers/Attestation/Attestation.tsx b/src/ui-client/src/containers/Attestation/Attestation.tsx index 489656063..82a173448 100644 --- a/src/ui-client/src/containers/Attestation/Attestation.tsx +++ b/src/ui-client/src/containers/Attestation/Attestation.tsx @@ -66,6 +66,7 @@ class Attestation extends React.PureComponent { constructor(props: Props) { super(props); + const {config} = props; this.state = { attestation: { documentation: this.defaultDocumentation, @@ -73,11 +74,11 @@ class Attestation extends React.PureComponent { sessionType: SessionType.Research }, documentationExpDateString: '', - documentationStatusSelected: false, + documentationStatusSelected: !config?.attestation?.documentStatusSelectionRequired, hasApprovedIrb: false, hasApprovedQi: false, - identificationTypeSelected: false, - sessionTypeSelected: false + identificationTypeSelected: !config?.attestation?.identificationTypeRequired, + sessionTypeSelected: SessionType.Research } } @@ -154,12 +155,15 @@ class Attestation extends React.PureComponent { v{pkg.version} -
+
+ nida-logo +
+ {/*
iths-logo
cd2h-logo -
+
*/} {/* Optional instance logo row */} {config && config.attestation.credits.enabled && @@ -184,11 +188,14 @@ class Attestation extends React.PureComponent {
- {userContext && !userContext.isPhiOkay && + {/* {userContext && !userContext.isPhiOkay && +
+

Participant data restricted to De-Identified mode only

+
+ } */}

Participant data restricted to De-Identified mode only

- } {auth.error &&
diff --git a/src/ui-client/src/containers/Header/Header.tsx b/src/ui-client/src/containers/Header/Header.tsx index a339efa97..b684cdaff 100644 --- a/src/ui-client/src/containers/Header/Header.tsx +++ b/src/ui-client/src/containers/Header/Header.tsx @@ -24,6 +24,7 @@ import { getPanelItemCount } from '../../utils/panelUtils'; import { logout } from '../../actions/session'; import NewQueryButton from '../../components/Header/NewQueryButton'; import DatabasesButton from '../../components/Header/DatabasesButton'; +import LogoutButton from '../../components/Header/LogoutButton'; import UserButton from '../../components/Header/UserButton'; import ImportButton from '../../components/Header/ImportButton'; import ImportState from '../../models/state/Import'; @@ -89,11 +90,15 @@ class Header extends React.PureComponent { federated={responders.size > 1} imports={importState} helpClickHandler={this.handleGetHelpClick} - logoutClickHandler={this.handleLogoutClick} + //logoutClickHandler={this.handleLogoutClick} myLeafModalToggleHandler={this.handleMyleafModalToggleClick} user={user} /> - + {/* Logout */} +
diff --git a/src/ui-client/src/styles/custom.css b/src/ui-client/src/styles/custom.css index ac7943fb7..7ce75e692 100644 --- a/src/ui-client/src/styles/custom.css +++ b/src/ui-client/src/styles/custom.css @@ -128,14 +128,42 @@ button.concept-search-roots-dropdown-toggle.dropdown-toggle.btn.btn-secondary:ho } /* Attestation modal */ +.attestation-footer-text .logo { + margin: -4px 0 4px; +} .attestation-leaf-logo { border-radius: 0; } +.attestation-modal-wrap .modal-title { + display: flex; + align-items: center; + justify-content: space-between; +} +.attestation-modal-wrap .attestation-leaf-logo-wrapper { + flex: 3; + margin-top: 8px; +} +.attestation-modal-wrap .attestation-nida-logo-wrapper { + flex: 1; +} +.attestation-modal-wrap .attestation-nida-logo-wrapper img { + height: 48px; +} .attestation-modal-wrap .attestation-title { margin-left: 4px; font-size: 2rem; } - +.attestation-confirmation-footer { + text-align: center; +} +.attestation-confirmation-footer button { + font-size: 1.4rem; +} +.attestation-nida-logo { + height: 56px; + -webkit-transform: scale(0.8); + transform: scale(0.8); +} /* Visualize */ .visualization-no-data-container { color: #777; From d7d1f4ecebf1da5a8829d28df5afd45f79fbc959 Mon Sep 17 00:00:00 2001 From: Amy Chen Date: Mon, 3 Feb 2025 17:22:48 -0800 Subject: [PATCH 2/9] update appsettings json file, fix custom attestation content --- src/server/API/appsettings.json | 14 +++++-- .../CustomAttestationConfirmation.tsx | 39 +++++++++---------- .../containers/Attestation/Attestation.tsx | 6 +-- src/ui-client/src/styles/custom.css | 2 + 4 files changed, 35 insertions(+), 26 deletions(-) diff --git a/src/server/API/appsettings.json b/src/server/API/appsettings.json index 9d6c3876e..1acab088a 100644 --- a/src/server/API/appsettings.json +++ b/src/server/API/appsettings.json @@ -51,14 +51,18 @@ "RolesMapping": { "User": "urn:mace:users", "Super": "urn:mace:supers", - "Identified": "urn:mace:phi", "Admin": "urn:mace:sudos", "Federated": "urn:mace:federated" } } }, "Attestation": { - "Enabled": true + "Enabled": true, + "Text": [ + "HIV Success uses Leaf, a self-service tool which provides a user-friendly interface to execute queries and retrieve information about study data." + ], + "Type": "text", + "SkipModeSelection": true }, "Compiler": { "Alias": "@", @@ -72,6 +76,7 @@ "Export": { "REDCap": { "Enabled": false, + "Text": ["This is a test message"], "ApiURI": "https://redcap.example.edu/api/", "BatchSize": 10, "RowLimit": 5000, @@ -92,7 +97,7 @@ }, "Deidentification": { "Patient": { - "Enabled": false, + "Enabled": true, "DateShifting": { "Increment": "DAY", "LowerBound": -365, @@ -131,6 +136,9 @@ "Enabled": true, "Email": "leaf-support@example.edu", "URI": "https://www.example.edu/leaf-faq" + }, + "piwik": { + "siteId": 35 } }, "Notification": { diff --git a/src/ui-client/src/components/Attestation/CustomAttestationConfirmation.tsx b/src/ui-client/src/components/Attestation/CustomAttestationConfirmation.tsx index cc05d0de8..f5851a4af 100644 --- a/src/ui-client/src/components/Attestation/CustomAttestationConfirmation.tsx +++ b/src/ui-client/src/components/Attestation/CustomAttestationConfirmation.tsx @@ -36,20 +36,35 @@ export default class CustomAttestationConfirmation extends React.PureComponent

+

+ + {/* Else use custom text */} + {useHtml && +
+ } + + {!useHtml && +
+ {config.attestation.text.map((t,i) => { + return

{t}

; + })} +
+ } +
{showText &&
- + {/* {useDisplay} - {phiDisplay} - + */} {!(isSubmittingAttestation || hasAttested) && - + {config && !config.attestation.skipModeSelection &&
}
diff --git a/src/ui-client/src/containers/Attestation/Attestation.tsx b/src/ui-client/src/containers/Attestation/Attestation.tsx index 82a173448..9f92ec04e 100644 --- a/src/ui-client/src/containers/Attestation/Attestation.tsx +++ b/src/ui-client/src/containers/Attestation/Attestation.tsx @@ -74,11 +74,11 @@ class Attestation extends React.PureComponent { sessionType: SessionType.Research }, documentationExpDateString: '', - documentationStatusSelected: !config?.attestation?.documentStatusSelectionRequired, + documentationStatusSelected: false, hasApprovedIrb: false, hasApprovedQi: false, - identificationTypeSelected: !config?.attestation?.identificationTypeRequired, - sessionTypeSelected: SessionType.Research + identificationTypeSelected: false, + sessionTypeSelected: false } } diff --git a/src/ui-client/src/styles/custom.css b/src/ui-client/src/styles/custom.css index 7ce75e692..1c13780c9 100644 --- a/src/ui-client/src/styles/custom.css +++ b/src/ui-client/src/styles/custom.css @@ -153,9 +153,11 @@ button.concept-search-roots-dropdown-toggle.dropdown-toggle.btn.btn-secondary:ho margin-left: 4px; font-size: 2rem; } +.attestation-confirmation-settings, .attestation-confirmation-footer { text-align: center; } +.attestation-confirmation-settings button, .attestation-confirmation-footer button { font-size: 1.4rem; } From 2d6ac575f2527f4fe6d492ee60d811ca5a772fb0 Mon Sep 17 00:00:00 2001 From: Amy Chen Date: Mon, 3 Feb 2025 17:26:29 -0800 Subject: [PATCH 3/9] remove un-intended changes --- src/server/API/appsettings.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/server/API/appsettings.json b/src/server/API/appsettings.json index 1acab088a..25c450df6 100644 --- a/src/server/API/appsettings.json +++ b/src/server/API/appsettings.json @@ -76,7 +76,6 @@ "Export": { "REDCap": { "Enabled": false, - "Text": ["This is a test message"], "ApiURI": "https://redcap.example.edu/api/", "BatchSize": 10, "RowLimit": 5000, @@ -136,9 +135,6 @@ "Enabled": true, "Email": "leaf-support@example.edu", "URI": "https://www.example.edu/leaf-faq" - }, - "piwik": { - "siteId": 35 } }, "Notification": { From 77ae4b44e55bf2f4a4254418f15393595b67fdda Mon Sep 17 00:00:00 2001 From: Amy Chen Date: Mon, 3 Feb 2025 17:28:13 -0800 Subject: [PATCH 4/9] add back default --- src/server/API/appsettings.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/server/API/appsettings.json b/src/server/API/appsettings.json index 25c450df6..a0a61b52f 100644 --- a/src/server/API/appsettings.json +++ b/src/server/API/appsettings.json @@ -51,6 +51,7 @@ "RolesMapping": { "User": "urn:mace:users", "Super": "urn:mace:supers", + "Identified": "urn:mace:phi", "Admin": "urn:mace:sudos", "Federated": "urn:mace:federated" } From 888319e16dfd4dee39e8c018a821af23db04825a Mon Sep 17 00:00:00 2001 From: Amy Chen Date: Mon, 3 Feb 2025 17:34:16 -0800 Subject: [PATCH 5/9] put back standard attestation defaults --- .../StandardAttestationConfirmation.tsx | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/ui-client/src/components/Attestation/StandardAttestationConfirmation.tsx b/src/ui-client/src/components/Attestation/StandardAttestationConfirmation.tsx index fe4c90fc2..fd1916c0b 100644 --- a/src/ui-client/src/components/Attestation/StandardAttestationConfirmation.tsx +++ b/src/ui-client/src/components/Attestation/StandardAttestationConfirmation.tsx @@ -26,15 +26,15 @@ interface Props { export default class StandardAttestationConfirmation extends React.PureComponent { public render() { const c = this.props.className; - const { show, handleIAgreeClick, sessionLoadDisplay, hasAttested, isSubmittingAttestation, config } = this.props; + const { show, handleGoBackClick, handleIAgreeClick, isIdentified, sessionType, sessionLoadDisplay, hasAttested, isSubmittingAttestation, config } = this.props; const confirmationClass = `${c}-confirmation-container ${show ? 'show' : ''}` - // const useDisplay = sessionType === SessionType.Research ? 'Research' : 'Quality Improvement'; - // const phiDisplay = isIdentified ? 'Identified' : 'Deidentified'; + const useDisplay = sessionType === SessionType.Research ? 'Research' : 'Quality Improvement'; + const phiDisplay = isIdentified ? 'Identified' : 'Deidentified'; const showText = config && config.attestation.enabled; return (
- {/* {showText && [ + {showText && [
{useDisplay} - {phiDisplay}
, @@ -42,25 +42,23 @@ export default class StandardAttestationConfirmation extends React.PureComponent I attest that the information I have entered is accurate and I will use the application, Leaf, as I have indicated.

- ]} */} - {/* make this text configurable, maybe need to modify the model include this custom text, see https://github.com/uwcirg/leaf/blob/master/src/server/Model/Options/AttestationOptions.cs */} -

HIV Success uses Leaf, a self-service tool which provides a user-friendly interface to execute queries and retrieve information about study data.

+ ]} {!(isSubmittingAttestation || hasAttested) &&
- {/* {config && !config.attestation.skipModeSelection && + {config && !config.attestation.skipModeSelection && - } */} + }
} From 0366cfefdd05c76d5db076f721206942399b4bbc Mon Sep 17 00:00:00 2001 From: Amy Chen Date: Mon, 3 Feb 2025 17:37:18 -0800 Subject: [PATCH 6/9] fix comment, variable --- .../Attestation/CustomAttestationConfirmation.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ui-client/src/components/Attestation/CustomAttestationConfirmation.tsx b/src/ui-client/src/components/Attestation/CustomAttestationConfirmation.tsx index f5851a4af..444837aee 100644 --- a/src/ui-client/src/components/Attestation/CustomAttestationConfirmation.tsx +++ b/src/ui-client/src/components/Attestation/CustomAttestationConfirmation.tsx @@ -33,12 +33,13 @@ export default class CustomAttestationConfirmation extends React.PureComponent

- {/* Else use custom text */} + {/* use custom text */} {useHtml &&
} @@ -59,14 +60,14 @@ export default class CustomAttestationConfirmation extends React.PureComponent

*/} {!(isSubmittingAttestation || hasAttested) && - + - {config && !config.attestation.skipModeSelection && + {!skipModeSelection && {!skipModeSelection &&

diff --git a/src/ui-client/src/containers/Attestation/Attestation.tsx b/src/ui-client/src/containers/Attestation/Attestation.tsx index 9f92ec04e..affafd71c 100644 --- a/src/ui-client/src/containers/Attestation/Attestation.tsx +++ b/src/ui-client/src/containers/Attestation/Attestation.tsx @@ -66,7 +66,6 @@ class Attestation extends React.PureComponent { constructor(props: Props) { super(props); - const {config} = props; this.state = { attestation: { documentation: this.defaultDocumentation, @@ -158,12 +157,6 @@ class Attestation extends React.PureComponent {
nida-logo
- {/*
- iths-logo -
-
- cd2h-logo -
*/} {/* Optional instance logo row */} {config && config.attestation.credits.enabled && @@ -188,14 +181,11 @@ class Attestation extends React.PureComponent {
- {/* {userContext && !userContext.isPhiOkay && -
-

Participant data restricted to De-Identified mode only

-
- } */} -
-

Participant data restricted to De-Identified mode only

-
+ {(userContext && !userContext.isPhiOkay) && +
+

Participant data restricted to De-Identified mode only

+
+ } {auth.error &&
diff --git a/src/ui-client/src/containers/Header/Header.tsx b/src/ui-client/src/containers/Header/Header.tsx index b684cdaff..bdd6c4390 100644 --- a/src/ui-client/src/containers/Header/Header.tsx +++ b/src/ui-client/src/containers/Header/Header.tsx @@ -90,7 +90,6 @@ class Header extends React.PureComponent { federated={responders.size > 1} imports={importState} helpClickHandler={this.handleGetHelpClick} - //logoutClickHandler={this.handleLogoutClick} myLeafModalToggleHandler={this.handleMyleafModalToggleClick} user={user} /> From 58b14feda39f8039187574f5494f0d896ccfe5ac Mon Sep 17 00:00:00 2001 From: Amy Chen Date: Tue, 4 Feb 2025 11:01:16 -0800 Subject: [PATCH 8/9] put default settings back --- src/server/API/appsettings.json | 7 +------ src/ui-client/src/containers/Attestation/Attestation.tsx | 8 ++++---- src/ui-client/src/styles/custom.css | 6 ++---- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/server/API/appsettings.json b/src/server/API/appsettings.json index f8e51fba3..9d6c3876e 100644 --- a/src/server/API/appsettings.json +++ b/src/server/API/appsettings.json @@ -58,12 +58,7 @@ } }, "Attestation": { - "Enabled": true, - "Text": [ - "HIV Success uses Leaf, a self-service tool which provides a user-friendly interface to execute queries and retrieve information about study data." - ], - "Type": "text", - "SkipModeSelection": true + "Enabled": true }, "Compiler": { "Alias": "@", diff --git a/src/ui-client/src/containers/Attestation/Attestation.tsx b/src/ui-client/src/containers/Attestation/Attestation.tsx index affafd71c..b33241034 100644 --- a/src/ui-client/src/containers/Attestation/Attestation.tsx +++ b/src/ui-client/src/containers/Attestation/Attestation.tsx @@ -181,10 +181,10 @@ class Attestation extends React.PureComponent {
- {(userContext && !userContext.isPhiOkay) && -
-

Participant data restricted to De-Identified mode only

-
+ {userContext && !userContext.isPhiOkay && +
+

Participant data restricted to De-Identified mode only

+
} {auth.error && diff --git a/src/ui-client/src/styles/custom.css b/src/ui-client/src/styles/custom.css index 1c13780c9..c8eff15f6 100644 --- a/src/ui-client/src/styles/custom.css +++ b/src/ui-client/src/styles/custom.css @@ -153,12 +153,10 @@ button.concept-search-roots-dropdown-toggle.dropdown-toggle.btn.btn-secondary:ho margin-left: 4px; font-size: 2rem; } -.attestation-confirmation-settings, -.attestation-confirmation-footer { +.attestation-confirmation-settings { text-align: center; } -.attestation-confirmation-settings button, -.attestation-confirmation-footer button { +.attestation-confirmation-settings button { font-size: 1.4rem; } .attestation-nida-logo { From 0df8632dbe6f800a3470c1e0b7ca51def5def2e5 Mon Sep 17 00:00:00 2001 From: Amy Chen Date: Tue, 4 Feb 2025 11:29:08 -0800 Subject: [PATCH 9/9] code clean up, fix custom attestation layout --- .../CustomAttestationConfirmation.tsx | 20 +++++++++---------- .../containers/Attestation/Attestation.tsx | 2 -- src/ui-client/src/styles/custom.css | 5 +++-- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/ui-client/src/components/Attestation/CustomAttestationConfirmation.tsx b/src/ui-client/src/components/Attestation/CustomAttestationConfirmation.tsx index 21458a1cd..52e8c515d 100644 --- a/src/ui-client/src/components/Attestation/CustomAttestationConfirmation.tsx +++ b/src/ui-client/src/components/Attestation/CustomAttestationConfirmation.tsx @@ -39,8 +39,11 @@ export default class CustomAttestationConfirmation extends React.PureComponent

+ {!skipModeSelection && +

+ {useDisplay} - {phiDisplay} +
}
- {/* use custom text */} {useHtml &&
@@ -55,21 +58,18 @@ export default class CustomAttestationConfirmation extends React.PureComponent

{showText && +

+ -
- - {!skipModeSelection && - - {useDisplay} - {phiDisplay} - } {!(isSubmittingAttestation || hasAttested) && - + + {" "} {!skipModeSelection &&