Skip to content

Commit

Permalink
Merge pull request #1489 from oasisprotocol/lw/astar-footnote
Browse files Browse the repository at this point in the history
Add an AStar footnote to Transak disclaimer
  • Loading branch information
lukaw3d authored Aug 1, 2023
2 parents 9dcca53 + e91f0c3 commit 7cb5555
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 5 deletions.
6 changes: 5 additions & 1 deletion src/app/components/AlertBox/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import * as React from 'react'
import { useContext } from 'react'
import { ThemeContext } from 'styled-components'

export type AlertBoxStatus = 'error' | 'warning' | 'ok' | 'ok-weak'
export type AlertBoxStatus = 'error' | 'warning' | 'ok' | 'ok-weak' | 'info'

interface Props {
status: AlertBoxStatus
Expand All @@ -32,6 +32,10 @@ const mapStatus = {
color: 'alert-box-ok-weak',
background: 'alert-box-ok-weak-background',
},
info: {
color: 'alert-box-info',
background: 'alert-box-info-background',
},
}

export function AlertBox(props: Props) {
Expand Down
17 changes: 15 additions & 2 deletions src/app/pages/FiatOnramp/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export function FiatOnramp() {
<AlertBox status="error" icon={<CircleAlert size="24px" color="currentColor" />}>
{t(
'fiatOnramp.thirdPartyDisclaimer',
'This service is provided by an external party. Oasis does not carry any responsibility. All fees charged by Transak.',
'This service is provided by an external party. Oasis* does not carry any responsibility. All fees charged by Transak.',
)}
</AlertBox>

Expand All @@ -101,7 +101,7 @@ export function FiatOnramp() {
<CheckBox
label={t(
'fiatOnramp.thirdPartyAcknowledge',
'I understand that I’m using a third-party solution and Oasis does not carry any responsibility over the usage of this solution.',
'I understand that I’m using a third-party solution and Oasis* does not carry any responsibility over the usage of this solution.',
)}
checked={thirdPartyAcknowledged}
onChange={event => setThirdPartyAcknowledged(event.target.checked)}
Expand Down Expand Up @@ -134,6 +134,19 @@ export function FiatOnramp() {
}}
></iframe>
)}

<br />
<AlertBox status="info">
<Box direction="row" gap="xsmall">
<span>*</span>
<span>
{t(
'fiatOnramp.astarFootnote',
'It is hereby noted that AStar Technologies, a Cayman Islands exempted company is acting on behalf and for the purposes of Oasis, and is also the provider of the Oasis Wallet.',
)}
</span>
</Box>
</AlertBox>
</Box>
</Box>
)
Expand Down
5 changes: 3 additions & 2 deletions src/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -163,15 +163,16 @@
"instruction": "A fatal error has occurred and Oasis Wallet must stop. Try refreshing the page and reopening your wallet to see if the issue persists. If the issue persists, please contact our support team via <Email/> email and attach the report below."
},
"fiatOnramp": {
"astarFootnote": "It is hereby noted that AStar Technologies, a Cayman Islands exempted company is acting on behalf and for the purposes of Oasis, and is also the provider of the Oasis Wallet.",
"description": "This feature allows you to convert your fiat currency into cryptocurrency.",
"header": "Buy ROSE",
"headerInWidget": "Purchase ROSE to your wallet",
"notMainnet": "You can only use this feature when your are on the mainnet.",
"notYourAccount": "You can only use this feature when your wallet is open.",
"openYourWallet": "Open your wallet",
"switchToMainnet": "Switch to Mainnet",
"thirdPartyAcknowledge": "I understand that I’m using a third-party solution and Oasis does not carry any responsibility over the usage of this solution.",
"thirdPartyDisclaimer": "This service is provided by an external party. Oasis does not carry any responsibility. All fees charged by Transak."
"thirdPartyAcknowledge": "I understand that I’m using a third-party solution and Oasis* does not carry any responsibility over the usage of this solution.",
"thirdPartyDisclaimer": "This service is provided by an external party. Oasis* does not carry any responsibility. All fees charged by Transak."
},
"footer": {
"github": "Oasis Wallet is fully <GithubLink>open source</GithubLink> - Feedback and issues are appreciated!",
Expand Down
8 changes: 8 additions & 0 deletions src/styles/theme/ThemeProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,14 @@ const grommetCustomTheme: ThemeType = {
},
'status-error': '#d24c00',

'alert-box-info': {
dark: '#0092f6',
light: '#d4ebff',
},
'alert-box-info-background': {
dark: '#d4ebff',
light: '#0092f6',
},
'alert-box-ok-weak': {
dark: '#2ad5ab',
light: '#2ad5ab',
Expand Down

0 comments on commit 7cb5555

Please sign in to comment.