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

Jump to bottom

Hirad/76734/onboarding static dashboard #6579

Merged

mahdiyeh-deriv merged 26 commits into binary-com:pre-appstore from hirad-deriv:hirad/76734/onboarding-static-dashboard

Oct 6, 2022

Contributor

hirad-deriv commented Sep 25, 2022

Changes:

Please include a summary of the change and which issue is fixed below:

...

When you need to add unit test

If this change disrupt current flow
If this change is adding new flow

When you need to add integration test

If components from external libraries are being used to define the flow, e.g. @deriv/components
If it relies on a very specific set of props with no default behavior for the current component.

Test coverage checklist (for reviewer)

Ensure utility / function has a test case
Ensure all the tests are passing

Type of change

hirad-deriv added 7 commits

September 20, 2022 14:36


          Almost finished the static dashboard

bbf7b0c


          80% of the work is done

c1e445b


          fixed some stylings

1dbb876


          Merge branch 'pre-appstore' of https://github.com/binary-com/deriv-app …

0906ddd

…into hirad/76734/onboarding-static-dashboard


          Finishing static dashboard

3a58d57


          Almost finished the static-onboarding-component

371914b


          Fixed border and padding of the main container

54f63ab

hirad-deriv requested review from matin-deriv, balakrishna-deriv, yashim-deriv and nijil-deriv as code owners

September 25, 2022 18:14

boring-cyborg bot added Account AppStore labels

vercel bot commented Sep 25, 2022 •

edited

Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Updated
deriv-app	✅ Ready (Inspect)	Visit Preview	Oct 5, 2022 at 9:13AM (UTC)

hirad-deriv changed the base branch from master to pre-appstore

September 25, 2022 18:14

boring-cyborg bot added the Components label


          fixed sonar cloud errors

4287e29

Contributor

github-actions bot commented Sep 25, 2022 •

edited

Loading

A production App ID was automatically generated for this PR. (log)

PR: Hirad/76734/onboarding static dashboard #6579
URLs:
- w/ App ID + Server: https://deriv-app-git-fork-hirad-rewok-hirad-76734onboarding-sta-97244b.binary.sx?qa_server=frontend.binaryws.com&app_id=31894
- Original: https://deriv-app-git-fork-hirad-rewok-hirad-76734onboarding-sta-97244b.binary.sx
App ID: 31894

Click here to copy & paste above information.

- **PR**: [https://github.com/binary-com/deriv-app/pull/6579](https://github.com/binary-com/deriv-app/pull/6579)
- **URLs**:
    - **w/ App ID + Server**: https://deriv-app-git-fork-hirad-rewok-hirad-76734onboarding-sta-97244b.binary.sx?qa_server=frontend.binaryws.com&app_id=31894
    - **Original**: https://deriv-app-git-fork-hirad-rewok-hirad-76734onboarding-sta-97244b.binary.sx
- **App ID**: `31894`

vercel bot deployed to Preview

September 25, 2022 18:34

View deployment

codecov-commenter commented Sep 25, 2022 •

edited

Loading

Codecov Report

❗ No coverage uploaded for pull request base (pre-appstore@0dbf945). Click here to learn what that means.
The diff coverage is n/a.

@@               Coverage Diff               @@
##             pre-appstore    #6579   +/-   ##
===============================================
  Coverage                ?   20.62%           
===============================================
  Files                   ?     1491           
  Lines                   ?    33124           
  Branches                ?     5726           
===============================================
  Hits                    ?     6833           
  Misses                  ?    25870           
  Partials                ?      421

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

mahdiyeh-deriv reviewed

View reviewed changes

packages/appstore/src/components/onboarding/onboarding.tsx

@@ @@ -33,7 +33,7 @@ const Onboarding = ({ contents }: TOnboardingProps) => { @@
                   return (
                       <div className='onboarding-wrapper'>
                           <div className='onboarding-header'>
-                              <Icon icon='IcWalletDeriv' height={96} width={128} />

Contributor

mahdiyeh-deriv Sep 26, 2022

The logo in design is different(white color for Deriv)

mahdiyeh-deriv reviewed

View reviewed changes

packages/appstore/src/constants/trading-hub-content.tsx

               export const trading_hub_contents: TTradingHubContents = {
                   step1: {
-                      component: 'Step1',
+                      component: <StaticDashboard />,

Contributor

mahdiyeh-deriv Sep 26, 2022 •

edited

Loading

1.the logo and title of financial and derived accounts in CFD part is different from design,
2.also non of the elements should be clickable
3. The platform icons are different from design

test link:

design:

mahdiyeh-deriv reviewed

View reviewed changes

packages/appstore/src/constants/trading-hub-content.tsx Outdated

                       footer_header: localize('Welcome to Trading Hub'),
                       footer_text: localize('This is your new dashboard'),
                       has_next_content: false,
                   },
                   step2: {
-                      component: 'Step2',
+                      component: <StaticDashboard is_cfd_text_blurry is_options_text_blurry is_platformlauncher_blurry />,

Contributor

mahdiyeh-deriv Sep 26, 2022

should have animation which does not in test link

mahdiyeh-deriv reviewed

View reviewed changes

packages/appstore/src/constants/trading-hub-content.tsx Outdated

                       footer_header: localize('Trading accounts'),
                       footer_text: localize(
                           'These are the trading accounts available to you. You can click on an account to find out more.'
                       ),
                       has_next_content: false,
                   },
                   step3: {
-                      component: 'Step3',
+                      component: <StaticDashboard is_cfd_item_blurry is_options_item_blurry is_platformlauncher_blurry />,

Contributor

mahdiyeh-deriv Sep 26, 2022 •

edited

Loading

1.just CFD and Options title should be highlighted and have animation
2. no interaction should be available (buttons should not be clickable)

test link:

design:

mahdiyeh-deriv reviewed

View reviewed changes

packages/appstore/src/constants/trading-hub-content.tsx Outdated

                       footer_header: localize('‘Get’ the accounts you want'),
                       footer_text: localize('Click the ‘Get’ button to create an account'),
                       has_next_content: false,
                   },
                   step5: {
-                      component: 'Step5',

Contributor

mahdiyeh-deriv Sep 26, 2022

Top-up and Trade buttons color should change
More Derived accounts and More Financial accounts should be added
in the Options part the grey background should be same for US Dollar and platform lunchers and there shouln't be white space between them
other Options accounts rather than US Dollar should be lowlighted

Test link:

Design:

mahdiyeh-deriv reviewed

View reviewed changes

packages/appstore/src/constants/trading-hub-content.tsx Outdated

                       footer_header: localize('Top-up your account'),
                       footer_text: localize('Once you have an account click ‘Top-up’ to add funds '),
                       has_next_content: false,
                   },
                   step6: {
-                      component: 'Step6',

Contributor

mahdiyeh-deriv Sep 26, 2022

Just the Derived trade button should be highlighted in CFD part( not the Financial)
More Derived accounts and More Financial accounts should be added
In the Options part the DTrader platform should be highlighted and has animation( others should be lowlighted)
4.Add options button should be added at the right side of the Options accounts

Test Link:

Design:


          Fixed Icons

d481325

vercel bot deployed to Preview

September 27, 2022 14:14

View deployment


          Fixed animations

17299bf

vercel bot deployed to Preview

September 27, 2022 15:23

View deployment

vercel bot deployed to Preview

October 3, 2022 08:59

View deployment

hirad-deriv added 2 commits

October 3, 2022 12:38


          Merge branch 'pre-appstore' of https://github.com/binary-com/deriv-app …

fc8f694

…into hirad/76734/onboarding-static-dashboard


          Pulled from main branch

ecbfa63

vercel bot deployed to Preview

October 3, 2022 09:23

View deployment


          Added box shadow to the animation of the buttons

09fba18

vercel bot deployed to Preview

October 3, 2022 10:08

View deployment

hirad-deriv added 3 commits

October 3, 2022 14:10


          Fixed some issues

f2c7ec1


          Fixed some issues with blurriness

fec61f0


          Fixed margin issues

f4612ae

vercel bot deployed to Preview

October 3, 2022 11:11

View deployment


          Fixed blurriness of login_id in last steps

a7b7ed6

vercel bot deployed to Preview

October 3, 2022 15:35

View deployment

mahdiyeh-deriv reviewed

View reviewed changes

packages/appstore/src/assets/svgs/wallet/ic-appstore-derived.svg Outdated

		@@ -1 +1 @@
		<svg viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#prefix__clip0_26153_90537)"><path d="M0 12C0 5.38 5.38 0 12 0h40c6.62 0 12 5.38 12 12v40c0 6.62-5.38 12-12 12H12C5.38 64 0 58.62 0 52V12z" fill="url(#prefix__paint0_linear_26153_90537)"/><path d="M0 12C0 5.38 5.38 0 12 0h40c6.62 0 12 5.38 12 12v40c0 6.62-5.38 12-12 12H12C5.38 64 0 58.62 0 52V12z" fill="url(#prefix__paint1_radial_26153_90537)"/><path d="M3 43v9c0 4.96 4.04 9 9 9h40c4.96 0 9-4.04 9-9v-9H3z" fill="#7448D3"/><path fill-rule="evenodd" clip-rule="evenodd" d="M35.1 8.88c1.8.26 3.42 1.2 4.54 2.64a7.144 7.144 0 011.48 5.08l-1.1 7.96c0 .12-.06.24-.14.34-.08.1-.18.18-.28.24-.12.06-.24.08-.36.08s-.24-.04-.36-.1l-1.46-.94a.728.728 0 01-.28-.32.772.772 0 01-.06-.42l.48-3.84c.08-.92-.12-1.84-.6-2.64l-.18 1.12-1.02-.42a.73.73 0 00-.58 0 .78.78 0 00-.4.4c-.18.02-.36.12-.48.26s-.18.34-.18.52l.06 1.76c0 .14.06.28.14.4.08.12.2.2.32.26l1.26.56c-2.52.68-5.16.68-7.68 0l1.2-.48c.14-.06.24-.16.34-.28.1-.12.12-.26.14-.4l.06-1.76c0-.18-.06-.36-.18-.5a.72.72 0 00-.46-.26c-.2-.64-1-.46-1-.46l-.98.4-.18-1.12c-.28.44-.48.92-.58 1.42l-3.22 1.32-.22-1.26-.18-1.54c-.24-1.82.24-3.66 1.3-5.14a6.94 6.94 0 014.42-2.8 3.4 3.4 0 01.9-2.04c.3-.3.64-.56 1.04-.72.4-.18.8-.26 1.24-.28.42 0 .84.06 1.24.22s.76.4 1.06.7c.3.3.56.66.72 1.06.12.3.2.6.24.92l-.02.06zm.02 1.38v.96c.04.86-.3 1.7-.9 2.34-.6.62-1.42.98-2.28 1-.86 0-1.68-.32-2.3-.92-.62-.6-.98-1.44-.98-2.3v-.94l-1.36 2.38 1.14.72-.6 1.16 3.54 2.36s.08.04.12.04c.04 0 .08-.02.12-.04a.11.11 0 00.06-.1v-.12l-1.18-2.52c.46.22.96.34 1.48.34s1.02-.14 1.46-.38l-1.1 2.56s-.02.08 0 .12c0 .04.04.08.06.1.04.02.08.04.12.04.04 0 .08 0 .12-.04l3.46-2.48-.64-1.16 1.14-.78-1.44-2.32-.04-.02zm-4.62-1.8a1.36 1.36 0 011.2-.86v-.78c-.56 0-1.08.24-1.48.64-.38.4-.6.94-.6 1.5h.76c0-.18.02-.36.1-.52l.02.02zm2.78 11.22s0 .16-.04.22c-.02.08-.06.14-.12.2s-.12.1-.18.12c-.06.02-.14.04-.22.04h-1.48s-.14 0-.22-.04a.567.567 0 01-.3-.3.719.719 0 01-.04-.22v-.86s0-.14.04-.22a.36.36 0 01.12-.18c.06-.06.12-.1.18-.12.06-.02.14-.04.22-.04h1.48s.14 0 .22.04c.08.04.14.08.18.12.06.06.1.12.12.18.02.06.04.14.04.22v.84z" fill="#6CAD56"/><path d="M23.898 23.28l.36 1.58c.02.12.08.24.16.34.08.1.18.18.3.22.12.06.24.08.38.06.12 0 .24-.06.36-.12l1.44-.98c.12-.08.22-.2.28-.34.06-.14.08-.28.06-.44l-.52-1.84-1.6.68c-.44.2-.84.5-1.18.84h-.04z" fill="#6CAD56"/><path d="M37.26 21.78l-2.06-.9a.915.915 0 01-.34-.28c-.1-.12-.12-.26-.14-.4l-.06-1.76c0-.12.02-.26.08-.38s.14-.22.24-.28c.1-.08.22-.12.36-.14.12 0 .26 0 .38.06l1.74.7c.08.4.1.82.06 1.22l-.26 2.16z" fill="#3E9AC7"/><path fill-rule="evenodd" clip-rule="evenodd" d="M43.099 20.74l-2.4-1-.46 3.42c.16.12.28.28.36.46.08.18.1.38.08.58l-.54-.38-.06.46c-.12.98-.7.98-.96.92-.14.1-.32.16-.5.16s-.36-.08-.5-.18l-1.48-.94a.728.728 0 01-.28-.32c-.06-.14-.08-.28-.06-.42l.1-.84s-2.74 2-3.94 7.24l1.32-1.08c.12-.1.24-.16.4-.16.14 0 .3 0 .42.08l1.56.78c.16.08.28.22.34.38s.08.34.04.52c.1.16.14.34.1.54-.02.18-.12.36-.26.48l-.94.78.18.56c-.92 0-1.8-.32-2.52-.88l-2.96-2.44a.91.91 0 00-.38-.16c-.14 0-.28 0-.4.06l-1.56.78c-.12.06-.22.14-.28.24-.08.1-.12.22-.14.36 0 .12 0 .26.04.38s.12.22.22.3l6.1 5.14a6.937 6.937 0 005.04 1.42c1.8-.2 3.46-1.08 4.62-2.48.68.32 1.44.4 2.16.22a3.28 3.28 0 002-1.5c.22-.36.36-.78.42-1.2.06-.42.04-.86-.06-1.28-.1-.42-.28-.82-.54-1.16-.18-.26-.4-.48-.66-.66.68-1.7.68-3.6 0-5.3a7.162 7.162 0 00-3.62-3.84v-.04zm2.46 8.42l-1.28-2.4-1.22.62-.66-1.16-3.86 1.78s-.1.04-.12.08c-.04.04-.04.1-.04.14 0 .06.04.1.08.12.04.04.1.04.14.04l2.72.32c.28-.18.6-.32.94-.4.84-.22 1.72-.08 2.46.36l.82.5h.02zm-5.74 2.08l-1.56-2.32s-.06-.06-.1-.08h-.12c-.04 0-.08.04-.1.08-.02.04-.04.08-.04.12l.24 4.28 1.3.06.04 1.4h2.72l-.84-.5c-.36-.22-.68-.52-.94-.86-.26-.34-.44-.74-.54-1.16-.08-.34-.12-.68-.08-1.02h.02zm-1.9-4.46l-.62 1.36s-.08.14-.14.18c-.06.06-.12.1-.2.12-.08.02-.14.04-.22.04-.08 0-.14-.02-.22-.06l-.76-.38a.495.495 0 01-.28-.32c-.06-.14-.04-.3 0-.44l.62-1.36s.08-.14.14-.18c.06-.06.12-.1.2-.12.08-.02.14-.04.22-.04.08 0 .14.02.22.06l.76.38c.14.06.24.18.28.32.06.14.04.3 0 .44zm8.9 6.84l-.66-.38c.18-.32.22-.68.14-1.02-.1-.34-.32-.64-.62-.82l.38-.66a2.129 2.129 0 01.76 2.9v-.02z" fill="#3E9AC7"/><path fill-rule="evenodd" clip-rule="evenodd" d="M27.501 31.26a.699.699 0 01-.16-.44c0-.16.04-.32.12-.46-.04-.16 0-.34.06-.5.08-.16.2-.28.36-.36l1.56-.78c.14-.06.28-.08.42-.08.14 0 .28.08.4.16l1.28 1.06c-1.34-5.14-4.1-7.22-4.1-7.22l.32 1.14c.02.14 0 .3-.04.44-.06.14-.16.26-.28.34l-1.44.98a.84.84 0 01-.48.14c-.18 0-.34-.08-.46-.2a.93.93 0 01-.46-.12.8.8 0 01-.3-.38l-.2-1.06-.78.3c.38-.96 1.08-1.44 1.96-1.84l3.52-1.5c.14-.06.24-.16.34-.28.08-.12.12-.26.14-.4l.06-1.76c0-.12-.02-.26-.08-.38a.665.665 0 00-.24-.28.719.719 0 00-.36-.14c-.12 0-.26 0-.38.06l-7.36 3.02a7.162 7.162 0 00-3.62 3.84 7.14 7.14 0 000 5.3c.08-.06.18-.14.28-.18l.86-.52 1.3-2.44 1.22.62.66-1.16 3.86 1.8s.1.04.12.08c.04.04.04.1.04.14 0 .06-.04.1-.08.12-.04.04-.1.04-.14.04l-2.74.32c.44.28.8.64 1.08 1.08.28.44.42.94.46 1.46l1.56-2.32s.06-.06.1-.08h.12c.04 0 .08.04.1.08.02.04.04.08.04.12l-.28 4.3-1.3.04-.04 1.36h-2.66l.78-.48c.36-.22.68-.52.94-.86.26-.34.44-.74.54-1.16.1-.42.12-.86.06-1.28-.06-.42-.2-.84-.42-1.2a3.299 3.299 0 00-2-1.5c-.84-.22-1.72-.08-2.46.36l-1.7 1.04c-.36.22-.68.52-.94.86-.26.34-.44.74-.54 1.16-.1.42-.12.86-.06 1.28.06.42.2.84.42 1.2.44.74 1.16 1.28 2 1.5.72.18 1.48.1 2.16-.2 1.16 1.4 2.82 2.3 4.62 2.48 1.8.2 3.62-.32 5.04-1.42l1.72-1.44-4.52-3.82v.02zm-.52-3l-.62-1.36s-.06-.14-.06-.22c0-.08 0-.16.04-.22.02-.08.06-.14.12-.2s.12-.1.18-.14l.76-.36s.14-.06.22-.06c.08 0 .16 0 .22.04.08.02.14.06.2.12s.1.12.14.18l.62 1.36s.06.14.06.22c0 .08 0 .16-.04.22-.02.08-.06.14-.12.2s-.12.1-.18.14l-.76.38s-.14.06-.22.06c-.08 0-.16 0-.22-.04a.415.415 0 01-.2-.12.472.472 0 01-.12-.18l-.02-.02zm-9.2 4c.02-.18.08-.34.16-.5.18-.3.48-.54.82-.62l-.2-.74c-.54.14-1 .5-1.28 1-.28.48-.36 1.06-.22 1.62l.74-.2c-.04-.18-.06-.36-.04-.52l.02-.04z" fill="#D7CB3B"/><path d="M34.9 32.66l1.5-1.28s.18-.18.22-.3c.04-.12.06-.24.04-.38 0-.12-.06-.26-.14-.36-.08-.1-.18-.2-.28-.24l-1.56-.78c-.14-.06-.28-.08-.42-.08-.14 0-.28.08-.4.16l-1.88 1.54 1.1.92c.52.42 1.14.68 1.8.8h.02z" fill="#D7CB3B"/><path d="M17.078 46.42h4.06c2.92 0 4.82 1.88 4.82 5.58s-1.9 5.58-4.82 5.58h-4.06V46.42zm4.06 9.3c1.56 0 2.58-.92 2.58-2.84v-1.76c0-1.9-1-2.84-2.58-2.84h-1.96v7.42h1.96v.02zM30.218 57.58h-2.12V46.42h5.04c2.04 0 3.3 1.34 3.3 3.46 0 1.54-.7 2.7-2.08 3.16l2.28 4.54h-2.36l-2.08-4.3h-2v4.3h.02zm2.72-6.08c.82 0 1.32-.44 1.32-1.26v-.74c0-.82-.5-1.24-1.32-1.24h-2.72v3.24h2.72zM40.859 57.58l-3.64-11.16h2.16l1.72 5.44 1 3.7h.04l.98-3.7 1.72-5.44h2.1l-3.64 11.16h-2.44z" fill="#fff"/></g><defs><radialGradient id="prefix__paint1_radial_26153_90537" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 -97 97 0 32.21 25.13)"><stop offset=".2" stop-color="#F1F2F2"/><stop offset=".55" stop-color="#C1D2D2"/></radialGradient><linearGradient id="prefix__paint0_linear_26153_90537" x1="32" y1="64" x2="32" y2="0" gradientUnits="userSpaceOnUse"><stop stop-color="#9F9F9F"/><stop offset=".49" stop-color="#F1F2F2"/></linearGradient><clipPath id="prefix__clip0_26153_90537"><path fill="#fff" d="M0 0h64v64H0z"/></clipPath></defs></svg>

Contributor

mahdiyeh-deriv Oct 4, 2022

there is no change for this file, try to remove it from changes

Contributor Author

hirad-deriv Oct 5, 2022 •

edited

Loading

I have added and used them before being added to the project. Can't revert the code since I will lose more than half the code of this branch.

mahdiyeh-deriv reviewed

View reviewed changes

packages/appstore/src/assets/svgs/wallet/ic-appstore-derivx.svg

		@@ -1 +1 @@
		<svg viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#prefix__clip0_27506_80420)"><path d="M0 12C0 5.38 5.38 0 12 0h40c6.62 0 12 5.38 12 12v40c0 6.62-5.38 12-12 12H12C5.38 64 0 58.62 0 52V12z" fill="url(#prefix__paint0_linear_27506_80420)"/><path d="M13.4 21l8.42 11-13.5 11h13.64c1.94 0 3.8-.66 5.32-1.86a8.54 8.54 0 003.02-4.76l1.12-4.9c.28-1.26.3-2.56 0-3.82a8.56 8.56 0 00-1.64-3.44c-.8-1-1.82-1.82-2.98-2.38a8.509 8.509 0 00-3.72-.84H13.4z" fill="url(#prefix__paint1_linear_27506_80420)"/><path d="M21.844 32l-6 11h-7.5l13.5-11z" fill="#CC2F3E"/><path d="M41.064 21h-6.52l5.12 11-9 11h6.52l9-11-5.12-11zm8.36 0h6.6l-7.82 9.46-2.36-5.06 3.58-4.38V21zm-3.88 22l-2.04-4.38 4.16-5.08 4.4 9.46h-6.52z" fill="#fff"/></g><defs><linearGradient id="prefix__paint0_linear_27506_80420" x1="32" y1="64" x2="32" y2="0" gradientUnits="userSpaceOnUse"><stop/><stop offset="1" stop-color="#58595B"/></linearGradient><linearGradient id="prefix__paint1_linear_27506_80420" x1="6.343" y1="18.82" x2="2.388" y2="43.536" gradientUnits="userSpaceOnUse"><stop stop-color="#F26447"/><stop offset="1" stop-color="#EF4852"/></linearGradient><clipPath id="prefix__clip0_27506_80420"><path fill="#fff" d="M0 0h64v64H0z"/></clipPath></defs></svg>

Contributor

mahdiyeh-deriv Oct 4, 2022

ditto

mahdiyeh-deriv reviewed

View reviewed changes

packages/appstore/src/assets/svgs/wallet/ic-appstore-financial.svg Outdated

		@@ -1 +1 @@
		<svg viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#prefix__clip0_26153_90581)"><path d="M0 12C0 5.376 5.375 0 12 0h40c6.625 0 12 5.375 12 12v40c0 6.625-5.375 12-12 12H12C5.376 64 0 58.625 0 52V12z" fill="url(#prefix__paint0_linear_26153_90581)"/><path d="M0 12C0 5.376 5.375 0 12 0h40c6.625 0 12 5.375 12 12v40c0 6.625-5.375 12-12 12H12C5.376 64 0 58.625 0 52V12z" fill="url(#prefix__paint1_radial_26153_90581)"/><path d="M3 43.004V52c0 4.96 4.035 8.996 8.997 8.996h39.999c4.96 0 8.996-4.035 8.996-8.996v-8.997H3z" fill="#FFC71B"/><path d="M19.562 57.805V46.633h7.182v1.874H21.67v2.703h4.42v1.875h-4.42v4.72h-2.115.007zM28.332 57.805v-1.694h1.476v-7.777h-1.476V46.64h5.074v1.694h-1.49v7.777h1.49v1.694h-5.074zM38.766 52.076l-1.152-2.319h-.045v8.048h-2.003V46.633h2.32l3.357 5.729 1.152 2.319h.045v-8.048h2.003v11.172h-2.32l-3.357-5.73z" fill="#fff"/><path fill-rule="evenodd" clip-rule="evenodd" d="M35.097 8.887V8.88a7.038 7.038 0 014.54 2.652 7.2 7.2 0 011.48 5.09l-1.106 7.97a.776.776 0 01-.428.581.756.756 0 01-.716-.034l-1.467-.933a.769.769 0 01-.35-.749l.476-3.834a4.285 4.285 0 00-.599-2.631l-.171 1.119-1.03-.413a.754.754 0 00-.571.004.766.766 0 00-.408.405.76.76 0 00-.478.268.778.778 0 00-.178.523l.065 1.759a.778.778 0 00.453.663l1.266.56c-2.515.69-5.166.69-7.68 0l1.196-.471a.765.765 0 00.465-.683l.065-1.759a.778.778 0 00-.176-.504.76.76 0 00-.457-.268c-.194-.632-1.006-.459-1.006-.459l-.98.405-.183-1.11c-.278.435-.474.919-.58 1.427l-3.22 1.327-.217-1.258-.18-1.543a7.2 7.2 0 011.303-5.137 7.042 7.042 0 014.423-2.805 3.309 3.309 0 01.9-2.04 3.208 3.208 0 014.582-.082 3.282 3.282 0 01.967 1.967zm.023.332v.005-.005zm.018 1.043l.017.965c.015.87-.312 1.71-.909 2.336a3.223 3.223 0 01-2.274 1.001 3.22 3.22 0 01-2.308-.92 3.297 3.297 0 01-.99-2.3l-.015-.934-1.338 2.385 1.144.714-.602 1.157 3.545 2.36a.188.188 0 00.23-.017.193.193 0 00.044-.23l-1.185-2.518a3.193 3.193 0 002.938-.054l-1.101 2.561a.194.194 0 00.053.23.189.189 0 00.233.005l3.46-2.484-.643-1.157 1.143-.771-1.442-2.329zM30.515 8.47c.065-.166.163-.316.287-.443.243-.255.576-.403.926-.413V6.84a2.104 2.104 0 00-1.475.649c-.387.4-.601.94-.595 1.5h.762c-.003-.178.03-.355.095-.52zm2.772 11.212a.572.572 0 01-.34.544.553.553 0 01-.22.046h-1.483a.555.555 0 01-.52-.353.572.572 0 01-.04-.218v-.868a.572.572 0 01.344-.527.551.551 0 01.216-.044h1.483a.551.551 0 01.397.168.57.57 0 01.163.403v.849z" fill="#6CAD56"/><path d="M23.906 23.29l.355 1.58a.776.776 0 00.453.577.755.755 0 00.725-.07l1.437-.988a.77.77 0 00.327-.772l-.51-1.844-1.598.68c-.44.206-.843.49-1.189.836z" fill="#6CAD56"/><path d="M37.263 21.784l-2.051-.903a.777.777 0 01-.465-.683l-.069-1.759a.779.779 0 01.324-.66.757.757 0 01.724-.084l1.739.698c.079.404.1.817.06 1.227l-.262 2.164z" fill="#3E9AC7"/><path fill-rule="evenodd" clip-rule="evenodd" d="M43.091 20.732l-2.394-.992-.465 3.422a1.155 1.155 0 01.454 1.057l-.545-.386-.065.467c-.13.983-.698.983-.968.926a.816.816 0 01-.999-.035l-1.471-.938a.768.768 0 01-.351-.748l.103-.833s-2.733 2.002-3.941 7.24l1.322-1.08a.758.758 0 01.816-.096l1.563.771a.78.78 0 01.381.891.78.78 0 01-.156 1.003l-.934.78.175.563a4.195 4.195 0 01-2.523-.884l-2.962-2.437a.757.757 0 00-.79-.097l-1.566.772a.764.764 0 00-.426.6.78.78 0 00.27.688l6.099 5.15a6.995 6.995 0 009.666-1.063 3.208 3.208 0 002.159.21 3.247 3.247 0 001.993-1.49 3.3 3.3 0 00.369-2.484 3.291 3.291 0 00-1.192-1.823 7.216 7.216 0 00.005-5.306 7.1 7.1 0 00-3.627-3.848zm2.465 8.428l-1.287-2.407-1.212.613-.66-1.157-3.853 1.775a.193.193 0 00-.127.077.197.197 0 00.04.273c.042.03.093.043.144.035l2.728.326a3.21 3.21 0 013.398-.04l.83.505zm-5.73 2.084l-1.56-2.311a.191.191 0 00-.219-.073.194.194 0 00-.129.192l.248 4.278 1.3.054.034 1.4h2.721l-.83-.506a3.254 3.254 0 01-.937-.86 3.297 3.297 0 01-.628-2.174zm-1.9-4.452l-.625 1.358a.577.577 0 01-.325.298.561.561 0 01-.437-.024l-.763-.386a.573.573 0 01-.27-.752l.625-1.358a.57.57 0 01.323-.303.558.558 0 01.44.025l.762.386c.134.064.238.18.289.321a.578.578 0 01-.019.435zm8.898 6.832l-.657-.384c.177-.31.225-.68.134-1.026a1.352 1.352 0 00-.621-.822l.38-.667c.481.283.831.747.974 1.291a2.148 2.148 0 01-.21 1.608z" fill="#3E9AC7"/><path fill-rule="evenodd" clip-rule="evenodd" d="M27.496 31.26a.777.777 0 01-.046-.888.78.78 0 01.416-.852l1.562-.772a.755.755 0 01.812.096l1.285 1.061c-1.338-5.146-4.09-7.22-4.09-7.22l.312 1.13a.78.78 0 01-.324.77l-1.437.988a.755.755 0 01-.941-.07.755.755 0 01-.467-.128.769.769 0 01-.296-.388l-.19-1.068-.785.304c.38-.968 1.086-1.439 1.955-1.84l3.518-1.5a.764.764 0 00.465-.683l.065-1.76a.78.78 0 00-.325-.663.757.757 0 00-.727-.08l-7.353 3.027a7.104 7.104 0 00-3.615 3.842 7.22 7.22 0 00.002 5.305 2.74 2.74 0 01.278-.19l.857-.524 1.304-2.43 1.224.613.655-1.157 3.858 1.794c.05.007.096.035.126.076a.197.197 0 01-.04.273.191.191 0 01-.143.036l-2.74.317c.437.27.804.642 1.07 1.086.265.444.42.946.454 1.463l1.567-2.314a.19.19 0 01.346.12l-.274 4.3-1.3.043-.034 1.37h-2.668l.777-.473c.365-.222.684-.515.937-.861a3.3 3.3 0 00.6-2.439 3.308 3.308 0 00-.428-1.205 3.251 3.251 0 00-1.995-1.492 3.215 3.215 0 00-2.453.37l-1.7 1.037a3.25 3.25 0 00-.936.86 3.292 3.292 0 00-.598 2.434 3.3 3.3 0 00.428 1.204 3.247 3.247 0 001.993 1.493 3.209 3.209 0 002.157-.209 6.996 6.996 0 009.676 1.062l1.72-1.446-4.514-3.823zm-.519-3.002l-.625-1.358a.568.568 0 01.27-.771l.763-.367a.561.561 0 01.63.092c.056.051.1.113.133.182l.625 1.358a.575.575 0 01-.27.772l-.763.385a.558.558 0 01-.634-.104.572.572 0 01-.129-.189zm-9.198 4c.023-.175.08-.345.168-.499.18-.308.471-.532.812-.625l-.198-.744a2.108 2.108 0 00-1.273.992 2.152 2.152 0 00-.21 1.611l.736-.208a1.36 1.36 0 01-.035-.526z" fill="#D7CB3B"/><path d="M34.891 32.663l1.502-1.288a.772.772 0 00.271-.686.777.777 0 00-.424-.602l-1.566-.772a.755.755 0 00-.812.096l-1.872 1.543 1.11.915a3.933 3.933 0 001.791.794z" fill="#D7CB3B"/></g><defs><radialGradient id="prefix__paint1_radial_26153_90581" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 -97 97 0 32 25)"><stop offset=".196" stop-color="#F1F2F2"/><stop offset=".552" stop-color="#C1D2D2"/></radialGradient><linearGradient id="prefix__paint0_linear_26153_90581" x1="32.004" y1="64" x2="32.004" y2="0" gradientUnits="userSpaceOnUse"><stop stop-color="#9F9F9F"/><stop offset=".49" stop-color="#F1F2F2"/></linearGradient><clipPath id="prefix__clip0_26153_90581"><path fill="#fff" d="M0 0h64v64H0z"/></clipPath></defs></svg>

Contributor

mahdiyeh-deriv Oct 4, 2022

ditto

mahdiyeh-deriv reviewed

View reviewed changes

packages/appstore/src/assets/svgs/wallet/ic-appstore-options.svg Outdated

		@@ -1 +1 @@
		<svg viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#prefix__clip0_27113_74253)"><path d="M0 12C0 5.38 5.38 0 12 0h40c6.62 0 12 5.38 12 12v40c0 6.62-5.38 12-12 12H12C5.38 64 0 58.62 0 52V12z" fill="url(#prefix__paint0_linear_27113_74253)"/><path d="M34 38c0-2.2 1.8-4 4-4h8c2.2 0 4 1.8 4 4v8c0 2.2-1.8 4-4 4h-8c-2.2 0-4-1.8-4-4v-8z" fill="#FF6444"/><path d="M14 38c0-2.2 1.8-4 4-4h8c2.2 0 4 1.8 4 4v8c0 2.2-1.8 4-4 4h-8c-2.2 0-4-1.8-4-4v-8z" fill="#336F9A"/><path d="M34 18c0-2.2 1.8-4 4-4h8c2.2 0 4 1.8 4 4v8c0 2.2-1.8 4-4 4h-8c-2.2 0-4-1.8-4-4v-8z" fill="#85ACB0"/><path d="M14 18c0-2.2 1.8-4 4-4h8c2.2 0 4 1.8 4 4v8c0 2.2-1.8 4-4 4h-8c-2.2 0-4-1.8-4-4v-8z" fill="#FF444F"/></g><defs><linearGradient id="prefix__paint0_linear_27113_74253" x1="32" y1="64" x2="32" y2="0" gradientUnits="userSpaceOnUse"><stop/><stop offset="1" stop-color="#58595B"/></linearGradient><clipPath id="prefix__clip0_27113_74253"><path fill="#fff" d="M0 0h64v64H0z"/></clipPath></defs></svg>

Contributor

mahdiyeh-deriv Oct 4, 2022

same here

mahdiyeh-deriv reviewed

View reviewed changes

packages/appstore/src/components/onboarding/onboarding.tsx

-                                              : localize('Next')}
-                                      </Button>
-                                  </div>
+                                  {isDesktop() && (

Contributor

mahdiyeh-deriv Oct 4, 2022

isn't better to use <DesktopWrapper> and <MobileWrapper> instead?

Contributor Author

hirad-deriv Oct 5, 2022 •

edited

Loading

I have tried it but did not get the results that I wanted. So I used isDesktop and isMobile in order to move the card forward faster. I can refactor the component after the project is ready.

mahdiyeh-deriv reviewed

View reviewed changes

packages/appstore/src/assets/svgs/wallet/ic-appstore-binarybot-blue.svg Outdated

		@@ -0,0 +1,15 @@
		<svg width="33" height="33" viewBox="0 0 27 26" fill="none" xmlns="http://www.w3.org/2000/svg">

Contributor

mahdiyeh-deriv Oct 4, 2022

minify it please

Contributor Author

hirad-deriv Oct 5, 2022

Minified all of the newly added SVGs

mahdiyeh-deriv reviewed

View reviewed changes

packages/appstore/src/assets/svgs/wallet/ic-appstore-deriv-logo.svg Outdated

		@@ -0,0 +1,20 @@
		<svg width="128" height="96" viewBox="0 0 89 16" fill="none" xmlns="http://www.w3.org/2000/svg">

Contributor

mahdiyeh-deriv Oct 4, 2022

minify it

mahdiyeh-deriv reviewed

View reviewed changes

packages/appstore/src/assets/svgs/wallet/ic-appstore-smarttrader-blue.svg Outdated

		@@ -0,0 +1,16 @@
		<svg width="33" height="33" viewBox="0 0 27 26" fill="none" xmlns="http://www.w3.org/2000/svg">

Contributor

mahdiyeh-deriv Oct 4, 2022

minify it

mahdiyeh-deriv reviewed

View reviewed changes

packages/components/src/components/icon/appstore/ic-appstore-add-square.svg Outdated

		@@ -0,0 +1,11 @@
		<svg width="33" height="33" viewBox="0 0 33 33" fill="none" xmlns="http://www.w3.org/2000/svg">

Contributor

mahdiyeh-deriv Oct 4, 2022

minify


          Minified SVGs

b7110ea

sonarcloud bot commented Oct 5, 2022

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
No Duplication information

vercel bot deployed to Preview

October 5, 2022 09:13

View deployment

mahdiyeh-deriv reviewed

View reviewed changes

packages/components/src/components/icon/icons.js

@@ @@ -12,11 +13,9 @@ import './appstore/ic-appstore-checked.svg'; @@
               import './appstore/ic-appstore-circle.svg';
               import './appstore/ic-appstore-close-dark.svg';
               import './appstore/ic-appstore-close-light.svg';
-              import './appstore/ic-appstore-derived.svg';

Contributor

mahdiyeh-deriv Oct 6, 2022

why these are deleted?

mahdiyeh-deriv reviewed

View reviewed changes

packages/components/src/components/icon/icons.js

               import './appstore/ic-appstore-ellipse.svg';
               import './appstore/ic-appstore-error.svg';
-              import './appstore/ic-appstore-financial.svg';

Contributor

mahdiyeh-deriv Oct 6, 2022

same here

mahdiyeh-deriv reviewed

View reviewed changes

packages/components/src/components/icon/icons.js

@@ @@ -25,7 +24,6 @@ import './appstore/ic-appstore-linked-wallets.svg'; @@
               import './appstore/ic-appstore-menu-homepage.svg';
               import './appstore/ic-appstore-multipliers-trade-type.svg';
               import './appstore/ic-appstore-option-trade-type.svg';
-              import './appstore/ic-appstore-options.svg';

Contributor

mahdiyeh-deriv Oct 6, 2022

same

mahdiyeh-deriv reviewed

View reviewed changes

packages/components/stories/icon/icons.js

@@ @@ -15,11 +16,9 @@ export const icons = @@
                       'IcAppstoreCircle',
                       'IcAppstoreCloseDark',
                       'IcAppstoreCloseLight',
-                      'IcAppstoreDerived',

Contributor

mahdiyeh-deriv Oct 6, 2022

why these are deleted?

mahdiyeh-deriv approved these changes

View reviewed changes

mahdiyeh-deriv merged commit d964489 into binary-com:pre-appstore

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

mahdiyeh-deriv mahdiyeh-deriv approved these changes

matin-deriv Awaiting requested review from matin-deriv

balakrishna-deriv Awaiting requested review from balakrishna-deriv

yashim-deriv Awaiting requested review from yashim-deriv

nijil-deriv Awaiting requested review from nijil-deriv

Labels

Account AppStore Components