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

Allow specific origin to direct to second page of token allowance flow #18395

Merged
merged 2 commits into from
Mar 31, 2023
Merged

Allow specific origin to direct to second page of token allowance flow #18395

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fd6f5d
Allow specific origin to direct to second page of token allowance flow
danjm Mar 31, 2023
0511fcd
Remove accidentally committed git diff text
rekmarks Mar 31, 2023
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
12 changes: 10 additions & 2 deletions ui/pages/token-allowance/token-allowance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ import SimulationErrorMessage from '../../components/ui/simulation-error-message
import { Icon, ICON_NAMES } from '../../components/component-library';
import LedgerInstructionField from '../../components/app/ledger-instruction-field/ledger-instruction-field';

const ALLOWED_HOSTS = ['portfolio.metamask.io'];

export default function TokenAllowance({
origin,
siteImage,
Expand Down Expand Up @@ -94,10 +96,13 @@ export default function TokenAllowance({
const history = useHistory();
const mostRecentOverviewPage = useSelector(getMostRecentOverviewPage);

const { hostname } = new URL(origin);
const thisOriginIsAllowedToSkipFirstPage = ALLOWED_HOSTS.includes(hostname);

const [showContractDetails, setShowContractDetails] = useState(false);
const [showFullTxDetails, setShowFullTxDetails] = useState(false);
const [isFirstPage, setIsFirstPage] = useState(
dappProposedTokenAmount !== '0',
dappProposedTokenAmount !== '0' && !thisOriginIsAllowedToSkipFirstPage,
);
const [errorText, setErrorText] = useState('');
const [userAcknowledgedGasMissing, setUserAcknowledgedGasMissing] =
Expand All @@ -109,11 +114,14 @@ export default function TokenAllowance({
const currentAccount = useSelector(getCurrentAccountWithSendEtherInfo);
const networkIdentifier = useSelector(getNetworkIdentifier);
const rpcPrefs = useSelector(getRpcPrefsForCurrentProvider);
const customTokenAmount = useSelector(getCustomTokenAmount);
const unapprovedTxCount = useSelector(getUnapprovedTxCount);
const unapprovedTxs = useSelector(getUnapprovedTransactions);
const useCurrencyRateCheck = useSelector(getUseCurrencyRateCheck);
const isHardwareWalletConnected = useSelector(isHardwareWallet);
let customTokenAmount = useSelector(getCustomTokenAmount);
if (thisOriginIsAllowedToSkipFirstPage && dappProposedTokenAmount) {
customTokenAmount = dappProposedTokenAmount;
}

const replaceCommaToDot = (inputValue) => {
return inputValue.replace(/,/gu, '.');
Expand Down