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

App login: display contract ID #2276

Merged
merged 2 commits into from
Dec 1, 2021
Merged

App login: display contract ID #2276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44cd778
App login: display contract ID
Patrick1904 Nov 30, 2021
bffe0db
App login: show both referrer and contract id
Patrick1904 Nov 30, 2021
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
8 changes: 5 additions & 3 deletions packages/frontend/src/components/login/v2/ConfirmLogin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default ({
appReferrer,
contractId,
publicKey,
EXPLORER_URL
contractIdUrl
}) => {
const [loggingIn, setLoggingIn] = useState(false);
const [showGrantFullAccessModal, setShowGrantFullAccessModal] = useState(false);
Expand Down Expand Up @@ -50,7 +50,7 @@ export default ({
<SafeTranslate
id='login.v2.connectConfirm.desc'
data={{
contractIdUrl: `${EXPLORER_URL}/accounts/${contractId}`,
contractIdUrl: contractIdUrl,
appReferrer: appReferrer || translate('sign.unknownApp'),
accessType: translate(`login.v2.connectConfirm.${loginAccessType}`)
}}
Expand All @@ -63,7 +63,7 @@ export default ({
: <FullAccessUI />
}
{publicKey && loginAccessType === LOGIN_ACCESS_TYPES.LIMITED_ACCESS &&
<NetworkFeeAllowance />
<NetworkFeeAllowance contractId={contractId} contractIdUrl={contractIdUrl}/>
}
<FormButtonGroup>
<FormButton
Expand Down Expand Up @@ -97,6 +97,8 @@ export default ({
onConfirm={handleClickConnect}
signedInAccountId={signedInAccountId}
appReferrer={appReferrer}
contractId={contractId}
contractIdUrl={contractIdUrl}
loggingIn={loggingIn}
/>
}
Expand Down
4 changes: 2 additions & 2 deletions packages/frontend/src/components/login/v2/ConfirmLoginWrapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React from 'react';
import { useSelector, useDispatch } from 'react-redux';

import { EXPLORER_URL } from '../../../config';
import { Mixpanel } from '../../../mixpanel/index';
import { allowLogin } from '../../../redux/actions/account';
import { showCustomAlert } from '../../../redux/actions/status';
Expand All @@ -14,6 +13,7 @@ import ConfirmLogin from './ConfirmLogin';
export default ({
loginAccessType,
contractId,
contractIdUrl,
onClickCancel,
publicKey
}) => {
Expand Down Expand Up @@ -44,7 +44,7 @@ export default ({
}
);
}}
EXPLORER_URL={EXPLORER_URL}
contractIdUrl={contractIdUrl}
/>
);
};
7 changes: 4 additions & 3 deletions packages/frontend/src/components/login/v2/ConnectWithApplication.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import styled from 'styled-components';

import GlobeIcon from '../../svg/GlobeIcon';

const StyledContainer = styled.div`
const StyledContainer = styled.a`
border: 1px solid #D6EDFF;
background-color: #F0F9FF;
color: #005497;
Expand All @@ -14,14 +14,15 @@ const StyledContainer = styled.div`
align-items: center;
justify-content: center;
width: fit-content;
cursor: pointer;

> svg {
margin-right: 10px;
}
`;

export default ({ appReferrer }) => (
<StyledContainer className='connect-with-application'>
export default ({ appReferrer, contractIdUrl }) => (
<StyledContainer className='connect-with-application' href={contractIdUrl} target='_blank' rel='noreferrer'>
<GlobeIcon/>
{appReferrer || <Translate id='sign.unknownApp' />}
</StyledContainer>
Expand Down
7 changes: 6 additions & 1 deletion packages/frontend/src/components/login/v2/GrantFullAccessModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ export default ({
onClose,
onConfirm,
appReferrer,
contractId,
contractIdUrl,
signedInAccountId,
loggingIn
}) => {
Expand All @@ -92,7 +94,10 @@ export default ({
<div className='upper-body'>
<div className='alert-triangle'><AlertTriangleIcon color='#DC1F25' /></div>
<h3><Translate id='login.v2.connectConfirm.fullAccessModal.title' /></h3>
<ConnectWithApplication appReferrer={appReferrer} />
<ConnectWithApplication
appReferrer={appReferrer}
contractIdUrl={contractIdUrl}
/>
<div className='desc'>
<Translate id='login.v2.connectConfirm.fullAccessModal.desc' />
</div>
Expand Down
22 changes: 21 additions & 1 deletion packages/frontend/src/components/login/v2/NetworkFeeAllowance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Translate } from 'react-localize-redux';
import styled from 'styled-components';

import { ACCESS_KEY_FUNDING_AMOUNT } from '../../../config';
import ArrowUpRight from '../..//svg/ArrowUpRight';
import Balance from '../../common/balance/Balance';

const StyledContainer = styled.div`
Expand All @@ -13,6 +14,19 @@ const StyledContainer = styled.div`
color: #72727A;
margin: 50px 0 -20px 0;

.contract-wrapper {
border-bottom: 1px solid #F0F0F1;
padding-bottom: 16px;
a {
display: flex;
align-items: center;

svg {
margin-left: 5px;
}
}
}

> div {
display: flex;
justify-content: space-between;
Expand All @@ -26,8 +40,14 @@ const StyledContainer = styled.div`
}
`;

export default () => (
export default ({ contractId, contractIdUrl }) => (
Copy link
Contributor

@MaximusHaximus MaximusHaximus Dec 1, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a blocker, but we should probably rename this thing to e.g. LoginRequestDetails now that it's not really specific to the Network Fee Allowance...

<StyledContainer>
{contractId &&
<div className='contract-wrapper'>
<div className='title'>Contract</div>
<a href={contractIdUrl} target='_blank' rel='noreferrer'>{contractId}<ArrowUpRight /></a>
</div>
}
<div>
<div className='title'><Translate id='login.v2.connectConfirm.feeAllowance.title' /></div>
<Balance
Expand Down
8 changes: 6 additions & 2 deletions packages/frontend/src/components/login/v2/SelectAccountLogin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ export default ({
onClickCancel,
onClickNext,
loginAccessType,
appReferrer
appReferrer,
contractIdUrl
}) => (
<Container className='small-centered border'>
<LoginStyle className={loginAccessType === LOGIN_ACCESS_TYPES.FULL_ACCESS ? 'full-access' : ''}>
Expand All @@ -35,7 +36,10 @@ export default ({
)}
</Translate>
</div>
<ConnectWithApplication appReferrer={appReferrer} />
<ConnectWithApplication
appReferrer={appReferrer}
contractIdUrl={contractIdUrl}
/>
<LoadingDots />
<AccountSelector
signedInAccountId={signedInAccountId}
Expand Down
4 changes: 4 additions & 0 deletions packages/frontend/src/components/login/v2/SelectAccountLoginWrapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ import SelectAccountLogin from './SelectAccountLogin';

export default ({
loginAccessType,
contractId,
contractIdUrl,
onClickNext,
failureUrl
}) => {
Expand All @@ -42,6 +44,8 @@ export default ({
}}
loginAccessType={loginAccessType}
appReferrer={accountUrlReferrer}
contractId={contractId}
contractIdUrl={contractIdUrl}
onClickCancel={() => {
Mixpanel.track("LOGIN Click deny button");
if (failureUrl) {
Expand Down
4 changes: 2 additions & 2 deletions packages/frontend/src/components/svg/ArrowUpRight.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import React from 'react';
const ArrowUpRight = () => {
return (
<svg width="16" height="17" viewBox="0 0 16 17" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M4.66699 11.6032L11.3337 4.93652" stroke="#2B9AF4" stroke-width="1.5" strokeLinecap="round" strokeLinejoin="round"/>
<path d="M4.66699 4.93652H11.3337V11.6032" stroke="#2B9AF4" stroke-width="1.5" strokeLinecap="round" strokeLinejoin="round"/>
<path d="M4.66699 11.6032L11.3337 4.93652" stroke="#2B9AF4" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round"/>
<path d="M4.66699 4.93652H11.3337V11.6032" stroke="#2B9AF4" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round"/>
</svg>
);
};
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/redux/actions/account.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ export const handleRefreshUrl = (prevRouter) => (dispatch, getState) => {

if ([...WALLET_CREATE_NEW_ACCOUNT_FLOW_URLS, WALLET_LOGIN_URL, WALLET_SIGN_URL, WALLET_LINKDROP_URL].includes(currentPage)) {
const parsedUrl = {
referrer: document.referrer && new URL(document.referrer).hostname,
...parse(search),
referrer: document.referrer ? new URL(document.referrer).hostname : undefined,
redirect_url: prevRouter ? prevRouter.location.pathname : undefined
};
if ([WALLET_CREATE_NEW_ACCOUNT_URL, WALLET_LINKDROP_URL].includes(currentPage) && search !== '') {
Expand Down
6 changes: 6 additions & 0 deletions packages/frontend/src/routes/LoginWrapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { useSelector } from 'react-redux';
import ConfirmLoginWrapper from '../components/login/v2/ConfirmLoginWrapper';
import InvalidContractId from '../components/login/v2/InvalidContractId';
import SelectAccountLoginWrapper from '../components/login/v2/SelectAccountLoginWrapper';
import { EXPLORER_URL } from '../config';
import { Mixpanel } from '../mixpanel/index';
import {
selectAccountLocalStorageAccountId
Expand All @@ -27,6 +28,8 @@ export function LoginWrapper() {
const failureUrl = URLParams.get('failure_url');
const invalidContractId = URLParams.get('invalidContractId');

const contractIdUrl = `${EXPLORER_URL}/accounts/${contractId}`;

const accountLocalStorageAccountId = useSelector(selectAccountLocalStorageAccountId);

let requestingFullAccess = !contractId || (publicKey && contractId?.endsWith(`.${LOCKUP_ACCOUNT_ID_SUFFIX}`)) || contractId === accountLocalStorageAccountId;
Expand All @@ -53,6 +56,7 @@ export function LoginWrapper() {
<ConfirmLoginWrapper
loginAccessType={loginAccessType}
contractId={contractId}
contractIdUrl={contractIdUrl}
onClickCancel={() => setConfirmLogin(false)}
publicKey={publicKey}
/>
Expand All @@ -62,6 +66,8 @@ export function LoginWrapper() {
return (
<SelectAccountLoginWrapper
loginAccessType={loginAccessType}
contractId={contractId}
contractIdUrl={contractIdUrl}
failureUrl={failureUrl}
onClickNext={() => { setConfirmLogin(true); window.scrollTo(0, 0); }}
/>
Expand Down