Skip to content

Commit

Permalink
Remove QRButton from 480 <= screen size <768 because now display the …
Browse files Browse the repository at this point in the history
…bottom nav
  • Loading branch information
gkatrakazas committed Oct 22, 2024
1 parent 39478a5 commit ef0ad46
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 36 deletions.
13 changes: 1 addition & 12 deletions src/pages/AddCredentials/AddCredentials.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@ import { useTranslation } from 'react-i18next';

import StatusContext from '../../context/StatusContext';
import SessionContext from '../../context/SessionContext';
import { useQRScanner } from '../../hooks/useQRScanner';
import QRCodeScanner from '../../components/QRCodeScanner/QRCodeScanner';
import RedirectPopup from '../../components/Popups/RedirectPopup';
import QRButton from '../../components/Buttons/QRButton';
import { H1 } from '../../components/Shared/Heading';
import ContainerContext from '../../context/ContainerContext';
import Button from '../../components/Buttons/Button';
Expand All @@ -26,7 +23,6 @@ function highlightBestSequence(issuer, search) {
const Issuers = () => {
const { isOnline } = useContext(StatusContext);
const { api, keystore } = useContext(SessionContext);
const { isQRScannerOpen, openQRScanner, closeQRScanner } = useQRScanner();
const [searchQuery, setSearchQuery] = useState('');
const [issuers, setIssuers] = useState([]);
const [filteredIssuers, setFilteredIssuers] = useState([]);
Expand Down Expand Up @@ -130,9 +126,7 @@ const Issuers = () => {
return (
<>
<div className="sm:px-6 w-full">
<H1 heading={t('common.navItemAddCredentials')}>
<QRButton openQRScanner={openQRScanner} />
</H1>
<H1 heading={t('common.navItemAddCredentials')} />
<PageDescription description={t('pageAddCredentials.description')} />

<div className="my-4">
Expand Down Expand Up @@ -178,11 +172,6 @@ const Issuers = () => {
popupMessage={t('pageAddCredentials.popup.message', { issuerName: selectedIssuer?.selectedDisplay?.name ?? "Uknown" })}
/>
)}

{/* QR Code Scanner */}
{isQRScannerOpen && (
<QRCodeScanner onClose={closeQRScanner} />
)}
</>
);
};
Expand Down
14 changes: 2 additions & 12 deletions src/pages/Home/Home.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,17 @@ import CredentialsContext from '../../context/CredentialsContext';

// Hooks
import useFetchPresentations from '../../hooks/useFetchPresentations';
import { useQRScanner } from '../../hooks/useQRScanner';
import useScreenType from '../../hooks/useScreenType';

// Components
import { H1 } from '../../components/Shared/Heading';
import QRCodeScanner from '../../components/QRCodeScanner/QRCodeScanner';
import CredentialImage from '../../components/Credentials/CredentialImage';
import QRButton from '../../components/Buttons/QRButton';
import AddCredentialCard from '../../components/Credentials/AddCredentialCard';
import HistoryList from '../../components/History/HistoryList';
import Slider from '../../components/Shared/Slider';

const Home = () => {
const { vcEntityList, latestCredentials, getData } = useContext(CredentialsContext);
const { isQRScannerOpen, openQRScanner, closeQRScanner } = useQRScanner();
const { api } = useContext(SessionContext);
const history = useFetchPresentations(api);
const [currentSlide, setCurrentSlide] = useState(1);
Expand Down Expand Up @@ -60,9 +56,7 @@ const Home = () => {
return (
<>
<div className="sm:px-6 w-full">
<H1 heading={t('common.navItemCredentials')}>
<QRButton openQRScanner={openQRScanner} />
</H1>
<H1 heading={t('common.navItemCredentials')} />
{screenType !== 'mobile' && (
<p className="italic pd-2 text-gray-700 dark:text-gray-300">{t('pageCredentials.description')}</p>
)}
Expand Down Expand Up @@ -92,7 +86,7 @@ const Home = () => {
)}
</>
) : (
<div className="grid grid-cols-1 sm:grid-cols-1 md:grid-cols-2 md:gap-5 lg:gap-10 lg:grid-cols-2 xl:grid-cols-3">
<div className="grid grid-cols-1 sm:grid-cols-1 md:grid-cols-2 md:gap-5 lg:gap-10 lg:grid-cols-2 xl:grid-cols-3">
{vcEntityList.map((vcEntity) => (
<button
key={vcEntity.id}
Expand All @@ -111,10 +105,6 @@ const Home = () => {
)}
</div>
</div>
{/* QR Code Scanner */}
{isQRScannerOpen && (
<QRCodeScanner onClose={closeQRScanner} />
)}
</>
);
}
Expand Down
13 changes: 1 addition & 12 deletions src/pages/SendCredentials/SendCredentials.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@ import { useTranslation } from 'react-i18next';

import StatusContext from '../../context/StatusContext';
import SessionContext from '../../context/SessionContext';
import { useQRScanner } from '../../hooks/useQRScanner';
import QRCodeScanner from '../../components/QRCodeScanner/QRCodeScanner';
import RedirectPopup from '../../components/Popups/RedirectPopup';
import QRButton from '../../components/Buttons/QRButton';
import { H1 } from '../../components/Shared/Heading';
import Button from '../../components/Buttons/Button';
import PageDescription from '../../components/Shared/PageDescription';
Expand All @@ -25,7 +22,6 @@ function highlightBestSequence(verifier, search) {
const Verifiers = () => {
const { isOnline } = useContext(StatusContext);
const { api } = useContext(SessionContext);
const { isQRScannerOpen, openQRScanner, closeQRScanner } = useQRScanner();
const [searchQuery, setSearchQuery] = useState('');
const [verifiers, setVerifiers] = useState([]);
const [filteredVerifiers, setFilteredVerifiers] = useState([]);
Expand Down Expand Up @@ -93,9 +89,7 @@ const Verifiers = () => {
return (
<>
<div className="sm:px-6 w-full">
<H1 heading={t('common.navItemSendCredentials')}>
<QRButton openQRScanner={openQRScanner} />
</H1>
<H1 heading={t('common.navItemSendCredentials')} />
<PageDescription description={t('pageSendCredentials.description')} />

<div className="my-4">
Expand Down Expand Up @@ -141,11 +135,6 @@ const Verifiers = () => {
popupMessage={t('pageSendCredentials.popup.message', { verifierName: selectedVerifier?.name })}
/>
)}

{/* QR Code Scanner */}
{isQRScannerOpen && (
<QRCodeScanner onClose={closeQRScanner} />
)}
</>
);
};
Expand Down

0 comments on commit ef0ad46

Please sign in to comment.