Skip to content
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.

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

Fix/xlm airdrop copy #1653

Merged
merged 12 commits into from
Jun 3, 2019
1 change: 1 addition & 0 deletions config/mocks/wallet-options-v4.json
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@
"circle": "xlm-circle-filled",
"circleFilled": "xlm-circle-filled"
},
"learnMoreLink": "https://support.blockchain.com/hc/en-us/articles/360019105171-What-is-Stellar-",
"minConfirmations": 1,
"txExplorerBaseUrl": "https://stellarchain.io/tx",
"txListAppRoute": "/xlm/transactions"
Expand Down
2 changes: 2 additions & 0 deletions packages/blockchain-info-components/src/Images/Images.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import getFreeCrypto from './img/get-free-crypto.png'
import getFreeCrypto2 from './img/get-free-crypto@2x.png'
import getFreeCrypto3 from './img/get-free-crypto@3x.png'
import goldApproved from './img/gold-approved.svg'
import goldVerified from './img/gold-verified.svg'
import googleAuthenticator from './img/google-authenticator.png'
import googlePlayBadge from './img/google-play-badge.svg'
import halfBitcoin from './img/half-bitcoin.svg'
Expand Down Expand Up @@ -153,6 +154,7 @@ export default {
'get-free-crypto2': getFreeCrypto2,
'get-free-crypto3': getFreeCrypto3,
'gold-approved': goldApproved,
'gold-verified': goldVerified,
'google-authenticator': googleAuthenticator,
'google-play-badge': googlePlayBadge,
'half-bitcoin': halfBitcoin,
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions packages/blockchain-info-components/src/Modals/Modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ const selectWidth = size => {
switch (size) {
case 'auto':
return 'auto'
case 'xsmall':
return '320px'
case 'small':
return '400px'
case 'medium':
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ exports[`TierCard renders correctly with column view 1`] = `
opacity={1}
size="32px"
uppercase={false}
weight={400}
weight={600}
>
$25,000
</Text>
Expand All @@ -57,7 +57,7 @@ exports[`TierCard renders correctly with column view 1`] = `
}
}
uppercase={false}
weight={400}
weight={500}
>
<Text
altFont={false}
Expand Down Expand Up @@ -91,7 +91,7 @@ exports[`TierCard renders correctly with column view 1`] = `
}
}
uppercase={false}
weight={400}
weight={500}
>
<FormattedMessage
defaultMessage="Takes {time} min"
Expand Down Expand Up @@ -264,7 +264,7 @@ exports[`TierCard renders null w/o showBanner 1`] = `
opacity={1}
size="32px"
uppercase={false}
weight={400}
weight={600}
>
$1,000
</Text>
Expand All @@ -282,7 +282,7 @@ exports[`TierCard renders null w/o showBanner 1`] = `
}
}
uppercase={false}
weight={400}
weight={500}
>
<Text
altFont={false}
Expand Down Expand Up @@ -316,7 +316,7 @@ exports[`TierCard renders null w/o showBanner 1`] = `
}
}
uppercase={false}
weight={400}
weight={500}
>
<FormattedMessage
defaultMessage="Takes {time} min"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export const TierCard = ({
goToSwap
}) => {
const tierData = head(userTiers.filter(propEq('index', tier)))
const symbol =
const tierFiatLimit =
Exchange.getSymbol(tierData.limits.currency) +
Currency.formatFiat(
tierData.limits[toLower(path([tier, 'limit'], TIERS))],
Expand Down Expand Up @@ -146,13 +146,23 @@ export const TierCard = ({
<Content>
<Row>
<Column>
<Text size='32px' color='marketing-secondary'>
{symbol}
<Text size='32px' weight={600} color='marketing-secondary'>
{tierFiatLimit}
</Text>
<Text size='14px' color='textBlack' style={{ marginTop: '8px' }}>
<Text
size='14px'
weight={500}
color='textBlack'
style={{ marginTop: '8px' }}
>
{tierLimit}
</Text>
<Text size='14px' color='gray-3' style={{ marginTop: '7px' }}>
<Text
size='14px'
weight={500}
color='gray-3'
style={{ marginTop: '7px' }}
>
{tierStatus}
</Text>
</Column>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ exports[`ListItemContainer renders correctly 1`] = `
preferencesActions={
Object {
"hideAirdropClaimModal": [Function],
"hideAirdropReminderModal": [Function],
"hideKycCompleted": [Function],
"hideKycGetStarted": [Function],
"hideSwapBanner": [Function],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ export default ({ api, coreSagas }) => {

const saveGoals = function * (firstLogin) {
yield put(actions.goals.saveGoal('welcome', { firstLogin }))
yield put(actions.goals.saveGoal('airdropReminder'))
yield put(actions.goals.saveGoal('coinifyUpgrade'))
yield put(actions.goals.saveGoal('upgradeForAirdrop'))
yield put(actions.goals.saveGoal('swapUpgrade'))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@ export const airdropClaimSubmitClicked = campaign => ({
payload: { campaign }
})

export const airdropReminderSubmitClicked = campaign => ({
type: AT.AIRDROP_REMINDER_SUBMIT_CLICKED,
payload: { campaign }
})

export const swapGetStartedSubmitClicked = () => ({
type: AT.SWAP_GET_STARTED_SUBMIT_CLICKED
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ export default () => {
AT.AIRDROP_CLAIM_SUBMIT_CLICKED,
onboardingSagas.airdropClaimSubmitClicked
)
yield takeLatest(
AT.AIRDROP_REMINDER_SUBMIT_CLICKED,
onboardingSagas.airdropReminderSubmitClicked
)
yield takeLatest(
AT.UPGRADE_FOR_AIRDROP_SUBMIT_CLICKED,
onboardingSagas.upgradeForAirdropSubmitClicked
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,27 +21,7 @@ export default () => {
yield put(
actions.logs.logErrorMessage(
logLocation,
'airdropReminderSubmitClicked',
e
)
)
}
}

const airdropReminderSubmitClicked = function * ({ payload }) {
const { campaign } = payload
try {
yield put(actions.preferences.hideAirdropReminderModal())
yield put(actions.modals.closeModal())
yield put(actions.modules.profile.setCampaign({ name: campaign }))
yield put(
actions.components.identityVerification.createRegisterUserCampaign()
)
} catch (e) {
yield put(
actions.logs.logErrorMessage(
logLocation,
'airdropReminderSubmitClicked',
'airdropClaimSubmitClicked',
e
)
)
Expand Down Expand Up @@ -105,7 +85,6 @@ export default () => {

return {
airdropClaimSubmitClicked,
airdropReminderSubmitClicked,
coinifyUpgradeSubmitClicked,
swapGetStartedSubmitClicked,
upgradeForAirdropSubmitClicked
Expand Down
28 changes: 0 additions & 28 deletions packages/blockchain-wallet-v4-frontend/src/data/goals/sagas.js
Original file line number Diff line number Diff line change
Expand Up @@ -197,25 +197,6 @@ export default ({ api }) => {
}
}

const runAirdropReminderGoal = function * (goal) {
const { id } = goal
yield put(actions.goals.deleteGoal(id))

const showAirdropReminderModal = yield select(
selectors.preferences.getShowAirdropReminderModal
)
if (!showAirdropReminderModal) return
yield call(waitForUserData)
const kycNotFinished = yield call(isKycNotFinished)
if (kycNotFinished) {
return yield put(
actions.goals.addInitialModal('airdropReminder', 'AirdropReminder', {
campaign: 'sunriver'
})
)
}
}

const runUpgradeForAirdropGoal = function * (goal) {
const { id } = goal
yield put(actions.goals.deleteGoal(id))
Expand Down Expand Up @@ -391,7 +372,6 @@ export default ({ api }) => {
payment,
coinifyUpgrade,
upgradeForAirdrop,
airdropReminder,
swapGetStarted,
swapUpgrade,
airdropClaim,
Expand Down Expand Up @@ -422,11 +402,6 @@ export default ({ api }) => {
actions.modals.showModal(upgradeForAirdrop.name, upgradeForAirdrop.data)
)
}
if (airdropReminder) {
return yield put(
actions.modals.showModal(airdropReminder.name, airdropReminder.data)
)
}
if (swapGetStarted) {
return yield put(
actions.modals.showModal(swapGetStarted.name, swapGetStarted.data)
Expand Down Expand Up @@ -469,9 +444,6 @@ export default ({ api }) => {
case 'upgradeForAirdrop':
yield call(runUpgradeForAirdropGoal, goal)
break
case 'airdropReminder':
yield call(runAirdropReminderGoal, goal)
break
case 'kyc':
yield call(runKycGoal, goal)
break
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ export const hideSwapUpgradeModal = () => ({ type: AT.HIDE_SWAP_UPGRADE_MODAL })
export const hideAirdropClaimModal = () => ({
type: AT.HIDE_AIRDROP_CLAIM_MODAL
})
export const hideAirdropReminderModal = () => ({
type: AT.HIDE_AIRDROP_REMINDER_MODAL
})
export const hideUpgradeForAirdropModal = () => ({
type: AT.HIDE_UPGRADE_FOR_AIRDROP_MODAL
})
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ const INITIAL_STATE = {
culture: 'en-GB',
theme: 'default',
coinDisplayed: true,
showAirdropReminderModal: true,
showKycCompleted: true,
showBackupReminder: true,
showKycGetStarted: true,
Expand Down Expand Up @@ -59,9 +58,6 @@ const preferences = (state = INITIAL_STATE, action) => {
case AT.HIDE_AIRDROP_CLAIM_MODAL: {
return assoc('showAirdropClaimModal', false, state)
}
case AT.HIDE_AIRDROP_REMINDER_MODAL: {
return assoc('showAirdropReminderModal', false, state)
}
case AT.HIDE_UPGRADE_FOR_AIRDROP_MODAL: {
return assoc('showUpgradeForAirdropModal', false, state)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ export const getShowAirdropClaimModal = path([
'preferences',
'showAirdropClaimModal'
])
export const getShowAirdropReminderModal = path([
'preferences',
'showAirdropReminderModal'
])
export const getShowUpgradeForAirdropModal = path([
'preferences',
'showUpgradeForAirdropModal'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ class Submitted extends React.PureComponent {
</Header>
<SubHeader>
<FormattedMessage
id='modals.exchange.identityverification.submitted.subheader'
defaultMessage="You've successfully submitted your application. A Blockchain Support Member is now reviewing your information."
id='modals.exchange.identityverification.submitted.subheader2'
defaultMessage="You've successfully submitted your application. A Blockchain Support Member will review your information."
/>
</SubHeader>
<NextSteps>
Expand All @@ -144,8 +144,8 @@ class Submitted extends React.PureComponent {
</NextStepsHeader>
<NextStepsSubHeader>
<FormattedHTMLMessage
id='modals.exchange.identityverification.submitted.mayaskforid'
defaultMessage="You'll hear back from us in the next <b>5 business days</b>. If something looks odd, we may have to ask you to upload another form of ID."
id='modals.exchange.identityverification.submitted.mayaskforid2'
defaultMessage="You'll hear back from us in the <b>next 5 business days</b>. If something looks odd, we may have to ask you to upload another form of ID."
/>
</NextStepsSubHeader>
<NextStepsSubHeader>
Expand All @@ -165,8 +165,8 @@ class Submitted extends React.PureComponent {
<React.Fragment>
<Text color='black' size='20px'>
<FormattedMessage
id='modals.exchange.identityverification.submitted.freecrypto'
defaultMessage="Once your profile is successfully verified, we'll send you your free crypto. Don't forget to share the wealth with friends and family!"
id='modals.exchange.identityverification.submitted.freecrypto2'
defaultMessage="Don't forget to share this opportunity with friends and family!"
/>
</Text>
<Footer>
Expand Down Expand Up @@ -234,15 +234,15 @@ class Submitted extends React.PureComponent {
<HeartbeatLoader height='20px' width='20px' color='white' />
) : (
<FormattedMessage
id='modals.exchange.identityverification.submitted.claim'
defaultMessage='Claim Free XLM'
id='modals.exchange.identityverification.submitted.enterairdrop'
defaultMessage='Enter Airdrop Program'
/>
)}
</ClaimButton>
<NextStepsSubHeader>
<FormattedMessage
id='modals.exchange.identityverification.submitted.makesuretoclick'
defaultMessage='Once your verification is successfully completed, we’ll send you free crypto. Make sure you click the button to claim your free XLM.'
id='modals.exchange.identityverification.submitted.makesuretoclick2'
defaultMessage='By entering the airdrop program you’ll become eligible to receive future airdrops.'
/>
</NextStepsSubHeader>
</React.Fragment>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,43 @@ exports[`HighFlow should render correctly 1`] = `
opacity={1}
size="18px"
uppercase={false}
weight={500}
>
<FormattedMessage
defaultMessage="Is my country supported?"
id="identityverification.verify.supportedcountries"
values={Object {}}
/>
</Text>
<Text
altFont={false}
capitalize={false}
color="gray-5"
cursor="inherit"
italic={false}
opacity={1}
size="16px"
uppercase={false}
weight={400}
>
<FormattedHTMLMessage
defaultMessage="Not all countries are supported at this time. Check our up to date <a href=\\"https://support.blockchain.com/hc/en-us/articles/360018751932\\" target=\\"_blank\\" rel=\\"noopener noreferrrer\\">list of countries</a> before proceeding."
id="identityverification.verify.supportecountrieslist"
values={Object {}}
/>
</Text>
</ForwardRef>
<ForwardRef>
<Text
altFont={false}
capitalize={false}
color="gray-5"
cursor="inherit"
italic={false}
opacity={1}
size="18px"
uppercase={false}
weight={500}
>
<FormattedMessage
defaultMessage="How do I enable my camera and microphone?"
Expand Down