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.

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

Release 1.9.7 #2602

Merged
merged 4 commits into from
Jun 9, 2021
Merged

Release 1.9.7 #2602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
40087db
Merge pull request #2599 from SelfKeyFoundation/feat/release-1.9.6-me…
andregoncalves May 19, 2021
95faa37
feat: moonpay copy and flow changes
andregoncalves Jun 8, 2021
8aed491
Merge pull request #2601 from SelfKeyFoundation/2600-moonpay-copy-cha…
andregoncalves Jun 8, 2021
203c785
feat(version): bump to 1.9.7
andregoncalves Jun 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "selfkey-identity-wallet",
"productName": "SelfKey Identity Wallet",
"version": "1.9.6",
"version": "1.9.7",
"description": "The Official SelfKey Identity Wallet for Desktop",
"browser": [
"chrome"
Expand Down
4 changes: 4 additions & 0 deletions src/common/moonpay/auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,10 +562,12 @@ const submitKycDocumentsOperation = ops => () => async (dispatch, getState) => {
const connectFlowOperation = ops => ({ cancel, complete }) => async (dispatch, getState) => {
const identity = selectIdentity(getState());

// A selfkey identity is needed for Moonpay
if (!identity) {
return;
}

// A completed selfkey identity is needed for Moonpay
if (!identity.isSetupFinished) {
await dispatch(push('/main/selfkeyId'));
return;
Expand Down Expand Up @@ -608,6 +610,7 @@ const connectFlowNextStepOperation = ops => opt => async (dispatch, getState) =>
await dispatch(ops.loadSettingsOperation());
}

/*
const agreedToTerms = hasAgreedToTerms(getState());
if (!agreedToTerms) {
await dispatch(
Expand All @@ -618,6 +621,7 @@ const connectFlowNextStepOperation = ops => opt => async (dispatch, getState) =>
);
return;
}
*/

if (!config.moonPayWidgetMode) {
const serviceCheck = selectServiceCheck(getState());
Expand Down
164 changes: 93 additions & 71 deletions src/renderer/dashboard/buy-key-popup-modal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { Grid, List, ListItem, Typography, Divider, Button } from '@material-ui/core';
import { Grid, Typography, Divider, Button } from '@material-ui/core';
import { withStyles } from '@material-ui/styles';
import { PaymentIcon, Copy, primary } from 'selfkey-ui';
import { ExchangeSmallIcon, CardsIcon, Copy, primary } from 'selfkey-ui';
import { Popup } from '../common';
import { PropTypes } from 'prop-types';

Expand Down Expand Up @@ -56,6 +56,7 @@ const styles = theme => ({
}
});

/*
const getExchanges = (exchanges, classes, onLinkClick) => {
return exchanges.map(exchange => {
return (
Expand All @@ -74,10 +75,53 @@ const getExchanges = (exchanges, classes, onLinkClick) => {
);
});
};
*/

export const BuyKeyModal = withStyles(styles)(
({ classes, address, onMoonpayClick, onLinkClick, exchanges, onCloseClick }) => (
<Popup closeAction={onCloseClick} text="Buy KEY">
{onMoonpayClick && (
<Grid
container
direction="row"
justify="flex-start"
alignItems="flex-start"
wrap="nowrap"
>
<Grid item className={classes.icon}>
<CardsIcon />
</Grid>
<Grid item>
<Grid
container
direction="column"
justify="flex-start"
alignItems="flex-start"
>
<Grid item id="header">
<Typography variant="h1" gutterBottom>
Buy KEY with a Credit Card
</Typography>
</Grid>

<Grid item className={classes.bottomSpace}>
<Typography variant="body2">
You can purchase KEY using a Credit Card by connecting your
wallet with MoonPay.
</Typography>
</Grid>
<Grid item className={classes.bottomSpace}>
<Button size="large" variant="contained" onClick={onMoonpayClick}>
Connect With MoonPay
</Button>
</Grid>
</Grid>
</Grid>
</Grid>
)}
<Grid item>
<Divider className={classes.divider} />
</Grid>
<Grid
container
direction="row"
Expand All @@ -86,82 +130,60 @@ export const BuyKeyModal = withStyles(styles)(
wrap="nowrap"
>
<Grid item className={classes.icon}>
<PaymentIcon />
<ExchangeSmallIcon />
</Grid>
<Grid item>
<Grid item id="body" className={classes.body}>
<Grid item id="header">
<Typography variant="h1" gutterBottom>
Buy KEY on an External Exchange
</Typography>
</Grid>

<Grid container direction="column" justify="flex-start" alignItems="flex-start">
<Grid item id="header">
<Typography variant="h1" gutterBottom>
Get KEY Tokens
</Typography>
</Grid>
{onMoonpayClick && (
<React.Fragment>
<Grid item className={classes.bottomSpace}>
<Typography variant="body2">
You can purchase KEY tokens with Credit Card directly in the
wallet using the MoonPay service.
<Typography variant="body2" className={classes.bottomSpace}>
You may purchase KEY on many Exchanges worldwide and then transfer them
to this wallet. KEY is availabe on{' '}
<a
className={classes.link}
target="_blank"
rel="noopener noreferrer"
onClick={onLinkClick}
href="https://www.coingecko.com/en/coins/selfkey#markets"
>
these markets
</a>
.
</Typography>
{address && (
<Grid container>
<Typography variant="body2" color="secondary">
After purchasing KEY on an external Exchange, transfer them to
your wallet address:
</Typography>
<Grid container alignItems="center">
<Typography className={classes.address} variant="body2">
{address}
</Typography>
<Copy text={address} />
</Grid>
<Grid item className={classes.bottomSpace}>
<Button
size="large"
variant="contained"
onClick={onMoonpayClick}
<Divider className={classes.divider} />
<Typography variant="subtitle2" color="secondary">
KEY is the main token used in the SelfKey Wallet, and it’s used
when accessing services in the marketplace. ETH is needed for
the network transaction fee{' '}
<a
className={classes.link}
target="_blank"
rel="noopener noreferrer"
onClick={onLinkClick}
href="https://help.selfkey.org/article/128-how-to-pay-for-marketplace-products-services-with-key"
>
Connect With MoonPay
</Button>
</Grid>
<Grid item>
<Typography variant="body2">Alternatively:</Typography>
</Grid>
</React.Fragment>
)}
<Grid item id="body" className={classes.body}>
<Grid
container
direction="column"
justify="flex-start"
alignItems="flex-start"
>
<Typography variant="body2" className={classes.bottomSpace}>
You can buy KEY tokens, to use in the wallet, from one of the
many exchanges worldwide.
(what’s this?)
</a>
.
</Typography>
<List className={classes.exchanges}>
{getExchanges(exchanges, classes, onLinkClick)}
</List>
{address && (
<Grid container>
<Typography variant="body2" color="secondary">
Your Address to receive KEY:
</Typography>
<Grid container alignItems="center">
<Typography className={classes.address} variant="body2">
{address}
</Typography>
<Copy text={address} />
</Grid>
<Divider className={classes.divider} />
<Typography variant="subtitle2" color="secondary">
KEY is the main token used in the SelfKey Wallet, and
it’s used when accessing services in the marketplace.
ETH is needed for the network transaction fee{' '}
<a
className={classes.link}
target="_blank"
rel="noopener noreferrer"
onClick={onLinkClick}
href="https://help.selfkey.org/article/128-how-to-pay-for-marketplace-products-services-with-key"
>
(what’s this?)
</a>
.
</Typography>
</Grid>
)}
</Grid>
</Grid>
)}
</Grid>
</Grid>
</Grid>
Expand Down
6 changes: 4 additions & 2 deletions src/renderer/moonpay/choose-login-email-modal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@ import ListAttributeChooser from '../attributes/choosers/list-attribute-chooser'

export const MoonpayChooseLoginEmailModal = ({ onCancel, onNext, selected, ...chooserProps }) => {
return (
<Popup closeAction={onCancel} text="MoonPay Choose Login Email">
<Popup closeAction={onCancel} text="Connecting with MoonPay">
<Grid container direction="column" spacing={4}>
<Grid item>
<Typography variant="body1">Please choose email or create a new one</Typography>
<Typography variant="body1">
Choose which email address to use with MoonPay
</Typography>
</Grid>
<Grid item>
<Divider />
Expand Down
7 changes: 3 additions & 4 deletions src/renderer/moonpay/transaction-loading-modal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,11 @@ export const TransactionLoadingModal = ({ onCloseClick, title, onStatusClick, tr
<Grid item>
<Typography variant="body2" color="secondary" className={classes.body}>
Transactions normally take between a few minutes and half an hour to
complete, but may take longer if we need to run additional checks. For
example, if it{"'"}s your first-ever purchase, or your first purchase with a
particular payment card.
complete. However, some situations may take longer, such as a first-time
purchase.
</Typography>
<Typography variant="body2" color="secondary" className={classes.body}>
You will be notified by email when transaction completes, you can safely
You will be notified by email when transaction completes. You may now safely
close this window.
</Typography>
</Grid>
Expand Down