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

Snap Header gets disabled when snaps installed #1378

Merged
merged 5 commits into from
Jan 17, 2024
Merged

Snap Header gets disabled when snaps installed #1378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
81948bd
Snap Header gets disabled when snaps installed
abhishek-01k Jan 12, 2024
0a133f2
Removed console
abhishek-01k Jan 12, 2024
c7a1a0b
Removed console for APPContext
abhishek-01k Jan 12, 2024
ab33b48
Changed link to internal routing
HarshRajat Jan 17, 2024
59fda38
Added suspense when snap is not installed
HarshRajat Jan 17, 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
10 changes: 5 additions & 5 deletions src/contexts/AppContext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ const AppContextProvider = ({ children }) => {

const [web3NameList, setWeb3NameList] = useState<Web3NameListType>({});

const [snapInstalled, setSnapInstalled] = useState(false);

const [SnapState, setSnapState] = useState(1);
const {
isModalOpen: isMetamaskPushSnapOpen,
Expand Down Expand Up @@ -77,8 +79,6 @@ const AppContextProvider = ({ children }) => {
account: readOnlyWallet,
env: appConfig.appEnv,
});
console.log("User Instance in guest mode", userInstance);

dispatch(setUserPushSDKInstance(userInstance));
}

Expand All @@ -92,8 +92,6 @@ const AppContextProvider = ({ children }) => {
account: account
});

console.log("User Instance", userInstance);

dispatch(setUserPushSDKInstance(userInstance));
} catch (error) {
// Handle initialization error
Expand All @@ -120,7 +118,9 @@ const AppContextProvider = ({ children }) => {
setSnapState,
initializePushSDK,
SnapState,
handleConnectWallet
handleConnectWallet,
setSnapInstalled,
snapInstalled
}}>
{children}
</AppContext.Provider>
Expand Down
61 changes: 30 additions & 31 deletions src/modules/snap/SnapModule.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,9 @@ const SnapModule = ({
}) => {
const [loading, setLoading] = useState(false);
const [walletConnected, setWalletConnected] = useState(false);
const [snapInstalled, setSnapInstalled] = useState(false);
const [addedAddress, setAddedAddress] = useState(false);

const { showMetamaskPushSnap, setSnapState } = React.useContext(AppContext);
const { showMetamaskPushSnap, setSnapState, setSnapInstalled, snapInstalled } = React.useContext(AppContext);

const { account, provider } = useAccount();

Expand Down Expand Up @@ -168,7 +167,7 @@ const SnapModule = ({
showSnapFAQModal();
}

if(route == 'knowledge'){
if (route == 'knowledge') {
showSnapKnowledgeModal();
}

Expand Down Expand Up @@ -305,32 +304,32 @@ const SnapModule = ({
fontWeight="400"
>
Connected to Push Snap
</SpanV2>
</ItemHV2>
) : (
<ItemVV2 gap="16px">
{loading && !snapInstalled ? (
<LoaderSpinner
type={LOADER_TYPE.SEAMLESS}
spinnerSize={44}
/>
) : (
<ConnectButton disabled={!snapInstalled ? false : true} onClick={() => connectToMetaMask()} >
{!snapInstalled ? 'Step 1: Install Snap' : 'Step 1: Completed'}
</ConnectButton>
)}
{loading && snapInstalled ? (
<LoaderSpinner
type={LOADER_TYPE.SEAMLESS}
spinnerSize={44}
/>
) : (
<ConnectButton disabled={snapInstalled ? false : true} signOnMM={snapInstalled ? true : false} onClick={() => connectToMetaMask()} >
Step 2: Sign In with Metamask 🦊
</ConnectButton>
)}
</ItemVV2>
)}
</SpanV2>
</ItemHV2>
) : (
<ItemVV2 gap="16px">
{loading && !snapInstalled ? (
<LoaderSpinner
type={LOADER_TYPE.SEAMLESS}
spinnerSize={44}
/>
) : (
<ConnectButton disabled={!snapInstalled ? false : true} onClick={() => connectToMetaMask()} >
{!snapInstalled ? 'Step 1: Install Snap' : 'Step 1: Completed'}
</ConnectButton>
)}
{loading && snapInstalled ? (
<LoaderSpinner
type={LOADER_TYPE.SEAMLESS}
spinnerSize={44}
/>
) : (
<ConnectButton disabled={snapInstalled ? false : true} signOnMM={snapInstalled ? true : false} onClick={() => connectToMetaMask()} >
Step 2: Sign In with Metamask 🦊
</ConnectButton>
)}
</ItemVV2>
)}

{walletConnected || addedAddress ? (
<ButtonContainer gap="12px" >
Expand Down Expand Up @@ -367,9 +366,9 @@ const SnapModule = ({
</SubContainer>
<ItemVV2 flex='none'>
<SpanV2 fontSize='14px' fontWeight='400' color='#657795'>Have a question? Check out our {" "}
<SpanV2 fontWeight='500' cursor='pointer' onClick={()=>navigate("/snap/faq")}>FAQs </SpanV2>
<SpanV2 fontWeight='500' cursor='pointer' onClick={() => navigate("/snap/faq")}>FAQs </SpanV2>
or {" "}
<SpanV2 fontWeight='500' cursor='pointer' onClick={()=>navigate("/snap/knowledge")}>Knowledgebase.</SpanV2>
<SpanV2 fontWeight='500' cursor='pointer' onClick={() => navigate("/snap/knowledge")}>Knowledgebase.</SpanV2>
</SpanV2>
</ItemVV2>
</Container>
Expand Down
68 changes: 46 additions & 22 deletions src/structure/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,42 @@
import React, { useContext, useRef } from 'react';
import React, { Suspense, useContext, useEffect, useRef } from 'react';

// React + Web3 Essentials
import { ethers } from 'ethers';
import { Link } from 'react-router-dom';

// External Packages
import { AiOutlineClose, AiOutlineMenu } from 'react-icons/ai';
import { useLocation } from 'react-router-dom';
import { DarkModeSwitch } from 'react-toggle-dark-mode';
import { AiOutlineClose, AiOutlineMenu } from 'react-icons/ai';
import styled, { css, useTheme } from 'styled-components';

// Internal Components
import { Button, Item, ItemH, Section, Span } from 'primaries/SharedStyling';
import { ReactComponent as EPNSLogoDark } from './assets/epnsDark.svg';
import { ReactComponent as EPNSLogoLight } from './assets/epnsLight.svg';
import { ReactComponent as OpenLink } from 'assets/PushSnaps/GoToImage.svg';
import { ReactComponent as MetamaskLogo } from 'assets/PushSnaps/metamasksnap.svg';
import MobileNavButton from 'components/MobileNavButton';
import NavigationButton from 'components/NavigationButton';
import { LOADER_SPINNER_TYPE } from 'components/reusables/loaders/LoaderSpinner';
import Spinner from 'components/reusables/spinners/SpinnerUnit';
import { AppContext } from 'contexts/AppContext';
import { ErrorContext } from 'contexts/ErrorContext';
import { NavigationContext } from 'contexts/NavigationContext';
import Bell from 'primaries/Bell';
import Profile from 'primaries/Profile';
import { NavigationContext } from 'contexts/NavigationContext';
import { ErrorContext } from 'contexts/ErrorContext';
import { ReactComponent as MetamaskLogo } from 'assets/PushSnaps/metamasksnap.svg';
import { ReactComponent as OpenLink } from 'assets/PushSnaps/GoToImage.svg'
import { Button, Item, ItemH, Section, Span } from 'primaries/SharedStyling';
import { ReactComponent as EPNSLogoDark } from './assets/epnsDark.svg';
import { ReactComponent as EPNSLogoLight } from './assets/epnsLight.svg';

// Internal Configs
import ChainIndicator from 'components/ChainIndicator';
import { ItemHV2, ItemVV2, SpanV2 } from 'components/reusables/SharedStylingV2';
import { appConfig } from 'config';
import APP_PATHS from 'config/AppPaths';
import GLOBALS from 'config/Globals';
import { themeDark, themeLight } from 'config/Themization';
import { UnsupportedChainIdError } from 'connectors/error';
import { useAccount, useDeviceWidthCheck } from 'hooks';
import { useClickAway } from 'react-use';
import MobileNavigation from './MobileNavigation';
import { useAccount, useDeviceWidthCheck } from 'hooks';
import ChainIndicator from 'components/ChainIndicator';
import { UnsupportedChainIdError } from 'connectors/error';
import APP_PATHS from 'config/AppPaths';
import { themeDark, themeLight } from 'config/Themization';
import { ItemHV2, ItemVV2, SpanV2 } from 'components/reusables/SharedStylingV2';
import { AppContext } from 'contexts/AppContext';

// header tags for pages that are not there in navigationList (Sidebar)
const EXTRA_HEADER_TAGS = {
Expand Down Expand Up @@ -68,8 +71,7 @@ function Header({ isDarkMode, darkModeToggle }) {
const navRef = useRef()

const { navigationSetup } = useContext(NavigationContext);

// Get
const { setSnapInstalled, snapInstalled } = React.useContext(AppContext);
const { isActive, switchChain, connect, wallet } = useAccount();
const { authError: error } = useContext(ErrorContext);

Expand All @@ -84,6 +86,9 @@ function Header({ isDarkMode, darkModeToggle }) {
// Get Location
const location = useLocation();

// const [snapInstalled, setSnapInstalled] = React.useState(false);


React.useEffect(() => {
// runs when navigation setup is updated, will run on init
updateHeaderTag(location);
Expand Down Expand Up @@ -138,15 +143,30 @@ function Header({ isDarkMode, darkModeToggle }) {
const showSnapMobile = useDeviceWidthCheck(600);
const isSnapPage = location?.pathname === '/snap';

const isSnapInstalled = async () => {
const installedSnaps = await window.ethereum.request({
method: 'wallet_getSnaps',
});
Object.keys(installedSnaps).forEach((snap) => {
if (snap == 'npm:@pushprotocol/snap') {
setSnapInstalled(true);
}
});
}

useEffect(() => {
isSnapInstalled();
}, [])

const SnapHeader = () => {
return (
<SnapSection>
<MetamaskLogo width={24} height={22} />
<InstallText>
<SpanV2 fontSize='12px' fontWeight='400'>Get Notifications directly in MetaMask</SpanV2>
<Link href='https://app.push.org/snap' target='_blank'>
<StyledLink to='/snap'>
Install Push Snap <OpenLink />
</Link>
</StyledLink>
</InstallText>
</SnapSection>
)
Expand Down Expand Up @@ -198,8 +218,11 @@ function Header({ isDarkMode, darkModeToggle }) {
</Span>
</HeaderTag>
)}
{!showSnapMobile && <SnapHeader />}

<Suspense fallback={<Spinner size={24} color={GLOBALS.COLORS.PRIMARY_PINK} type={LOADER_SPINNER_TYPE.PROCESSING}/>}>
{!showSnapMobile && !snapInstalled && <SnapHeader />}
</Suspense>


{isActive && !showLoginControls && !error && (
<DarkModeSwitch
Expand Down Expand Up @@ -402,7 +425,8 @@ const InstallText = styled.div`

`

const Link = styled.a`

const StyledLink = styled(Link)`
cursor:pointer;
font-size:12px;
font-weight:400;
Expand Down
2 changes: 2 additions & 0 deletions src/types/context.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ export interface AppContextType {
SnapState: number;
setSnapState: any;
initializePushSDK: any;
snapInstalled: boolean;
setSnapInstalled: (snapInstalled:boolean) => void;
handleConnectWallet: (
showToast?: boolean,
toastMessage?: string
Expand Down