Skip to content
New issue

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

#

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

Already on GitHub? # to your account

only show working mobile auth options... #10701

Merged
merged 2 commits into from
Jan 24, 2025
Merged

only show working mobile auth options... #10701

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
d3530fd
only show working mobile auth options...
burtonator Jan 23, 2025
3858335
cleanup...
burtonator Jan 23, 2025
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
5 changes: 4 additions & 1 deletion packages/commonwealth/client/scripts/views/modals/AuthModal/SignInModal/SignInModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
import { isMobileApp } from 'hooks/useReactNativeWebView';
import React from 'react';
import { ModalBase } from '../common/ModalBase';
import { AuthModalType, ModalVariantProps } from '../types';
import './SignInModal.scss';

const mobileApp = isMobileApp();

const SignInModal = ({
onClose,
onSuccess,
Expand All @@ -15,7 +18,7 @@ const SignInModal = ({
onClose={onClose}
layoutType={AuthModalType.SignIn}
onSuccess={onSuccess}
showAuthOptionTypesFor={['wallets', 'sso']}
showAuthOptionTypesFor={mobileApp ? ['sso'] : ['wallets', 'sso']}
showWalletsFor={showWalletsFor}
showAuthOptionFor={showAuthOptionFor}
bodyClassName="SignInModal"
Expand Down
17 changes: 16 additions & 1 deletion packages/commonwealth/client/scripts/views/modals/AuthModal/common/ModalBase/ModalBase.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { ChainBase, WalletId, WalletSsoSource } from '@hicommonwealth/shared';
import commonLogo from 'assets/img/branding/common-logo.svg';
import clsx from 'clsx';
import { isMobileApp } from 'hooks/useReactNativeWebView';
import React, { Fragment, useEffect, useState } from 'react';
import { Link } from 'react-router-dom';
import app from 'state';
Expand Down Expand Up @@ -51,7 +52,9 @@ const MODAL_COPY = {
},
};

const SSO_OPTIONS: AuthSSOs[] = [
const mobileApp = isMobileApp();

const SSO_OPTIONS_DEFAULT: AuthSSOs[] = [
'google',
'discord',
'x',
Expand All @@ -62,6 +65,15 @@ const SSO_OPTIONS: AuthSSOs[] = [
'SMS',
] as const;

const SSO_OPTIONS_MOBILE: AuthSSOs[] = [
'google',
'apple',
'email',
'SMS',
] as const;

const SSO_OPTIONS = mobileApp ? SSO_OPTIONS_MOBILE : SSO_OPTIONS_DEFAULT;

/**
* AuthModal base component with customizable options, callbacks, layouts and auth options display strategy.
* @param onClose callback triggered when the modal is closed or user is authenticated.
Expand Down Expand Up @@ -223,6 +235,8 @@ const ModalBase = ({
setActiveTabIndex((prevActiveTab) => {
if (!shouldShowSSOOptions && prevActiveTab === 1) return 0;

if (isMobileApp()) return 1;

if (showAuthOptionFor) {
return SSO_OPTIONS.includes(showAuthOptionFor as AuthSSOs) ? 1 : 0;
}
Expand Down Expand Up @@ -343,6 +357,7 @@ const ModalBase = ({
If email or SMS option is selected don't render SSO's list,
else render wallets/SSO's list based on activeTabIndex
*/}

{(activeTabIndex === 0 ||
(activeTabIndex === 1 &&
!isAuthenticatingWithEmail &&
Expand Down
Loading