Skip to content

Commit

Permalink
UI fixes (#20) (#21)
Browse files Browse the repository at this point in the history
* fix: remove sidebar in mobile version

* fix: UI snap connection page
  • Loading branch information
WhiteNik16 authored Jan 23, 2024
1 parent 1922777 commit d95dd14
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 38 deletions.
24 changes: 13 additions & 11 deletions src/pages/MainPage/MainPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -126,16 +126,18 @@ const MainPage: FC<Props> = ({ className, ...rest }) => {
ease: 'backInOut',
}}
>
<motion.div
className='main-page__steps-indicator'
animate={{
width: `${stepsProgress}%`,
}}
transition={{
duration: '0.5',
ease: 'backInOut',
}}
/>
{!isDeviceMobile && (
<motion.div
className='main-page__steps-indicator'
animate={{
width: `${stepsProgress}%`,
}}
transition={{
duration: '0.5',
ease: 'backInOut',
}}
/>
)}

<AnimatePresence mode={'wait'}>
{isLoadFailed ? (
Expand Down Expand Up @@ -175,7 +177,7 @@ const MainPage: FC<Props> = ({ className, ...rest }) => {
</AnimatePresence>
</motion.div>

{isSidebarExist && (
{isSidebarExist && !isDeviceMobile && (
<AnimatePresence initial={false} mode={'wait'}>
{isSidebarOpen && (
<motion.div
Expand Down
46 changes: 22 additions & 24 deletions src/pages/MainPage/components/2_SnapConnection/SnapConnection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,34 @@ const SnapConnection: FC<StepProps> = ({ nextStepCb, className, ...rest }) => {
</div>

<h2 className='snap-connection__title'>
{`Add identity management to your wallet`}
{`Enable identity storage to your wallet`}
</h2>

<div className='snap-connection__description'>
<div className='snap-connection__description-item'>
<Icon
className='snap-connection__description-item-icon'
name={ICON_NAMES.metamask}
/>
<span>
{'It has been audited and '}
<u>{'approved by MetaMask'}</u>
</span>
</div>
<div className='snap-connection__description-item'>
<Icon
className='snap-connection__description-item-icon'
name={ICON_NAMES.key}
/>
<span>{'It cannot access your private keys or your crypto'}</span>
</div>
</div>

<div className='app__step-actions snap-connection__button'>
<AppButton
iconLeft={ICON_NAMES.rarimeSnap}
onClick={installSnap}
text={`Connect “MetaMask” Snap`}
text={`Enable RariMe`}
modification='border-circle'
isDisabled={isPending}
/>
Expand All @@ -83,28 +103,6 @@ const SnapConnection: FC<StepProps> = ({ nextStepCb, className, ...rest }) => {
</div>
</div>

<div className='snap-connection__description'>
<p className='snap-connection__description-title'>
{
'RariMe is a MetaMask Extension “Snap” that stores identity credentials'
}
</p>
<div className='snap-connection__description-item'>
<Icon
className='snap-connection__description-item-icon'
name={ICON_NAMES.metamask}
/>
<span>{'It has been audited and approved by MetaMask'}</span>
</div>
<div className='snap-connection__description-item'>
<Icon
className='snap-connection__description-item-icon'
name={ICON_NAMES.key}
/>
<span>{'It cannot access your private keys or your crypto'}</span>
</div>
</div>

<CautionTip
className='snap-connection__subtitle'
message={`Installing the snap could take a few minutes, depending on your internet bandwidth. Please ignore the "Page Unresponsive" errors and wait until the installation is complete.`}
Expand Down
7 changes: 4 additions & 3 deletions src/pages/MainPage/components/2_SnapConnection/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
}

.snap-connection__title {
font-size: toRem(32);
margin: toRem(32) 0 toRem(16);
font-size: toRem(44);
margin: toRem(32) 0 toRem(12);
text-align: start;
}

.snap-connection__subtitle {
Expand All @@ -26,7 +27,7 @@
}

.snap-connection__description {
margin: toRem(32) 0;
margin-bottom: toRem(28);
}

.snap-connection__description-title {
Expand Down

0 comments on commit d95dd14

Please sign in to comment.