Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/HyperPlay-Gaming/hyperplay-…
Browse files Browse the repository at this point in the history 
…desktop-client into Analitycs-consent-modal-update
  • Loading branch information
@biliesilva
biliesilva committed Dec 5, 2024
2 parents a920254 + 642ee3e commit 39d7235
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 51 deletions.
4 changes: 2 additions & 2 deletions public/locales/en/translation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -442,10 +442,10 @@
"bulletPointOne": "Access a vast collection of 100+ on-chain enabled games",
"bulletPointThree": "Play Epic and GOG games directly through HyperPlay",
"bulletPointTwo": "Earn tokens, NFTs, and off-chain rewards by completing Quests",
"bulletTitle": "With HyperPlay, you can:",
"lastParagraph": "Currently in Beta, we highly value your feedback and \n encourage you to report any issues or suggestions in our",
"paragraphOne": "At HyperPlay, we’re building the next-generation game store \n for the future of gaming.",
"paragraphThree": "Seamlessly bring your wallet, tokens, \n and assets into every game while accessing \n the extensive libraries of the Epic Store, \n GOG, and our own HyperPlay Store, all in one place."
"paragraphThr": "Seamlessly bring your wallet, tokens, \n and assets into every game while accessing \n the extensive libraries of the Epic Store, \n GOG, and our own HyperPlay Store-all in one place.",
"TitleList": "With HyperPlay you can:"
},
"titleIntro": "Welcome to HyperPlay!"
}
Expand Down
2 changes: 2 additions & 0 deletions src/frontend/screens/Onboarding/welcome/index.module.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,6 @@
display: flex;
flex-direction: column;
align-items: flex-start;
text-indent: -18px;
padding-left: 18px;
}
18 changes: 6 additions & 12 deletions src/frontend/screens/Onboarding/welcome/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ import { ONBOARDING_SCREEN } from '../types'
import { t } from 'i18next'
import { Button, Images } from '@hyperplay/ui'
import { LanguageSelector } from 'frontend/components/UI'
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
import { faArrowRight } from '@fortawesome/free-solid-svg-icons'
import { FlagPosition } from 'frontend/components/UI/LanguageSelector'
import { onboardingStore } from 'frontend/helpers/electronStores'
import WelcomeStyles from './index.module.scss'
Expand Down Expand Up @@ -32,17 +30,17 @@ const Welcome: React.FC<WelcomeProps> = function (props) {
</div>
<div className={WelcomeStyles.text}>
{t(
'hyperplay.onboarding.welcome.text.paragraphThree',
'hyperplay.onboarding.welcome.text.paragraphThr',
`Seamlessly bring your wallet, tokens,
and assets into every game while accessing
the extensive libraries of the Epic Store,
GOG, and our own HyperPlay Store, all in one place.`
GOG, and our own HyperPlay Store-all in one place.`
)}
</div>
<div className={WelcomeStyles.textBold}>
{t(
'hyperplay.onboarding.welcome.text.bulletTitle',
`With HyperPlay, you can:`
'hyperplay.onboarding.welcome.text.TitleList',
`With HyperPlay you can:`
)}
</div>
<div>
Expand Down Expand Up @@ -87,7 +85,7 @@ const Welcome: React.FC<WelcomeProps> = function (props) {
<a
onClick={() =>
window.api.openExternalUrl(
`https://docs.hyperplay.xyz/faq#q-what-operating-systems-are-supported`
`https://paragraph.xyz/@hyperplay/how-to-play-your-windows-steam-library-on-macos`
)
}
>
Expand Down Expand Up @@ -115,7 +113,7 @@ const Welcome: React.FC<WelcomeProps> = function (props) {
</div>
</div>
<div className={WelcomeStyles.languageSelector}>
<LanguageSelector flagPossition={FlagPosition.PREPEND} />
<LanguageSelector flagPossition={FlagPosition.PREPEND} extraClass="" />
</div>
<div className={WelcomeStyles.actionButton}>
<Button
Expand All @@ -126,10 +124,6 @@ const Welcome: React.FC<WelcomeProps> = function (props) {
type="secondary"
>
{t('button.continue', 'Continue')}{' '}
<FontAwesomeIcon
icon={faArrowRight}
className={WelcomeStyles.actionButtonArrow}
/>
</Button>
</div>
</>
Expand Down
49 changes: 12 additions & 37 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1344,14 +1344,7 @@
dependencies:
bignumber.js "^9.1.2"

"@hyperplay/utils@^0.3.3":
version "0.3.5"
resolved "https://registry.yarnpkg.com/@hyperplay/utils/-/utils-0.3.5.tgz#e3d5edb10ce7e7e2a97402e18dac325208d87156"
integrity sha512-1o4YyxyWcFbQTW6hRZfc85IUNZ2pwm69tG6f6hiW0btzBcFsXfbGT3RP7Xvy5r1xhECjU8/TBiyyBunM8GTNEg==
dependencies:
bignumber.js "^9.1.2"

"@hyperplay/utils@^0.3.4":
"@hyperplay/utils@^0.3.3", "@hyperplay/utils@^0.3.4":
version "0.3.4"
resolved "https://registry.yarnpkg.com/@hyperplay/utils/-/utils-0.3.4.tgz#71d4abe910ec8550c865418118eb1c07df3b399d"
integrity sha512-ndkDnp+iV9BlLCKpbq0XVuuc/ORzaZ+69wFvVvAftdU6mbwbk4EfxAwTOpmXWkLaiGp0MZaybYMa5zYZkxkW5w==
Expand Down Expand Up @@ -3527,13 +3520,20 @@
dependencies:
undici-types "~6.19.2"

"@types/node@^20.16.2", "@types/node@^20.9.0":
"@types/node@^20.16.2":
version "20.16.2"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.2.tgz#9e388f503a5af306e8c63319334887390966a11e"
integrity sha512-91s/n4qUPV/wg8eE9KHYW1kouTfDk2FPGjXbBMfRWP/2vg1rCXNQL1OCabwGs0XSdukuK+MwCDXE30QpSeMUhQ==
dependencies:
undici-types "~6.19.2"

"@types/node@^20.9.0":
version "20.17.6"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.17.6.tgz#6e4073230c180d3579e8c60141f99efdf5df0081"
integrity sha512-VEI7OdvK2wP7XHnsuXbAJnEpEkF6NjSN45QJlL4VGqZSXsnicpesdTWsg9RISeSdYd3yeRj/y3k5KGjUXYnFwQ==
dependencies:
undici-types "~6.19.2"

"@types/parse-json@^4.0.0":
version "4.0.2"
resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.2.tgz#5950e50960793055845e956c427fc2b0d70c5239"
Expand Down Expand Up @@ -12801,16 +12801,7 @@ string-length@^4.0.1:
char-regex "^1.0.2"
strip-ansi "^6.0.0"

"string-width-cjs@npm:string-width@^4.2.0":
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
emoji-regex "^8.0.0"
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"

string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
Expand Down Expand Up @@ -12904,14 +12895,7 @@ stringify-entities@^4.0.0:
character-entities-html4 "^2.0.0"
character-entities-legacy "^3.0.0"

"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
dependencies:
ansi-regex "^5.0.1"

strip-ansi@^6.0.0, strip-ansi@^6.0.1:
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
Expand Down Expand Up @@ -14166,7 +14150,7 @@ word-wrap@^1.2.5:
resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==

"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
Expand All @@ -14184,15 +14168,6 @@ wrap-ansi@^6.2.0:
string-width "^4.1.0"
strip-ansi "^6.0.0"

wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
dependencies:
ansi-styles "^4.0.0"
string-width "^4.1.0"
strip-ansi "^6.0.0"

wrap-ansi@^8.1.0:
version "8.1.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
Expand Down

0 comments on commit 39d7235

Please sign in to comment.