Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(): fix login modal changing contents #2292

Merged
merged 3 commits into from
May 24, 2024
Merged

chore(): fix login modal changing contents #2292

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2bd2a3
chore(): fix login modal changing contents
SeverS May 24, 2024
b46583f
Merge branch 'next' into fix/login-modal
SeverS May 24, 2024
4c93039
Merge branch 'next' into fix/login-modal
SeverS May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 20 additions & 8 deletions extensions/apps/profile/src/extensions/login-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,26 @@ import Modal from '@akashaorg/design-system-core/lib/components/Modal';
import { RootExtensionProps } from '@akashaorg/typings/lib/ui';
import { useRootComponentProps, withProviders } from '@akashaorg/ui-awf-hooks';

const LoginModal = (props: RootExtensionProps) => {
const LoginModal = (_props: RootExtensionProps) => {
const { t } = useTranslation('app-profile');
const location = useLocation();
const { getRoutingPlugin, getModalFromParams } = useRootComponentProps();
const modal = getModalFromParams(window.location);
const message = React.useRef('To continue you need an AKASHA World account');
if (modal?.message) {
message.current = modal.message;
}
const messageTitle = React.useRef('AKASHA World');
if (modal?.title) {
messageTitle.current = modal.title;
}

const message = React.useMemo(
() => modal?.message || 'To continue you need an AKASHA World account',
[modal?.message],
);
const messageTitle = React.useMemo(() => modal?.title || 'AKASHA World', [modal?.title]);
React.useEffect(() => {
return () => {
message.current = null;
messageTitle.current = null;
};
}, []);

const handleModalClose = () => {
window.history.replaceState(null, null, location.pathname);
Expand All @@ -46,7 +55,10 @@ const LoginModal = (props: RootExtensionProps) => {
return (
<Modal
show={modal?.name === 'login'}
title={{ label: t('{{messageTitle}}', { messageTitle }), variant: 'h6' }}
title={{
label: t('{{messageTitle}}', { messageTitle: messageTitle.current }),
variant: 'h6',
}}
actions={[
{ label: t('Cancel'), variant: 'secondary', onClick: handleModalClose },
{ label: t('Connect'), variant: 'primary', onClick: handleConnectClick },
Expand All @@ -56,7 +68,7 @@ const LoginModal = (props: RootExtensionProps) => {
>
<Stack align="center" fullWidth={true} spacing="gap-y-2">
<Text variant="body1" align="center">
{t('{{message}}', { message })}
{t('{{message}}', { message: message.current })}
</Text>
</Stack>
</Modal>
Expand Down