-
- {requirements.map((item, index) => (
-
-
-
+
@@ -59,18 +59,18 @@ class BankingTypesTabComponent extends Component {
>
- We work with {banks.length} different banks in {region}. Each bank has
- different eligibility requirements, types of accounts available and
- onboarding processes. We invite you to carefully review each banks
- requirements and services to better understand if their banking services
- meet your needs:
+ We work with {Object.keys(banks).length} different banks in {region}.
+ Each bank has different eligibility requirements, types of accounts
+ available and onboarding processes. We invite you to carefully review
+ each banks requirements and services to better understand if their
+ banking services meet your needs:
- {banks.map((opt, idx) => (
+ {Object.keys(banks).map((opt, idx) => (
diff --git a/src/renderer/marketplace/bank-accounts/list/offers-container.jsx b/src/renderer/marketplace/bank-accounts/list/offers-container.jsx
index ca77a4531..e9960616f 100644
--- a/src/renderer/marketplace/bank-accounts/list/offers-container.jsx
+++ b/src/renderer/marketplace/bank-accounts/list/offers-container.jsx
@@ -1,57 +1,43 @@
-import React, { Component } from 'react';
+import React from 'react';
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { push } from 'connected-react-router';
import { pricesSelectors } from 'common/prices';
import { withStyles } from '@material-ui/core/styles';
-import { bankAccountsOperations, bankAccountsSelectors } from 'common/bank-accounts';
import { BankingOffersPage } from './offers-page';
-import NoConnection from 'renderer/no-connection';
+import { marketplaceSelectors } from 'common/marketplace';
+import { MarketplaceBankAccountsComponent } from '../common/marketplace-bank-accounts-component';
const styles = theme => ({});
-const MARKETPLACE_ROOT_PATH = '/main/marketplace-categories';
-const BANK_ACCOUNTS_DETAIL_PATH = '/main/marketplace-bank-accounts/details';
-class BankAccountsTableContainer extends Component {
+class BankAccountsTableContainer extends MarketplaceBankAccountsComponent {
state = {
accountType: 'business'
};
- componentDidMount() {
- if (!this.props.bankAccounts || !this.props.bankAccounts.length) {
- this.props.dispatch(bankAccountsOperations.loadBankAccountsOperation());
- }
- }
-
- onBackClick = () => this.props.dispatch(push(MARKETPLACE_ROOT_PATH));
+ onBackClick = () => this.props.dispatch(push(this.marketplaceRootPath()));
onAccountTypeChange = accountType => this.setState({ accountType });
- onDetailsClick = bank =>
+ onDetailsClick = jurisdiction => {
+ const { accountCode, countryCode } = jurisdiction.data;
+ const { templateId, vendorId } = jurisdiction;
this.props.dispatch(
- push(
- `${BANK_ACCOUNTS_DETAIL_PATH}/${bank.accountCode}/${bank.countryCode}/${
- bank.templateId
- }`
- )
+ push(this.detailsRoute({ accountCode, countryCode, templateId, vendorId }))
);
-
- activeBank = bank => bank.accountType === this.state.accountType && bank.showWallet === true;
+ };
render() {
- const { isLoading, bankAccounts, keyRate, isError } = this.props;
+ const { isLoading, keyRate, vendors, inventory } = this.props;
const { accountType } = this.state;
- if (!isLoading && isError) {
- return
+ {data.eligibility &&
+ data.eligibility.map((tag, index) => (
+
+ {tag}
+ {index !== data.eligibility.length - 1 ? ',' : ''}
+
+ ))}
+
+
+
+ );
+ }
+}
+
+const mapStateToProps = (state, props) => {
+ const id = props.match.params.inventoryId;
+ const item = marketplaceSelectors.selectInventoryItemById(state, id);
+
+ let rpDetails = marketplaceSelectors.selectRPDetails(state, item.vendorId);
+ let serviceId = `${rpDetails.serviceOwner}_${rpDetails.serviceId}`;
+
+ let templates = [];
+ if (rpDetails.relyingPartyConfig && rpDetails.relyingPartyConfig.templates) {
+ templates = rpDetails.relyingPartyConfig.templates;
+ }
+ return {
+ wallet: walletSelectors.getWallet(state),
+ item,
+ hasBalance: marketplaceSelectors.hasBalance(state, item.vendorId),
+ stake: marketplacesSelectors.stakeSelector(state, serviceId),
+ pendingTransaction: marketplacesSelectors.pendingTransactionSelector(
+ state,
+ item.serviceOwner,
+ item.serviceId
+ ),
+ relyingPartyName: item.vendorId,
+ templates,
+ relyingParty: kycSelectors.relyingPartySelector(state, rpDetails.name),
+ relyingPartyIsActive: kycSelectors.relyingPartyIsActiveSelector(state, rpDetails.name),
+ relyingPartyShouldUpdate: kycSelectors.relyingPartyShouldUpdateSelector(
+ state,
+ rpDetails.name
+ )
+ };
+};
+
+const styledComponent = withStyles(styles)(ExchangesDetailsContainer);
+const connectedComponent = connect(mapStateToProps)(styledComponent);
+export default connectedComponent;
+export { connectedComponent as ExchangesDetailsContainer };
diff --git a/src/renderer/marketplace/services/service-details.jsx b/src/renderer/marketplace/exchanges/exchanges-details.jsx
similarity index 86%
rename from src/renderer/marketplace/services/service-details.jsx
rename to src/renderer/marketplace/exchanges/exchanges-details.jsx
index 26ebeaa15..3888ba5bc 100644
--- a/src/renderer/marketplace/services/service-details.jsx
+++ b/src/renderer/marketplace/exchanges/exchanges-details.jsx
@@ -70,6 +70,9 @@ const styles = theme => ({
formGroup: {
backgroundColor: 'transparent',
+ '& h5': {
+ marginRight: '1em'
+ },
'& span': {
fontSize: '14px',
lineHeight: '35px',
@@ -143,7 +146,7 @@ const styles = theme => ({
},
backButtonContainer: {
- left: '15px',
+ left: '75px',
position: 'absolute',
top: '120px'
},
@@ -229,7 +232,7 @@ const styles = theme => ({
}
});
-class MarketplaceServiceDetailsComponent extends Component {
+class ExchangesDetailsComponent extends Component {
getLastApplication = () => {
const { relyingParty } = this.props;
// const { templateId } = this.props.match.params;
@@ -418,18 +421,19 @@ class MarketplaceServiceDetailsComponent extends Component {
const getColors = () => ['#46dfba', '#46b7df', '#238db4', '#25a788', '#0e4b61'];
let random = Math.floor(Math.random() * 4);
- const icon = item.logo[0].url ? (
-
- {item.name.charAt(0)}
-
- );
+ const icon =
+ item.data.logo && item.data.logo[0].url ? (
+
+ {item.name.charAt(0)}
+
+ );
return (
-
-
+
-
diff --git a/src/renderer/marketplace/incorporation/details/incorporations-details-page.jsx b/src/renderer/marketplace/incorporation/details/incorporations-details-page.jsx
index 3a9b43b37..045916ec6 100644
--- a/src/renderer/marketplace/incorporation/details/incorporations-details-page.jsx
+++ b/src/renderer/marketplace/incorporation/details/incorporations-details-page.jsx
@@ -2,7 +2,7 @@ import React from 'react';
import { withStyles } from '@material-ui/core/styles';
import { Grid, Button, Typography } from '@material-ui/core';
import { ApplicationStatusBar } from '../../../kyc/application/application-status';
-import { CertificateIcon } from 'selfkey-ui';
+import { CertificateIcon, BackButton } from 'selfkey-ui';
import { FlagCountryName, ResumeBox, ProgramPrice, MarketplaceKycRequirements } from '../../common';
import { IncorporationsDetailsTabs } from './incorporations-details-tabs';
@@ -12,13 +12,6 @@ const styles = theme => ({
margin: '50px auto 0',
maxWidth: '960px'
},
- backButtonContainer: {
- left: '15px',
- position: 'absolute'
- },
- bold: {
- fontWeight: 600
- },
title: {
padding: '22px 30px',
background: '#2A3540',
@@ -114,13 +107,7 @@ export const IncorporationsDetailsPage = withStyles(styles)(props => {
return (
-
-
+
-
diff --git a/src/renderer/marketplace/incorporation/index.jsx b/src/renderer/marketplace/incorporation/index.jsx
index 8a305b6d4..53d53beb8 100644
--- a/src/renderer/marketplace/incorporation/index.jsx
+++ b/src/renderer/marketplace/incorporation/index.jsx
@@ -1,8 +1,6 @@
import React, { Component } from 'react';
import { Route } from 'react-router-dom';
import { connect } from 'react-redux';
-import { featureIsEnabled } from 'common/feature-flags';
-import { ordersOperations } from 'common/marketplace/orders';
import { marketplaceOperations } from 'common/marketplace';
import { IncorporationsListContainer } from './list/incorporations-list-container';
import { IncorporationsDetailsContainer } from './details/incorporations-details-container';
@@ -12,12 +10,9 @@ import { IncorporationsPaymentCompleteContainer } from './checkout/incorporation
class MarketplaceIncorporationComponent extends Component {
async componentDidMount() {
- if (featureIsEnabled('scheduler')) {
- await this.props.dispatch(marketplaceOperations.loadMarketplaceOperation());
- } else {
- await this.props.dispatch(ordersOperations.ordersLoadOperation());
- }
+ await this.props.dispatch(marketplaceOperations.loadMarketplaceOperation());
}
+
render() {
const { path } = this.props.match;
@@ -25,19 +20,19 @@ class MarketplaceIncorporationComponent extends Component {
-
- );
- }
-}
-
-export const MarketplaceServiceDetailsPage = connect(mapStateToProps)(
- MarketplaceServiceDetailsPageComponent
-);
-
-export default MarketplaceServiceDetailsPage;
diff --git a/src/renderer/marketplace/services/services-page.jsx b/src/renderer/marketplace/services/services-page.jsx
deleted file mode 100644
index 45e4b2bcb..000000000
--- a/src/renderer/marketplace/services/services-page.jsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import React from 'react';
-import { connect } from 'react-redux';
-import { MarketplaceServicesList } from './services-list.jsx';
-import { push } from 'connected-react-router';
-
-export const MarketplaceServicesPage = connect()(props => {
- const { dispatch } = props;
- const backAction = () => {
- dispatch(push('/main/marketplace-categories'));
- };
-
- const viewAction = name => {
- dispatch(push(`/main/marketplace-services/${name}`));
- };
-
- return -
-
-
-
-
-
);
- handleCloseApplicationRefreshModal = evt => {
- evt && evt.preventDefault();
- this.setState({ showApplicationRefreshModal: false });
- };
-
- renderApplicationRefreshModal() {
- const { classes } = this.props;
- return (
- (
+
+
-
-
-
- Application status updated successfully.
-
-
-
-
-
-
-
+
+
+ Application status updated successfully.
+
+
+
+
+
+
-
- );
- }
-
- handleAccessClick = _ => this.props.dispatch(push(MARKETPLACE_ROOT_PATH));
+
+
+ );
render() {
- const { classes, isLoading, processing } = this.props;
- const { showApplicationRefreshModal } = this.state;
- let loading = isLoading || processing || this.state.loading;
+ const { classes, showApplicationRefreshModal, loading, applications, vendors } = this.props;
+
+ const getRpInfo = (rpName, field) => {
+ const vendor = vendors.find(v => v.vendorId === rpName);
+ if (vendor && vendor[field]) {
+ return vendor[field];
+ } else {
+ return 'N/A';
+ }
+ };
+
+ const getRpName = application => getRpInfo(application.rpName, 'name');
if (loading) {
return this.renderLoadingScreen();
}
- if (!loading && this.props.applications && this.props.applications.length === 0) {
+ if (!loading && applications && applications.length === 0) {
return (
@@ -562,7 +346,7 @@ class SelfkeyIdApplicationsComponent extends Component {
- this.handleApplicationAddDocuments(item.id, item.rpName)
+ this.props.onApplicationAdditionalRequirements(item)
}
- handleRefresh={() => this.handleApplicationRefresh(item.id)}
+ handleRefresh={() => this.props.onApplicationRefresh(item)}
tooltip={moment(new Date(item.updatedAt)).format(
'DD MMM YYYY'
)}
@@ -688,7 +467,10 @@ class SelfkeyIdApplicationsComponent extends Component {
Provider Contact
- {getRpInfo(item.rpName, 'email')}
+ {getRpInfo(
+ item.rpName,
+ 'contactEmail'
+ )}
{
- const notAuthenticated = false;
- const walletType = appSelectors.selectApp(state).walletType;
- const afterAuthRoute =
- walletType === 'ledger' || walletType === 'trezor' ? `/main/selfkeyIdApplications` : '';
- return {
- wallet: walletSelectors.getWallet(state),
- isLoading: incorporationsSelectors.getLoading(state),
- rp: kycSelectors.relyingPartySelector(state, 'incorporations'),
- rpShouldUpdate: kycSelectors.relyingPartyShouldUpdateSelector(
- state,
- 'incorporations',
- notAuthenticated
- ),
- applications: kycSelectors.selectApplications(state),
- processing: kycSelectors.selectProcessing(state),
- afterAuthRoute
- };
-};
-
-export const SelfkeyIdApplications = connect(mapStateToProps)(
- withStyles(styles)(SelfkeyIdApplicationsComponent)
-);
+export const SelfkeyIdApplications = withStyles(styles)(SelfkeyIdApplicationsComponent);
export default SelfkeyIdApplications;
diff --git a/src/renderer/selfkey-id/main/components/selfkey-id-create-form.jsx b/src/renderer/selfkey-id/main/components/selfkey-id-create-form.jsx
index e5a5b633b..120c09dc3 100644
--- a/src/renderer/selfkey-id/main/components/selfkey-id-create-form.jsx
+++ b/src/renderer/selfkey-id/main/components/selfkey-id-create-form.jsx
@@ -12,11 +12,17 @@ import {
Modal,
IconButton
} from '@material-ui/core';
-import { IdCardIcon, ModalWrap, KeyTooltip, TooltipArrow, InfoTooltip } from 'selfkey-ui';
+import {
+ IdCardIcon,
+ ModalWrap,
+ KeyTooltip,
+ TooltipArrow,
+ BackButton,
+ InfoTooltip
+} from 'selfkey-ui';
import { connect } from 'react-redux';
import history from 'common/store/history';
-import { identityOperations } from 'common/identity';
-import { walletSelectors } from 'common/wallet';
+import { identityOperations, identitySelectors } from 'common/identity';
import { matomoGoalTracking, matomoGoals } from 'common/matomo';
const styles = theme => ({
@@ -25,6 +31,19 @@ const styles = theme => ({
top: '100px',
left: '20px'
},
+ backButtonContainer: {
+ left: '40px',
+ position: 'absolute',
+ top: '40px',
+ width: '100%',
+ zIndex: '1301',
+ '& div': {
+ left: '0 !important'
+ }
+ },
+ bold: {
+ fontWeight: 600
+ },
create: {
marginTop: '10px',
marginBottom: '10px',
@@ -56,15 +75,6 @@ const styles = theme => ({
border: 'none',
backgroundColor: 'transparent'
},
- backButtonContainer: {
- left: '40px',
- position: 'absolute',
- top: '40px',
- zIndex: '1301'
- },
- bold: {
- fontWeight: 600
- },
tooltip: {
padding: '7px 0 0 10px'
},
@@ -72,6 +82,14 @@ const styles = theme => ({
alignItems: 'baseline',
display: 'flex',
flexDirection: 'row'
+ },
+ bb: {
+ '& div': {
+ zIndex: 3000
+ },
+ '& button': {
+ zIndex: 3000
+ }
}
});
@@ -98,7 +116,7 @@ class SelfKeyIdCreateFormComponent extends Component {
handleSave = evt => {
evt.preventDefault();
this.props.dispatch(
- identityOperations.createSelfkeyIdOperation(this.props.wallet.id, { ...this.state })
+ identityOperations.createSelfkeyIdOperation(this.props.identity.id, { ...this.state })
);
};
@@ -154,7 +172,8 @@ class SelfKeyIdCreateFormComponent extends Component {
return (
<>
@@ -461,7 +480,7 @@ class SelfKeyIdCreateFormComponent extends Component {
const mapStateToProps = (state, props) => {
return {
- wallet: walletSelectors.getWallet(state)
+ identity: identitySelectors.selectCurrentIdentity(state)
};
};
diff --git a/src/renderer/selfkey-id/main/components/selfkey-id-overview.jsx b/src/renderer/selfkey-id/main/components/selfkey-id-overview.jsx
index f86253dcc..7033e8586 100644
--- a/src/renderer/selfkey-id/main/components/selfkey-id-overview.jsx
+++ b/src/renderer/selfkey-id/main/components/selfkey-id-overview.jsx
@@ -1,7 +1,6 @@
import React, { Component } from 'react';
import moment from 'moment';
-import { push } from 'connected-react-router';
-import { walletOperations } from 'common/wallet';
+
import {
Grid,
CardHeader,
@@ -29,13 +28,9 @@ import {
SmallTableHeadRow,
SmallTableRow,
SmallTableCell,
- FileAudioIcon,
- DIDIcon
+ FileAudioIcon
} from 'selfkey-ui';
-import { CreateAttributePopup } from '../containers/create-attribute-popup';
-import { EditAttributePopup } from '../containers/edit-attribute-popup';
-import { DeleteAttributePopup } from '../containers/delete-attribute-popup';
-import { EditAvatarPopup } from '../containers/edit-avatar-popup';
+
import { HexagonAvatar } from './hexagon-avatar';
import backgroundImage from '../../../../../static/assets/images/icons/icon-marketplace.png';
@@ -88,54 +83,32 @@ const styles = theme => ({
textOverflow: 'ellipsis',
whiteSpace: 'nowrap',
maxWidth: '222px'
- },
- didButtons: {
- marginTop: '20px'
- },
- transaction: {
- alignItems: 'center',
- display: 'flex'
- },
- extraSpace: {
- marginRight: '4px'
}
});
-const MARKETPLACE_ROOT_PATH = '/main/marketplace-categories';
-const SELFKEY_ID_PATH = '/main/selfkeyId';
+const SelfkeyIdSubheading = ({ email, did }) => (
+
+ {email}
+
+ {did && ( +
+ did:selfkey:{did}
+
+ )}
+
+);
-class SelfkeyIdOverviewComponent extends Component {
- state = {
- popup: null
- };
- componentDidMount() {
- this.props.onRef(this);
- }
- componentWillUnmount() {
- this.props.onRef(undefined);
+const DocumentExpiryDate = ({ doc }) => {
+ let date;
+ if (!doc || !doc.data || !doc.data.value || !doc.data.value.expires) {
+ date = '-';
+ } else {
+ date = moment(doc.data.value.expires).format('DD MMM YYYY');
}
- handleEditAttribute = attribute => {
- this.setState({ popup: 'edit-attribute', editAttribute: attribute });
- };
- handleAddAttribute = () => {
- this.setState({ popup: 'create-attribute', isDocument: false });
- };
- handleAddDocument = () => {
- this.setState({ popup: 'create-attribute', isDocument: true });
- };
- handleDeleteAttribute = attribute => {
- this.setState({ popup: 'delete-attribute', deleteAttribute: attribute });
- };
- handlePopupClose = () => {
- this.setState({ popup: null });
- };
- handleAvatarClick = () => {
- this.setState({ popup: 'edit-avatar' });
- };
- handleAccessClick = _ => this.props.dispatch(push(MARKETPLACE_ROOT_PATH));
- handleGetDid = _ => this.props.dispatch(walletOperations.startCreateDidFlow(SELFKEY_ID_PATH));
- handleEnterDid = _ =>
- this.props.dispatch(walletOperations.startAssociateDidFlow(SELFKEY_ID_PATH));
+ return {date};
+};
+
+class SelfkeyIdOverviewComponent extends Component {
renderLastUpdateDate({ updatedAt }) {
return moment(updatedAt).format('DD MMM YYYY, hh:mm a');
}
@@ -180,24 +153,6 @@ class SelfkeyIdOverviewComponent extends Component {
);
}
- renderExpiryDate(doc) {
- if (!doc || !doc.data || !doc.data.value || !doc.data.value.expires) return '-';
- return moment(doc.data.value.expires).format('DD MMM YYYY');
- }
- renderSubheading(email, did) {
- return (
- <>
- {email}
-
- {did && ( -
- did:selfkey:{did}
-
- )}
-
- );
- }
-
render() {
const {
classes,
@@ -209,41 +164,11 @@ class SelfkeyIdOverviewComponent extends Component {
firstName,
lastName,
middleName,
- wallet
+ identity
} = this.props;
- const { popup } = this.state;
return (
- {popup === 'create-attribute' && (
-
@@ -252,11 +177,13 @@ class SelfkeyIdOverviewComponent extends Component {
avatar={
-
- {!wallet.did && (
-
-
-
-
-
-
-
-
-
-
-
-
- Register on the SelfKey Network to get
- your DID.
-
-
-
-
-
-
- Use a DID when accesing different services
- in the marketplace. Once created you’ll see
- it under your profile.
-
-
-
- Getting a DID requires an Ethereum
- transaction. This is a one time only
- transaction.
-
-
-
-
-
-
-
-
- {wallet.didPending && (
-
-
- Processing transaction..Please
- wait
-
-
- )}
-
-
-
-
-
-
-
- )}
+ {this.props.didCard && {this.props.didCard} }
{
- this.handleEditAttribute(
+ this.props.onEditAttribute(
entry
);
}}
@@ -613,7 +438,7 @@ class SelfkeyIdOverviewComponent extends Component {
{
- this.handleEditAttribute(
+ this.props.onEditAttribute(
entry
);
}}
@@ -622,7 +447,7 @@ class SelfkeyIdOverviewComponent extends Component {
{
- this.handleDeleteAttribute(
+ this.props.onDeleteAttribute(
entry
);
}}
@@ -644,7 +469,7 @@ class SelfkeyIdOverviewComponent extends Component {
variant="outlined"
size="large"
color="secondary"
- onClick={this.handleAddAttribute}
+ onClick={this.props.onAddAttribute}
className={classes.button}
>
Add Information
@@ -728,9 +553,9 @@ class SelfkeyIdOverviewComponent extends Component {
{' '}
- {this.renderExpiryDate(
- entry
- )}{' '}
+
@@ -743,7 +568,7 @@ class SelfkeyIdOverviewComponent extends Component {
{
- this.handleEditAttribute(
+ this.props.onEditAttribute(
entry
);
}}
@@ -752,7 +577,7 @@ class SelfkeyIdOverviewComponent extends Component {
{
- this.handleDeleteAttribute(
+ this.props.onDeleteAttribute(
entry
);
}}
@@ -774,7 +599,7 @@ class SelfkeyIdOverviewComponent extends Component {
variant="outlined"
size="large"
color="secondary"
- onClick={this.handleAddDocument}
+ onClick={this.props.onAddDocument}
className={classes.button}
>
Add Documents
diff --git a/src/renderer/selfkey-id/main/components/selfkey-id.jsx b/src/renderer/selfkey-id/main/components/selfkey-id.jsx
index 6fa225e1c..e76030603 100644
--- a/src/renderer/selfkey-id/main/components/selfkey-id.jsx
+++ b/src/renderer/selfkey-id/main/components/selfkey-id.jsx
@@ -1,59 +1,22 @@
import React, { Component } from 'react';
import { Grid, Typography, Tabs, Tab } from '@material-ui/core';
-import { push } from 'connected-react-router';
-import SelfkeyIdOverview from './selfkey-id-overview';
-import SelfkeyIdApplications from './selfkey-id-applications';
-// import SelfkeyIdCompanies from './selfkey-id-companies';
-// import SelfkeyIdHistory from './selfkey-id-history';
class SelfkeyIdComponent extends Component {
- state = {
- tabValue: 0
- };
-
- async componentDidMount() {
- const { wallet, dispatch } = this.props;
- const tabValue = this.props.tabValue;
- if (!wallet.isSetupFinished) {
- await dispatch(push('/selfkeyIdCreate'));
- }
- if (tabValue) {
- this.setState({ tabValue: parseInt(tabValue) });
- } else {
- this.setState({ tabValue: 0 });
- }
- }
-
- handleChange = (event, tabValue) => {
- this.setState({ tabValue });
- };
-
render() {
- let component = (this.overview = ref)} />;
-
- if (this.state.tabValue === 1) {
- component =
SelfKey Identity Wallet
-
+
- {component}
+ {this.props.component}
);
}
diff --git a/src/renderer/selfkey-id/main/containers/create-attribute-popup.js b/src/renderer/selfkey-id/main/containers/create-attribute-popup.js
deleted file mode 100644
index 7ba66dbd8..000000000
--- a/src/renderer/selfkey-id/main/containers/create-attribute-popup.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { withStyles } from '@material-ui/core';
-import { identitySelectors, identityOperations } from 'common/identity';
-import { Popup } from '../../../common/popup';
-import CreateAttribute from '../components/create-attribute';
-
-export const styles = theme => ({
- disableTransparency: {
- '& > div:first-of-type': {
- background: 'linear-gradient(135deg, rgba(43,53,64,1) 0%, rgba(30,38,46,1) 100%)',
- opacity: '1 !important'
- }
- }
-});
-
-class CreateAttributePopupComponent extends Component {
- handleSave = attribute => {
- this.props.dispatch(identityOperations.createIdAttributeOperation(attribute));
- };
- handleCancel = () => {
- if (this.props.onClose) return this.props.onClose();
- };
- render() {
- let {
- classes,
- types,
- open = true,
- text,
- subtitle,
- uiSchemas,
- typeId,
- isDocument
- } = this.props;
-
- if (!text) {
- if (isDocument) {
- text = 'Add Document';
- } else {
- text = 'Add Information';
- }
- }
-
- if (!subtitle) {
- if (isDocument) {
- subtitle = 'Document Type *';
- } else {
- subtitle = 'Information Type *';
- }
- }
-
- return (
-
-
- );
- }
-}
-
-const mapStateToProps = (state, props) => {
- return {
- types: identitySelectors.selectIdAttributeTypes(state),
- uiSchemas: identitySelectors.selectUiSchemas(state)
- };
-};
-
-const styledComponent = withStyles(styles)(CreateAttributePopupComponent);
-export const CreateAttributePopup = connect(mapStateToProps)(styledComponent);
-
-export default CreateAttributePopup;
diff --git a/src/renderer/selfkey-id/main/containers/edit-avatar-popup.js b/src/renderer/selfkey-id/main/containers/edit-avatar-popup.js
index 89c4483c9..6879ecaa1 100644
--- a/src/renderer/selfkey-id/main/containers/edit-avatar-popup.js
+++ b/src/renderer/selfkey-id/main/containers/edit-avatar-popup.js
@@ -5,21 +5,21 @@ import { Popup } from '../../../common/popup';
import EditAvatar from '../components/edit-avatar';
class EditAvatarPopupComponent extends Component {
- handleSave = (avatar, walletId) => {
- this.props.dispatch(identityOperations.updateProfilePictureOperation(avatar, walletId));
+ handleSave = (avatar, identityId) => {
+ this.props.dispatch(identityOperations.updateProfilePictureOperation(avatar, identityId));
};
handleCancel = () => {
if (this.props.onClose) return this.props.onClose();
};
render() {
- const { walletId, avatar, open = true, text = 'Update Profile Picture' } = this.props;
+ const { identityId, avatar, open = true, text = 'Update Profile Picture' } = this.props;
return (
);
diff --git a/src/renderer/selfkey-id/main/containers/selfkey-id-applications.js b/src/renderer/selfkey-id/main/containers/selfkey-id-applications.js
new file mode 100644
index 000000000..c191c3055
--- /dev/null
+++ b/src/renderer/selfkey-id/main/containers/selfkey-id-applications.js
@@ -0,0 +1,158 @@
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { walletSelectors } from 'common/wallet';
+import { kycOperations } from 'common/kyc';
+import { marketplaceSelectors, marketplaceOperations } from 'common/marketplace';
+import { appSelectors } from 'common/app';
+import SelfkeyIdApplications from '../components/selfkey-id-applications';
+import { kycSelectors } from '../../../../common/kyc';
+
+class SelfkeyIdApplicationsContainerComponent extends Component {
+ state = {
+ showApplicationRefreshModal: false,
+ loading: true
+ };
+
+ async componentDidMount() {
+ const { vendors } = this.props;
+
+ await this.props.dispatch(kycOperations.resetApplications());
+ // load marketplace store
+ await this.props.dispatch(marketplaceOperations.loadMarketplaceOperation());
+ // load existing kyc_applications data
+ await this.props.dispatch(kycOperations.loadApplicationsOperation());
+ if (this.props.wallet.profile === 'local') {
+ await this.loadRelyingParties(vendors);
+ }
+
+ setTimeout(() => {
+ this.setState({ loading: false });
+ }, 2000);
+ }
+
+ async componentDidUpdate(prevProps) {
+ if (
+ prevProps.vendors.length !== this.props.vendors.length &&
+ this.props.wallet.profile === 'local'
+ ) {
+ await this.loadRelyingParties(this.props.vendors);
+ }
+ }
+
+ async loadRelyingParties(vendors) {
+ const authenticated = true;
+ const { afterAuthRoute, cancelRoute } = this.props;
+
+ for (const vendor of vendors) {
+ await this.props.dispatch(
+ kycOperations.loadRelyingParty(
+ vendor.vendorId,
+ authenticated,
+ afterAuthRoute,
+ cancelRoute
+ )
+ );
+ }
+ }
+
+ handleApplicationAdditionalRequirements = application => {
+ const { rps } = this.props;
+
+ // get current application info from RP
+ const rp = rps[application.rpName];
+ if (!rp) {
+ console.error(`Can't find RP named ${application.rpName}`);
+ return false;
+ }
+ // Later on, we will need to improve this to be able to distinguish requirements
+ // that can be fulfilled by the wallet directly and ones that need redirect to KYCC
+ // onboarding app.
+ // Redirects to KYCC with auto-login via JWT token
+ const instanceUrl = rp.session.ctx.config.rootEndpoint;
+ const url = `${instanceUrl}/applications/${application.id}?access_token=${
+ rp.session.access_token.jwt
+ }`;
+ window.openExternal(null, url);
+ };
+
+ handleApplicationRefresh = application => {
+ const { rps, wallet, dispatch, afterAuthRoute, cancelRoute } = this.props;
+
+ // get current application info from RP
+ const rp = rps[application.rpName];
+ if (!rp && wallet.profile === 'local') {
+ console.warning(`Can't find RP named ${application.rpName}`);
+ return false;
+ }
+
+ if (wallet.profile !== 'local') {
+ return dispatch(
+ kycOperations.refreshRelyingPartyForKycApplication(
+ application,
+ afterAuthRoute,
+ cancelRoute
+ )
+ );
+ }
+
+ const kycApplication = rp.applications.find(app => app.id === application.id);
+
+ if (application && kycApplication) {
+ // update stored application
+ application.currentStatus = kycApplication.currentStatus;
+ application.currentStatusName = kycApplication.statusName;
+ application.updatedAt = kycApplication.updatedAt;
+ }
+
+ // sync of RP applications with local database is done automatically, all done, show modal
+ this.setState({
+ showApplicationRefreshModal: true
+ });
+ };
+
+ handleCloseApplicationRefreshModal = evt => {
+ evt && evt.preventDefault();
+ this.setState({ showApplicationRefreshModal: false });
+ };
+
+ render() {
+ const { rps, vendors, wallet } = this.props;
+ let loading = this.state.loading;
+ if (wallet.profile === 'local') {
+ loading = Object.keys(rps).length === 0 || vendors.length === 0;
+ }
+
+ return (
+
+ {popup === 'create-attribute' && (
+
+ );
+ }
+}
+
+const mapStateToProps = (state, props) => {
+ return {};
+};
+export const SelfkeyIdOverviewContainer = connect(mapStateToProps)(
+ SelfkeyIdOverviewContainerComponent
+);
+
+export default SelfkeyIdOverviewContainer;
diff --git a/src/renderer/selfkey-id/main/containers/selfkey-id.js b/src/renderer/selfkey-id/main/containers/selfkey-id.js
index 5a68dd980..b216af2f3 100644
--- a/src/renderer/selfkey-id/main/containers/selfkey-id.js
+++ b/src/renderer/selfkey-id/main/containers/selfkey-id.js
@@ -2,12 +2,73 @@ import React, { Component } from 'react';
import { connect } from 'react-redux';
import { identitySelectors, identityOperations } from 'common/identity';
import SelfkeyId from '../components/selfkey-id';
+import SelfkeyIdOverview from './selfkey-id-overview';
+import SelfkeyIdApplications from './selfkey-id-applications';
+import { push } from 'connected-react-router';
+
+const MARKETPLACE_ROOT_PATH = '/main/marketplace-categories';
class SelfkeyIdContainerComponent extends Component {
- handleAttributeDelete = attributeId =>
- this.props.dispatch(identityOperations.removeIdAttributeOperation(attributeId));
+ state = {
+ tab: 0
+ };
+
+ async componentDidMount() {
+ const { identity, dispatch } = this.props;
+ const tab = this.props.tabValue;
+ if (this.props.identity.type !== 'individual') {
+ return this.props.dispatch(identityOperations.navigateToProfileOperation());
+ }
+ if (!identity.isSetupFinished) {
+ await dispatch(push('/selfkeyIdCreate'));
+ }
+
+ this.setState({ tab: tab ? parseInt(tab) : 0 });
+ }
+
+ handleTabChange = (event, tab) => this.setState({ tab });
+
+ componentDidUpdate() {
+ if (this.props.identity.type !== 'individual') {
+ this.props.dispatch(identityOperations.navigateToProfileOperation());
+ }
+ }
+
+ handleMarketplaceAccessClick = _ => this.props.dispatch(push(MARKETPLACE_ROOT_PATH));
+
render() {
- return
+
+ );
}
}
diff --git a/src/renderer/selfkey-id/main/index.js b/src/renderer/selfkey-id/main/index.js
index 876b4a582..51b0af413 100644
--- a/src/renderer/selfkey-id/main/index.js
+++ b/src/renderer/selfkey-id/main/index.js
@@ -1,2 +1 @@
export { SelfkeyIdContainer } from './containers/selfkey-id';
-export { AssociateDID } from './components/associate-did';
diff --git a/src/renderer/transaction/common/transaction-error-box.jsx b/src/renderer/transaction/common/transaction-error-box.jsx
index e4c419c08..c5d04630c 100644
--- a/src/renderer/transaction/common/transaction-error-box.jsx
+++ b/src/renderer/transaction/common/transaction-error-box.jsx
@@ -6,8 +6,8 @@ import Popup from '../../common/popup';
const styles = theme => ({});
export const TransactionErrorBox = withStyles(styles)(
- ({ children, publicKey, closeAction, open = true, subtitle }) => (
-
+ ({ children, address, closeAction, open = true, subtitle }) => (
+
{subtitle}
{children}
- {publicKey && (
+ {address && (
<>
Your Address:
- {publicKey}
+ {address}
-
diff --git a/src/renderer/transaction/receive/index.jsx b/src/renderer/transaction/receive/index.jsx
index 6ec9a12aa..2229ac400 100644
--- a/src/renderer/transaction/receive/index.jsx
+++ b/src/renderer/transaction/receive/index.jsx
@@ -159,8 +159,8 @@ const getIconForToken = token => {
export class ReceiveTransfer extends React.Component {
render() {
- const { classes, cryptoCurrency, publicKey } = this.props;
- let link = `mailto:?body=${publicKey}`;
+ const { classes, cryptoCurrency, address } = this.props;
+ let link = `mailto:?body=${address}`;
let printDiv = () => {
window.print();
@@ -192,7 +192,7 @@ export class ReceiveTransfer extends React.Component {
- {publicKey}
+ {address}
diff --git a/src/renderer/transaction/transaction-declined/containers/transaction-declined.js b/src/renderer/transaction/transaction-declined/containers/transaction-declined.js
index c32e76f9d..f96062d31 100644
--- a/src/renderer/transaction/transaction-declined/containers/transaction-declined.js
+++ b/src/renderer/transaction/transaction-declined/containers/transaction-declined.js
@@ -23,7 +23,7 @@ class TransactionDeclinedContainer extends Component {
const mapStateToProps = state => {
return {
- publicKey: getWallet(state).publicKey
+ address: getWallet(state).address
};
};
diff --git a/src/renderer/transaction/transaction-error/components/transaction-error.jsx b/src/renderer/transaction/transaction-error/components/transaction-error.jsx
index d8840fbc8..150034bc9 100644
--- a/src/renderer/transaction/transaction-error/components/transaction-error.jsx
+++ b/src/renderer/transaction/transaction-error/components/transaction-error.jsx
@@ -8,20 +8,18 @@ const styles = theme => ({
}
});
-export const TransactionError = withStyles(styles)(
- ({ classes, message, publicKey, closeAction }) => {
- return (
-
-
- {message}
-
-
- );
- }
-);
+export const TransactionError = withStyles(styles)(({ classes, message, address, closeAction }) => {
+ return (
+
+
+ {message}
+
+
+ );
+});
export default TransactionError;
diff --git a/src/renderer/transaction/transaction-error/containers/transaction-error.js b/src/renderer/transaction/transaction-error/containers/transaction-error.js
index daaa44871..1c2db1581 100644
--- a/src/renderer/transaction/transaction-error/containers/transaction-error.js
+++ b/src/renderer/transaction/transaction-error/containers/transaction-error.js
@@ -23,7 +23,7 @@ class TransactionErrorContainer extends Component {
const mapStateToProps = state => {
return {
- publicKey: getWallet(state).publicKey
+ address: getWallet(state).address
};
};
diff --git a/src/renderer/transaction/transaction-no-gas-error/components/transaction-no-gas-error.jsx b/src/renderer/transaction/transaction-no-gas-error/components/transaction-no-gas-error.jsx
index 933b90ca9..394dcd262 100644
--- a/src/renderer/transaction/transaction-no-gas-error/components/transaction-no-gas-error.jsx
+++ b/src/renderer/transaction/transaction-no-gas-error/components/transaction-no-gas-error.jsx
@@ -19,7 +19,7 @@ const styles = theme => ({
});
export const TransactionNoGasError = withStyles(styles)(
- ({ classes, children, publicKey, openLink, closeAction }) => {
+ ({ classes, children, address, openLink, closeAction }) => {
const gasExplanationUrl =
'https://help.selfkey.org/article/87-how-does-gas-impact-transaction-speed';
const handleLinkClick = event => {
@@ -30,7 +30,7 @@ export const TransactionNoGasError = withStyles(styles)(
openLink(gasExplanationUrl);
};
return (
-
+
You do not have enough Ethereum (ETH) to pay for the network transaction
diff --git a/src/renderer/transaction/transaction-no-gas-error/containers/transaction-no-gas-error.js b/src/renderer/transaction/transaction-no-gas-error/containers/transaction-no-gas-error.js
index 78433a88e..f4fccfdf0 100644
--- a/src/renderer/transaction/transaction-no-gas-error/containers/transaction-no-gas-error.js
+++ b/src/renderer/transaction/transaction-no-gas-error/containers/transaction-no-gas-error.js
@@ -32,7 +32,7 @@ class TransactionNoGasErrorContainer extends Component {
const mapStateToProps = state => {
return {
- publicKey: getWallet(state).publicKey
+ address: getWallet(state).address
};
};
diff --git a/src/renderer/transaction/transaction-no-key-error/components/transaction-no-key-error.jsx b/src/renderer/transaction/transaction-no-key-error/components/transaction-no-key-error.jsx
index c3e782453..2fa9c2e46 100644
--- a/src/renderer/transaction/transaction-no-key-error/components/transaction-no-key-error.jsx
+++ b/src/renderer/transaction/transaction-no-key-error/components/transaction-no-key-error.jsx
@@ -19,14 +19,14 @@ const styles = theme => ({
});
export const TransactionNoKeyError = withStyles(styles)(
- ({ classes, children, publicKey, closeAction }) => {
+ ({ classes, children, address, closeAction }) => {
return (
-
+
- You do not have enough KEY tokens to pay for the incorporation. Please
- transfer some KEY to this address and try again. Your KEY address of this
- wallet is listed below.
+ You do not have enough KEY tokens to pay for this Marketplace Application.
+ Please transfer some KEY to this address and try again. Your KEY address of
+ this wallet is listed below.
diff --git a/src/renderer/transaction/transaction-no-key-error/containers/transaction-no-key-error.js b/src/renderer/transaction/transaction-no-key-error/containers/transaction-no-key-error.js
index 887a251fa..ec4dffe3f 100644
--- a/src/renderer/transaction/transaction-no-key-error/containers/transaction-no-key-error.js
+++ b/src/renderer/transaction/transaction-no-key-error/containers/transaction-no-key-error.js
@@ -23,7 +23,7 @@ class TransactionNoKeyErrorContainer extends Component {
const mapStateToProps = state => {
return {
- publicKey: getWallet(state).publicKey
+ address: getWallet(state).address
};
};
diff --git a/src/renderer/transaction/transactions-history/index.jsx b/src/renderer/transaction/transactions-history/index.jsx
index 86c0a52f3..d2883b4fd 100644
--- a/src/renderer/transaction/transactions-history/index.jsx
+++ b/src/renderer/transaction/transactions-history/index.jsx
@@ -238,8 +238,8 @@ class TransactionsHistory extends Component {
};
hasSent = transaction => {
- const publicKey = this.props.wallet.publicKey || '';
- return transaction.from.toLowerCase() === publicKey.toLowerCase();
+ const address = this.props.wallet.address || '';
+ return transaction.from.toLowerCase() === address.toLowerCase();
};
renderDate(timestamp) {
diff --git a/src/renderer/wallet/create/backup-address.jsx b/src/renderer/wallet/create/backup-address.jsx
index b4b8ae773..bd856509a 100644
--- a/src/renderer/wallet/create/backup-address.jsx
+++ b/src/renderer/wallet/create/backup-address.jsx
@@ -107,25 +107,25 @@ class BackupAddress extends Component {
- Your public key is a unique address on the Ethereum
- blockchain. Think of it like a bank account number that you
- own, used to send and receive Ether or tokens. The ability
- to authorize transactions on this address is encrypted by
- the password you just created. Download a backup and save
- this address in a convenient location.
+ Your address in Ethereum network. Think of it like a bank
+ account number that you own, used to send and receive Ether
+ or tokens. The ability to authorize transactions on this
+ address is encrypted by the password you just created.
+ Download a backup and save this address in a convenient
+ location.
- Your Public Key
+ Your Address
-
-
@@ -219,7 +245,7 @@ class Main extends Component {
const mapStateToProps = (state, props) => {
return {
- publicKey: walletSelectors.getWallet(state).publicKey,
+ address: walletSelectors.getWallet(state).address,
walletType: appSelectors.selectWalletType(state)
};
};
diff --git a/src/renderer/wallet/main/sidebar-switch-account.jsx b/src/renderer/wallet/main/sidebar-switch-account.jsx
new file mode 100644
index 000000000..f47514d39
--- /dev/null
+++ b/src/renderer/wallet/main/sidebar-switch-account.jsx
@@ -0,0 +1,254 @@
+import React, { Component } from 'react';
+import {
+ withStyles,
+ Button,
+ Drawer,
+ Grid,
+ List,
+ ListItem,
+ Typography,
+ Divider
+} from '@material-ui/core';
+import Close from '@material-ui/icons/Close';
+import { SelfkeyLogo } from 'selfkey-ui';
+import PersonIcon from 'selfkey-ui/build/lib/icons/person';
+import CorporateIcon from 'selfkey-ui/build/lib/icons/corporate';
+
+const styles = theme => ({
+ list: {
+ justifyContent: 'space-between',
+ margin: 0,
+ minHeight: '100%',
+ overflow: 'auto',
+ width: 300
+ },
+ listItem: {
+ alignItems: 'end',
+ cursor: 'pointer',
+ display: 'flex',
+ paddingLeft: 0,
+ '&:hover': {
+ '& h6': {
+ transition: 'all 0.3s'
+ },
+ '& p': {
+ color: '#ffffff',
+ transition: 'all 0.3s'
+ },
+ '& svg': {
+ '& path': {
+ fill: '#ffffff',
+ transition: 'all 0.3s'
+ }
+ }
+ }
+ },
+ logoSection: {
+ marginBottom: '30px',
+ marginTop: '-30px',
+ paddingLeft: '16px'
+ },
+ logo: {
+ width: '38px',
+ height: '44px'
+ },
+ logoText: {
+ fontFamily: 'Orbitron, arial, sans-serif',
+ fontSize: '18px',
+ letterSpacing: '2.77px',
+ lineHeight: '22px',
+ paddingTop: '3px'
+ },
+ closeSection: {
+ width: '100%'
+ },
+ pointer: {
+ cursor: 'pointer'
+ },
+ secondaryButtons: {
+ alignItems: 'flex-end',
+ display: 'flex',
+ flexGrow: 2,
+ width: 'inherit'
+ },
+ inheritWidth: {
+ width: 'inherit'
+ },
+ inheritHeight: {
+ height: 'inherit'
+ },
+ version: {
+ color: '#fff',
+ fontSize: '10px',
+ opacity: 0.6,
+ position: 'absolute',
+ right: 0,
+ width: 'auto'
+ },
+ drawer: {
+ transition: 'all 3s',
+ '& > div:first-of-type': {
+ opacity: '1 !important'
+ }
+ },
+ fullWidth: {
+ width: '100%'
+ },
+ iconSpace: {
+ marginRight: '15px'
+ },
+ gridBottomSpace: {
+ marginBottom: '20px'
+ },
+ nameRole: {
+ display: 'flex',
+ flexDirection: 'column',
+ justifyContent: 'space-around'
+ }
+});
+
+const dataIDType = [
+ {
+ name: 'Andrew Jones',
+ type: 'Personal'
+ },
+ {
+ name: 'Andrew Jones US',
+ type: 'Personal'
+ },
+ {
+ name: 'Google Inc',
+ type: 'Corporate'
+ }
+];
+
+const IDType = withStyles(styles)(({ dataIDType, classes }) => {
+ return (
+
+ {dataIDType.map((data, index) => {
+ return (
+
+ );
+});
+
+class SidebarSwitchAccount extends Component {
+ state = {
+ open: true
+ };
+
+ render() {
+ const { classes } = this.props;
+
+ const sideList = (
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SELFKEY
+
+
+
+
+
+
+
+ Choose a SelfKey ID
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+
+ return (
+
+
+ );
+ }
+}
+
+export default withStyles(styles)(SidebarSwitchAccount);
diff --git a/src/renderer/wallet/main/sidebar.jsx b/src/renderer/wallet/main/sidebar.jsx
index 6c23e0590..28417a61b 100644
--- a/src/renderer/wallet/main/sidebar.jsx
+++ b/src/renderer/wallet/main/sidebar.jsx
@@ -7,17 +7,30 @@ import {
ListItemIcon,
Grid,
Typography,
+ // Input,
+ // MenuItem,
+ // Select,
+ // IconButton
Divider
} from '@material-ui/core';
import { Link } from 'react-router-dom';
-import Close from '@material-ui/icons/Close';
import {
DashboardMenuIcon,
MarketplaceMenuIcon,
SelfkeyIDMenuIcon,
AddressBookMenuIcon,
- SelfkeyLogo
+ SelfkeyLogo,
+ MenuHelpIcon,
+ SwitchAccountsIcon,
+ PowerIcon,
+ // KeyTooltip,
+ // TooltipArrow,
+ // MenuAffiliateIcon,
+ // MenuExportIcon
+ // InfoTooltip,
+ primary
} from 'selfkey-ui';
+// import { KeyboardArrowDown } from '@material-ui/icons';
const styles = theme => ({
list: {
@@ -25,23 +38,23 @@ const styles = theme => ({
margin: 0,
minHeight: '100%',
overflow: 'auto',
- width: 300
+ width: '100%'
},
logoSection: {
marginBottom: '30px',
- marginTop: '-30px',
- paddingLeft: '16px'
+ marginTop: '-30px'
},
logo: {
- width: '38px',
- height: '44px'
+ width: '30px',
+ height: '34px'
},
logoText: {
fontFamily: 'Orbitron, arial, sans-serif',
- fontSize: '18px',
+ fontSize: '16px',
letterSpacing: '2.77px',
lineHeight: '22px',
- paddingTop: '3px'
+ marginLeft: '13px',
+ marginTop: '3px'
},
closeSection: {
width: '100%'
@@ -49,12 +62,25 @@ const styles = theme => ({
pointer: {
cursor: 'pointer'
},
+ link: {
+ alignItems: 'center',
+ display: 'flex',
+ outline: 'none',
+ textDecoration: 'none',
+ '&:focus': {
+ outline: 'none'
+ }
+ },
listItem: {
- alignItems: 'end',
cursor: 'pointer',
display: 'flex',
marginBottom: '30px',
paddingLeft: '10px',
+ '& p': {
+ overflow: 'hidden',
+ textOverflow: 'ellipsis',
+ whiteSpace: 'nowrap'
+ },
'&:hover': {
color: '#ffffff',
'& p': {
@@ -62,6 +88,7 @@ const styles = theme => ({
},
'& svg': {
color: '#ffffff',
+ fill: '#ffffff',
stroke: '#ffffff'
}
}
@@ -78,32 +105,86 @@ const styles = theme => ({
inheritHeight: {
height: 'inherit'
},
- textColor: {
- color: '#fff',
- opacity: 0.8,
- '&:hover': {
- opacity: 1
- }
- },
version: {
color: '#fff',
fontSize: '10px',
opacity: 0.6,
position: 'absolute',
- right: 0,
width: 'auto'
},
+ versionWrap: {
+ paddingLeft: '50px'
+ },
drawer: {
transition: 'all 3s',
'& > div:first-of-type': {
- opacity: '1 !important'
+ borderBottom: 'none',
+ left: 0,
+ opacity: '1 !important',
+ right: 'auto'
+ }
+ },
+ openedDrawer: {
+ '& > div:first-of-type': {
+ minWidth: 200,
+ transition: 'all 0.2s ease-out'
+ },
+ '& .sidebarContainer': {
+ overflow: 'auto',
+ transition: 'all 0.2s ease-out',
+ width: 200
+ },
+ '& .divider': {
+ marginBottom: '30px',
+ marginLeft: 9,
+ paddingLeft: 0,
+ transition: 'all 0.2s ease-out',
+ width: 160
+ }
+ },
+ closedDrawer: {
+ '& > div:first-of-type': {
+ minWidth: 56,
+ transition: 'all 0.2s ease-out'
+ },
+ '& .sidebarContainer': {
+ overflow: 'hidden',
+ transition: 'all 0.2s ease-out',
+ width: 56
+ },
+ '& .divider': {
+ marginBottom: '30px',
+ marginLeft: 9,
+ paddingLeft: 0,
+ transition: 'all 0.2s ease-out',
+ width: 16
}
+ },
+ listItemIcon: {
+ marginRight: '22px'
+ },
+ select: {
+ width: '160px'
+ },
+ network: {
+ marginBottom: '30px',
+ paddingLeft: '20px'
+ },
+ tooltip: {
+ marginTop: '-2px',
+ padding: '0 0 0 10px'
+ },
+ customWidth: {
+ maxWidth: '168px'
+ },
+ tooltipLink: {
+ color: primary,
+ textDecoration: 'none'
}
});
const dashboard = props => ;
const marketplace = props => ;
-const selfkeyId = props => ;
const addressBook = props => ;
const switchAccount = props => ;
@@ -130,7 +211,7 @@ class Sidebar extends Component {
};
render() {
- const { classes } = this.props;
+ const { classes, onProfileNavigate } = this.props;
const sideList = (
-
-
-
-
-
-
-
+
-
+
-
SELFKEY
-
+
-
-
-
+export const HexagonAvatar = withStyles(styles)(
+ ({ classes, smallAvatar = false, src = avatarPlaceholder, onClick, className }) => (
+
-));
+ )
+);
export default HexagonAvatar;
diff --git a/src/renderer/selfkey-id/main/components/selfkey-id-applications.jsx b/src/renderer/selfkey-id/main/components/selfkey-id-applications.jsx
index 60df9f11d..0b44797f0 100644
--- a/src/renderer/selfkey-id/main/components/selfkey-id-applications.jsx
+++ b/src/renderer/selfkey-id/main/components/selfkey-id-applications.jsx
@@ -1,5 +1,5 @@
import React, { Component } from 'react';
-import config from 'common/config';
+import classNames from 'classnames';
import {
Button,
Card,
@@ -35,14 +35,7 @@ import {
error
} from 'selfkey-ui';
import moment from 'moment';
-import classNames from 'classnames';
-import { push } from 'connected-react-router';
-import { connect } from 'react-redux';
-import { walletSelectors } from 'common/wallet';
-import { incorporationsOperations, incorporationsSelectors } from 'common/incorporations';
-import { kycSelectors, kycOperations, kycActions } from 'common/kyc';
import { Popup } from '../../../common/popup';
-import { appSelectors } from 'common/app';
const styles = theme => ({
statusIcon: {
@@ -263,277 +256,68 @@ const HeaderIcon = withStyles(styles)(({ status, classes }) => {
return icon;
});
-const getRpInfo = (rpName, field) => {
- return config.relyingPartyInfo[rpName][field];
-};
-
-const getRpName = title => {
- return title.toLowerCase().startsWith('bank account') ? 'Bank Accounts' : 'Incorporations';
-};
-
-const MARKETPLACE_ROOT_PATH = '/main/marketplace-categories';
-
class SelfkeyIdApplicationsComponent extends Component {
- state = {
- loading: false,
- applicationId: null,
- addingDocuments: false,
- rpName: null,
- refreshing: false,
- showApplicationRefreshModal: false
- };
-
- async componentDidMount() {
- const { rp, afterAuthRoute } = this.props;
- const cancelRoute = `/main/selfkeyId`;
- const authenticate = true;
-
- await this.props.dispatch(kycOperations.resetApplications());
- // if relying party not loaded, try again
- if (!rp || !rp.authenticated) {
- this.setState({ loading: true }, async () => {
- await this.props.dispatch(kycOperations.setProcessing(true));
- await this.props.dispatch(
- kycOperations.loadRelyingParty(
- 'incorporations',
- authenticate,
- afterAuthRoute,
- cancelRoute
- )
- );
- });
- }
-
- // try to load existing kyc_applications data
- await this.props.dispatch(kycOperations.loadApplicationsOperation());
-
- // this is needed otherwise the rp keeps loading (stuck)
- if (!this.props.incorporations || !this.props.incorporations.length) {
- await this.props.dispatch(incorporationsOperations.loadIncorporationsOperation());
- }
- }
-
- async componentDidUpdate(prevProps) {
- if (prevProps.rp !== this.props.rp) {
- if (this.props.rp.authenticated) {
- await this.props.dispatch(kycOperations.loadApplicationsOperation());
- }
- this.setState({ loading: false }, () => {
- if (this.state.refreshing) {
- if (this.state.applicationId) {
- // try to refresh again after loading relying party
- this.handleApplicationRefresh(this.state.applicationId);
- }
- }
- if (this.state.addingDocuments) {
- if (this.state.applicationId) {
- // try to refresh again after loading relying party
- this.handleApplicationAddDocuments(
- this.state.applicationId,
- this.state.rpName
- );
- }
- }
- });
- }
- }
-
- handleApplicationAddDocuments = (id, rpName) => {
- const { rp, afterAuthRoute } = this.props;
- const cancelRoute = `/main/selfkeyId`;
- const authenticate = true;
-
- // if relying party not loaded, try again
- if (!rp || !rp.authenticated) {
- this.setState(
- { loading: true, addingDocuments: true, applicationId: id, rpName },
- async () => {
- await this.props.dispatch(
- kycOperations.loadRelyingParty(
- 'incorporations',
- authenticate,
- afterAuthRoute,
- cancelRoute
- )
- );
- }
- );
- } else {
- let self = this;
- this.setState(
- {
- loading: false,
- addingDocuments: false,
- applicationId: null,
- rpName: null
- },
- async () => {
- // Get current application info from kyc
- let currentApplication = self.props.rp.applications.find(app => {
- return app.id === id;
- });
- // get stored application from local database
- let application = this.props.applications.find(app => {
- return app.id === id;
- });
- const {
- template,
- vendor,
- privacyPolicy,
- termsOfService,
- attributes
- } = currentApplication;
- const { rpName, title } = application;
- /* eslint-disable camelcase */
- const description = application.sub_title;
- /* eslint-enable camelcase */
- const agreement = true;
-
- // Set application data
- await self.props.dispatch(
- kycActions.setCurrentApplication(
- rpName,
- template,
- afterAuthRoute,
- cancelRoute,
- title,
- description,
- agreement,
- vendor,
- privacyPolicy,
- termsOfService,
- attributes
- )
- );
-
- // Open add documents modal
- // (Later on, we will need to improve this to be able to distinguish requirements
- // that can be fulfilled by the wallet and ones that need redirect to KYCC.)
- //
- // await self.props.dispatch(
- // kycOperations.loadRelyingParty(
- // rpName,
- // true,
- // `/main/kyc/current-application/${rpName}?applicationId=${id}`
- // )
- // );
-
- // Redirects to KYCC chain on an external browser window with auto-login
- const instanceUrl = self.props.rp.session.ctx.config.rootEndpoint;
- const url = `${instanceUrl}/applications/${application.id}?access_token=${
- self.props.rp.session.access_token.jwt
- }`;
- window.openExternal(null, url);
- }
- );
- }
- };
-
- handleApplicationRefresh = id => {
- const { rp, afterAuthRoute } = this.props;
- const cancelRoute = `/main/selfkeyId`;
- const authenticate = true;
-
- // if relying party not loaded, try again
- if (!rp || !rp.authenticated) {
- this.setState({ loading: true, refreshing: true, applicationId: id }, async () => {
- await this.props.dispatch(
- kycOperations.loadRelyingParty(
- 'incorporations',
- authenticate,
- afterAuthRoute,
- cancelRoute
- )
- );
- });
- } else {
- // get stored application from local database
- let application = this.props.applications.find(app => {
- return app.id === id;
- });
- // get current application info from kyc
- let kycApplication = this.props.rp.applications.find(app => {
- return app.id === id;
- });
-
- if (application && kycApplication) {
- // update stored application
- application.currentStatus = kycApplication.currentStatus;
- application.currentStatusName = kycApplication.statusName;
- application.updatedAt = kycApplication.updatedAt;
- }
-
- // sync of RP applications with local database is done automatically, all done, show modal
- this.setState({
- refreshing: false,
- applicationId: null,
- showApplicationRefreshModal: true
- });
- }
- };
-
renderLoadingScreen = () => (
+
-
+
+
-
+ {/*
+ */}
+ {did && ( +
- {did && ( -
-
-
-
-
+
+
+
+ {data.type === 'Personal' ?
+
+ {data.name}
+
+ {data.type}
+
+
+
+
+
+ );
+ })}
+ -
+
-
+
+ {sideList}
+
+ -
+
- We will assist you in filling out the KYC Questionnaires. In addition to your company and identity documents, you will need to provide certain business documentation to support your application such as invoices, letters of intent, contracts, etc. \n\n
- The Bank’s Relationship Manager will review your documentation. The banker may come back with additional questions or give green-light to your account opening process. This usually takes from 1 to 3 days. \n\n
- We will arrange your appointment with the Relationship Manager in Singapore. The appointment is usually arranged for the following week subject to the client and bankers availability. \n\n
- You will need to visit the Bank’s branch and have a 1-hour meeting with the Relationship Manager. You will need to provide original documents and sign the application forms. \n\n
- After two or three weeks, you will receive an e-mail from the Relationship Manager confirming the account opening and providing your account number. You will need to transfer the initial deposit. \n\n
- After 5-10 days, you will receive your Internet Banking credentials via courier. \n\n
- We will assist you in filling out the KYC Questionnaires. \n\n
- The Bank’s Relationship Manager will review your documentation. The banker may come back with additional questions or give green-light to your account opening process. This usually takes from 1 to 3 days. \n\n
- We will arrange your appointment with the Relationship Manager in Singapore. The appointment is usually arranged for the following week subject to the client and banker availability. \n\n
- You will need to visit the Bank’s branch and have a 1-hour meeting with the Relationship Manager. You will need to provide original documents and sign the application forms. \n\n
- Personal Accounts are opened on the spot, internet banking credentials will be set the same day and you will receive the debit card the same day. You may elect to pick up your SecureToken device after 5 business days or receive it in the mailing address provided. \n\n
- We will assist you in filling out the KYC Questionnaires. You will need to provide certified copies of your identity documents and proof of address. \n\n
- The Bank’s Relationship Manager will review your documentation. The banker may come back with additional questions or give green-light to your account opening process. This usually takes from 1 to 3 days. \n\n
- Once the relationship manager has confirmed that your documents meet the bank’s requirements. You will be required to mail them to Singapore. \n\n
- Once the bank receives the original certified copies of your documents, the relationship manager will proceed to open your account. \n\n
- Once your account is opened you will receive your Bank Account details via SMS and a welcome e-mail from the bank. Debit Card and Internet Banking credentials will be sent via courier. \n
- We will assist you in filling out the KYC Questionnaires. \n
- The Bank’s Relationship Manager will review your documentation. The banker may come back with additional questions or give green-light to your account opening process. This usually takes 1 week. \n
- We will arrange your appointment with the Relationship Manager in Hong Kong. The appointment is usually the following week. \n
- You will need to visit the Bank’s branch to provide original documents, have an interview with the banker and sign application forms. \n
- The bank account will be opened on the spot. You will receive your account details, internet banking credentials, secure Token device and your debit card the same day. \n
- We will assist you in filling out the KYC and Business Questionnaires. In addition to your company and identity documents, you will need to provide certain business documentation to support your application such as invoices, letters of intent, contracts, etc. \n
- The Bank’s Relationship Manager will review your documentation. The banker may come back with additional questions or give green-light to your account opening process. This usually takes from 1 to 2 weeks. \n
- Once your account has been approved. We will arrange your appointment with the Relationship Manager in Hong Kong. The appointment is subject to the availability of the banker, and may be arranged in one or two weeks. \n
- Account signatories and directors will need to visit the Bank’s branch to provide original documents, have an interview with the banker and sign application forms. \n
- After 1 month, you will receive an e-mail from the bank confirming the account opening. You will receive your account details, internet banking credentials and ATM card. \n
- We will assist you in filling out the KYC Questionnaires. \n
- The Bank’s Relationship Manager will review your documentation. The banker may come back with additional questions or give green-light to your account opening process. This usually takes 1 week. \n
- We will arrange your appointment with the Relationship Manager in Hong Kong. The appointment is usually arranged for the following week subject to the client and bankers availability. \n
- You will need to visit the Bank’s branch and have a 1-hour meeting with the Relationship Manager. You will need to provide original documents and sign the application forms. \n
- Wealth Management Accounts are opened on the spot, you will receive your cards, and your internet banking credentials will be set the same day. \n
- item
- item
-
+
this.toggleDrawer(false)}
- onKeyDown={() => this.toggleDrawer(false)}
- className={classes.inheritHeight}
- >
+
+
+ )
+ );
+ }
+);
+const Profile = withStyles(styles)(
+ ({ classes, profile, wallet, isOpen, onProfileClick, onProfileNavigate }) => (
+
+
+
+ {profile.type === 'corporate' ? (
+
+
+
+ {profile.name || defaultIdentityName(profile, wallet.profileName)}
+
+
+ {profile.type === 'individual' ? 'Personal Profile' : 'Corporate Profile'}
+
+
+
+
+
+
+ )
+);
+
+class Toolbar extends Component {
render() {
- const { classes } = this.props;
+ const {
+ classes,
+ onToggleMenu,
+ isSidebarOpen,
+ isProfileOpen,
+ closeProfile,
+ selectedProfile,
+ onProfileClick,
+ onProfileNavigate,
+ onProfileSelect,
+ profiles,
+ wallet,
+ onCreateCorporateProfileClick,
+ primaryToken,
+ showCorporate
+ } = this.props;
return (
(
(
bank.accountType === 'personal')}
+ inventory={bankingOffers.filter(bank => bank.data.type === 'personal')}
accountType="personal"
onAccountTypeChange={linkTo('Banking/OffersPage', accountType => accountType)}
onDetails={linkTo('Banking/BankingDetailsPage', 'default')}
@@ -116,8 +110,8 @@ storiesOf('Banking/OffersPage', module)
.add('corporate', () => (
bank.accountType === 'business')}
- accountType="corporate"
+ inventory={bankingOffers.filter(bank => bank.data.type === 'business')}
+ accountType="business"
onAccountTypeChange={linkTo('Banking/OffersPage', accountType => accountType)}
onDetails={linkTo('Banking/BankingDetailsPage', 'default')}
onBackClick={action('banking offers page back')}
@@ -126,7 +120,7 @@ storiesOf('Banking/OffersPage', module)
.add('private', () => (
bank.accountType === 'private')}
+ inventory={bankingOffers.filter(bank => bank.data.type === 'private')}
accountType="private"
onAccountTypeChange={linkTo('Banking/OffersPage', accountType => accountType)}
onDetails={linkTo('Banking/BankingDetailsPage', 'default')}
@@ -158,42 +152,50 @@ storiesOf('Banking/BankingApplicationButton', module)
storiesOf('Banking/Tab Content', module)
.add('types', () => (
offer.countryCode === 'hk')}
- accountType={translation}
+ banks={bankingOffers[0].data.accounts}
+ jurisdiction={bankingOffers[0]}
region="Hong Kong"
/>
))
- .add('description', () => offer.countryCode === 'hk')}
- region="Hong Kong"
+ jurisdiction={bankingOffers[0]}
+ banks={bankingOffers[0].data.accounts}
+ region="Singapore"
onTabChange={linkTo('Banking/Tabs Selector', tab => tab)}
/>
))
.add('description', () => (
tab)}
/>
))
@@ -222,7 +225,7 @@ storiesOf('Banking/Tabs Selector', module)
tab)}
@@ -231,7 +234,8 @@ storiesOf('Banking/Tabs Selector', module)
.add('services', () => (
tab)}
/>
));
@@ -358,7 +362,8 @@ storiesOf('Banking/BankingDetailsPage', module)
contact="help@flagtheory.com"
resume={resume}
canOpenBankAccount
- accountType={translation}
+ banks={bankingOffers[0].data.accounts}
+ jurisdiction={bankingOffers[0]}
onTabChange={linkTo('Banking/BankingDetailsPage', tab => tab)}
kycRequirements={KYCRequirementData}
onBack={action('banking details back')}
@@ -374,7 +379,8 @@ storiesOf('Banking/BankingDetailsPage', module)
contact="help@flagtheory.com"
resume={resume}
canOpenBankAccount
- banks={htmlServices}
+ banks={bankingOffers[0].data.accounts}
+ jurisdiction={bankingOffers[0]}
onTabChange={linkTo('Banking/BankingDetailsPage', tab => tab)}
kycRequirements={KYCRequirementData}
onBack={action('banking details back')}
@@ -391,7 +397,8 @@ storiesOf('Banking/BankingDetailsPage', module)
resume={resume}
canOpenBankAccount
country={country}
- jurisdiction={translation}
+ banks={bankingOffers[0].data.accounts}
+ jurisdiction={bankingOffers[0]}
loadCountryAction={action('load country')}
onTabChange={linkTo('Banking/BankingDetailsPage', tab => tab)}
kycRequirements={KYCRequirementData}
diff --git a/stories/corporate-data.js b/stories/corporate-data.js
new file mode 100644
index 000000000..b0963b0ff
--- /dev/null
+++ b/stories/corporate-data.js
@@ -0,0 +1,486 @@
+export const dummyProfile = {
+ entityName: 'Selfkey, LLC',
+ jurisdiction: 'United States',
+ entityType: 'LLC',
+ creationDate: '08/08/2018',
+ address: '1, Amazing Loop, Singapore',
+ did: 'did:selfkey:0x9cb701490ad6112d2880225c1d712f1af8c7dce1a81c44030b321fb31029cd75',
+ allAttributes: []
+};
+export const dummyIncompleteProfile = {
+ entityName: 'Selfkey, LLC',
+ entityType: 'LLC',
+ creationDate: '08/08/2018',
+ did: false,
+ allAttributes: []
+};
+
+export const corporateApplications = [
+ {
+ id: 1,
+ title: 'Incorporation',
+ rpName: 'Flag Theory',
+ currentStatusName: 'pending'
+ },
+ {
+ id: 2,
+ title: 'Banking',
+ rpName: 'Flag Theory',
+ currentStatusName: 'rejected'
+ },
+ {
+ id: 3,
+ title: 'Banking',
+ rpName: 'Bank of China',
+ currentStatusName: 'approved'
+ }
+];
+
+export const dummyMembers = [
+ {
+ id: '1',
+ name: 'Giacomo Guilizzoni',
+ type: 'Person',
+ role: 'Director, Shareholder',
+ citizenship: 'Italy',
+ residency: 'Singapore',
+ shares: '45%'
+ },
+ {
+ id: '2',
+ name: 'Marco Botton Ltd',
+ type: 'Corporate',
+ role: 'Shareholder',
+ citizenship: 'Hong Kong',
+ residency: 'Hong Kong',
+ shares: '9%'
+ },
+ {
+ id: '3',
+ name: 'Big Things Ltd',
+ type: 'Corporate',
+ role: 'Shareholder',
+ citizenship: 'Hong Kong',
+ residency: 'Hong Kong',
+ shares: '41%'
+ },
+ {
+ id: '4',
+ name: 'John Dafoe',
+ type: 'Person',
+ role: 'Director',
+ citizenship: 'France',
+ residency: 'France',
+ shares: '5%'
+ }
+];
+
+export const corporateCapTable = [
+ {
+ type: 'Person',
+ role: 'Director',
+ name: 'John Doe',
+ email: 'john.doe@email.com',
+ citizenship: 'Italy',
+ residency: 'Singapore',
+ shares: 0.5,
+ children: []
+ },
+ {
+ type: 'Corporate',
+ role: 'Shareholder',
+ name: 'ACME Inc',
+ email: null,
+ citizenship: 'Hong Kong',
+ residency: 'Hong Kong',
+ shares: 0.09,
+ children: dummyMembers
+ },
+ {
+ type: 'Corporate',
+ role: 'Shareholder',
+ name: 'Apple Inc',
+ email: null,
+ citizenship: 'U.S.A.',
+ residency: 'U.S.A.',
+ shares: 0.41,
+ children: []
+ }
+];
+
+export const entityTypes = [
+ 'Company Limited by Shares (LTD)',
+ 'Limited Liability Company (LLC)',
+ 'Trust (TST)',
+ 'Foundation (FND)',
+ 'Limited Partnership (LLP)',
+ 'Other'
+];
+
+export const legalJurisdictions = [
+ 'Afghanistan',
+ 'Albania',
+ 'Algeria',
+ 'Andorra',
+ 'Angola',
+ 'Anguilla',
+ 'Antigua and Barbuda',
+ 'Argentina',
+ 'Armenia',
+ 'Aruba',
+ 'Australia',
+ 'Austria',
+ 'Azerbaijan',
+ 'Bahamas',
+ 'Bangladesh',
+ 'Bahrain',
+ 'Barbados',
+ 'Belarus',
+ 'Belgium',
+ 'Belize',
+ 'Benin',
+ 'Bermuda',
+ 'Bhutan',
+ 'Bolivia',
+ 'Bosnia and Herzegovina',
+ 'Botswana',
+ 'Brazil',
+ 'British Virgin Islands',
+ 'Brunei',
+ 'Bulgaria',
+ 'Burkina Faso',
+ 'Burundi',
+ 'Cambodia',
+ 'Cameroon',
+ 'Canada',
+ 'Cape Verde',
+ 'Cayman Islands',
+ 'Central African Republic',
+ 'Chile',
+ "China, People's Republic of Hong Kong",
+ "China, People's Republic of Macau",
+ 'Taiwan',
+ 'Colombia',
+ 'Congo, Democratic Republic of the',
+ 'Congo, Republic of the',
+ 'Cook Islands',
+ 'Costa Rica',
+ "Côte d'Ivoire",
+ 'Croatia',
+ 'Cuba',
+ 'Curaçao',
+ 'Cyprus',
+ 'Czech Republic',
+ 'Denmark',
+ 'Danish Realms - Faroe Islands',
+ 'Danish Realms - Greenland',
+ 'Djibouti',
+ 'Dominica',
+ 'Dominican Republic',
+ 'Ecuador',
+ 'Egypt',
+ 'El Salvador',
+ 'Eritrea',
+ 'Estonia',
+ 'Ethiopia',
+ 'Fiji',
+ 'Finland',
+ 'France',
+ 'Gabon',
+ 'Gambia',
+ 'Georgia',
+ 'Germany',
+ 'Ghana',
+ 'Gibraltar',
+ 'Greece',
+ 'Grenada',
+ 'Guatemala',
+ 'Guernsey, Channel Islands',
+ 'Guinea',
+ 'Guyana',
+ 'Haiti',
+ 'Honduras',
+ 'Hungary',
+ 'Iceland',
+ 'India',
+ 'Indonesia',
+ 'Iran',
+ 'Iraq',
+ 'Ireland',
+ 'Isle of Man',
+ 'Israel',
+ 'Italy',
+ 'Jamaica',
+ 'Japan',
+ 'Jersey, Channel Islands',
+ 'Jordan',
+ 'Kazakhstan',
+ 'Kenya',
+ 'Kiribati',
+ 'Kosovo',
+ 'Kuwait',
+ 'Kyrgyzstan',
+ 'Laos',
+ 'Latvia',
+ 'Lebanon',
+ 'Lesotho',
+ 'Liberia',
+ 'Liechtenstein',
+ 'Lithuania',
+ 'Luxembourg',
+ 'Macedonia',
+ 'Madagascar',
+ 'Malta',
+ 'Malawi',
+ 'Malaysia',
+ 'Maldives',
+ 'Mali',
+ 'Marshall Islands',
+ 'Mauritania',
+ 'Mauritius',
+ 'Mexico',
+ 'Micronesia, Federated States of',
+ 'Moldova',
+ 'Monaco',
+ 'Mongolia',
+ 'Montenegro',
+ 'Montserrat',
+ 'Morocco',
+ 'Mozambique',
+ 'Myanmar',
+ 'Namibia',
+ 'Nauru',
+ 'Nepal',
+ 'Netherlands',
+ 'Caribbean Netherlands - Bonaire',
+ 'Caribbean Netherlands - Sint Eustatius ',
+ 'Caribbean Netherlands - Saba ',
+ 'New Zealand',
+ 'Nicaragua',
+ 'Niger',
+ 'Nigeria',
+ 'Niue',
+ 'Norway',
+ 'Oman',
+ 'Pakistan',
+ 'Palau',
+ 'Palestinian territories',
+ 'Panama',
+ 'Papua New Guinea',
+ 'Paraguay',
+ 'Peru',
+ 'Philippines',
+ 'Poland',
+ 'Portugal',
+ 'Qatar',
+ 'Romania',
+ 'Russian Federation',
+ 'Rwanda',
+ 'Saint Kitts and Nevis',
+ 'Saint Lucia',
+ 'Saint Vincent and the Grenadines',
+ 'Samoa',
+ 'San Marino',
+ 'São Tomé and Príncipe',
+ 'Saudi Arabia',
+ 'Senegal',
+ 'Serbia',
+ 'Seychelles',
+ 'Sierra Leone',
+ 'Singapore',
+ 'Slovakia',
+ 'Slovenia',
+ 'Solomon Islands',
+ 'South Africa',
+ 'South Korea',
+ 'South Sudan',
+ 'Spain',
+ 'Sri Lanka',
+ 'Sint Maarten',
+ 'Sudan',
+ 'Suriname',
+ 'Swaziland',
+ 'Sweden',
+ 'Switzerland',
+ 'Tajikistan',
+ 'Tanzania',
+ 'Thailand',
+ 'Timor-Leste',
+ 'Tonga',
+ 'Togo',
+ 'Tunisia',
+ 'Turkey',
+ 'Turks and Caicos Islands',
+ 'Trinidad & Tobago',
+ 'Uganda',
+ 'Ukraine',
+ 'United Arab Emirates',
+ 'United Kingdom',
+ 'United States - Alabama',
+ 'United States - Alaska',
+ 'United States - Arizona',
+ 'United States - Arkansas',
+ 'United States - California',
+ 'United States - Colorado',
+ 'United States - Connecticut',
+ 'United States - Delaware',
+ 'United States - Florida',
+ 'United States - Georgia',
+ 'United States - Hawaii',
+ 'United States - Idaho',
+ 'United States - Illinois',
+ 'United States - Indiana',
+ 'United States - Iowa',
+ 'United States - Kansas',
+ 'United States - Kentucky',
+ 'United States - Louisiana',
+ 'United States - Maine',
+ 'United States - Maryland',
+ 'United States - Massachusetts',
+ 'United States - Michigan',
+ 'United States - Minnesota',
+ 'United States - Mississippi',
+ 'United States - Missouri',
+ 'United States - Montana',
+ 'United States - Nebraska',
+ 'United States - Nevada',
+ 'United States - New Hampshire',
+ 'United States - New Jersey',
+ 'United States - New Mexico',
+ 'United States - New York',
+ 'Uruguay',
+ 'Uzbekistan',
+ 'Vanuatu',
+ 'Venezuela',
+ 'Vietnam',
+ 'Yemen',
+ 'Zambia',
+ 'Zimbabwe'
+];
+export const corporateAttributes = [
+ {
+ createdAt: 1568107330518,
+ updatedAt: 1568282607094,
+ name: 'Company Name',
+ type: {
+ content: {
+ $id: 'http://platform.selfkey.org/schema/attribute/company-name.json',
+ title: 'Company Name',
+ entityType: ['corporate']
+ }
+ },
+ data: {
+ value: 'ACME Inc'
+ }
+ },
+ {
+ createdAt: 1568107330518,
+ updatedAt: 1568282607094,
+ name: 'Entity Type',
+ type: {
+ content: {
+ $id: 'http://platform.selfkey.org/schema/attribute/legal-entity-type.json',
+ title: 'Entity Type',
+ entityType: ['corporate']
+ }
+ },
+ data: {
+ value: 'LLC'
+ }
+ },
+ {
+ createdAt: 1568107330518,
+ updatedAt: 1568282607094,
+ name: 'Jurisdiction',
+ type: {
+ content: {
+ $id: 'http://platform.selfkey.org/schema/attribute/legal-jurisdiction.json',
+ title: 'Legal Jurisdiction',
+ entityType: ['corporate']
+ }
+ },
+ data: {
+ value: 'Singapore'
+ }
+ },
+ {
+ createdAt: 1568107330518,
+ updatedAt: 1568282607094,
+ name: 'Incorporation Date',
+ type: {
+ content: {
+ $id: 'http://platform.selfkey.org/schema/attribute/incorporation-date.json',
+ title: 'Incorporation Date',
+ entityType: ['corporate']
+ }
+ },
+ data: {
+ value: '17/10/1980'
+ }
+ },
+ {
+ createdAt: 1568107330518,
+ updatedAt: 1568282607094,
+ name: 'Address',
+ type: {
+ content: {
+ $id: 'http://platform.selfkey.org/schema/attribute/physical-address.json',
+ title: 'Address',
+ entityType: ['corporate']
+ }
+ },
+ data: {
+ value: '1, Infinite Loop, California USA'
+ }
+ }
+];
+
+export const corporateDocuments = [
+ {
+ createdAt: 1568107330518,
+ updatedAt: 1568282607094,
+ name: 'Certificate of Incorporation',
+ type: {
+ content: {
+ $id:
+ 'http://platform.selfkey.org/schema/attribute/certificate-of-incorporation.json',
+ title: 'Certificate of Incorporation',
+ entityType: ['corporate']
+ }
+ },
+ documents: [
+ {
+ name: 'certificate.pdf',
+ mimeType: 'application/pdf'
+ }
+ ],
+ data: {
+ value: {
+ expires: 1568282607094
+ }
+ }
+ },
+ {
+ createdAt: 1568107330518,
+ updatedAt: 1568282607094,
+ name: 'Member Register',
+ type: {
+ content: {
+ $id: 'http://platform.selfkey.org/schema/attribute/member-register.json',
+ title: 'Member Register',
+ entityType: ['corporate']
+ }
+ },
+ documents: [
+ {
+ name: 'member_register.doc',
+ mimeType: 'application/msword'
+ }
+ ],
+ data: {
+ value: {
+ expires: 1568107330518
+ }
+ }
+ }
+];
diff --git a/stories/corporate.stories.js b/stories/corporate.stories.js
new file mode 100644
index 000000000..759c21a0e
--- /dev/null
+++ b/stories/corporate.stories.js
@@ -0,0 +1,208 @@
+import React from 'react';
+import { action } from '@storybook/addon-actions';
+import { linkTo } from '@storybook/addon-links';
+import { storiesOf } from '@storybook/react';
+
+import { RegisterDidCard } from '../src/renderer/did/register-did-card';
+
+import { CorporateDashboardPage } from '../src/renderer/corporate/dashboard/dashboard-page';
+import { CorporateDashboardTabs } from '../src/renderer/corporate/dashboard/dashboard-tabs';
+import { CorporateDetails } from '../src/renderer/corporate/common/corporate-details';
+import { CorporateApplicationsSummary } from '../src/renderer/corporate/common/corporate-applications';
+import { CorporateCapTable } from '../src/renderer/corporate/common/corporate-cap-table';
+import { CorporateShareholding } from '../src/renderer/corporate/common/corporate-shareholding';
+import { CorporateOrgChart } from '../src/renderer/corporate/common/corporate-org-chart';
+import { CorporateInformation } from '../src/renderer/corporate/common/corporate-information';
+import { CorporateWizard } from '../src/renderer/corporate/wizard/corporate-wizard';
+import { CorporateAddMember } from '../src/renderer/corporate/member/corporate-add-member';
+import { CorporateDocuments } from '../src/renderer/corporate/common/corporate-documents';
+
+import {
+ dummyProfile,
+ dummyIncompleteProfile,
+ corporateApplications,
+ corporateCapTable,
+ dummyMembers,
+ entityTypes,
+ legalJurisdictions,
+ corporateAttributes,
+ corporateDocuments
+} from './corporate-data';
+
+storiesOf('Corporate', module).add('Dashboard', () => (
+ tab)}
+ />
+ ))
+ .add('overview', () => (
+ tab)}
+ />
+ ))
+ .add('overview with incomplete profile', () => (
+ tab)}
+ attributes={corporateAttributes}
+ onEditAttribute={action('on edit attribute')}
+ onDeleteAttribute={action('on delete attribute')}
+ onAddAttribute={action('on add attribute')}
+ documents={corporateDocuments}
+ onAddDocument={action('on add document')}
+ onEditDocument={action('on edit document')}
+ onDeleteDocument={action('on delete document')}
+ />
+ ))
+ .add('members', () => (
+ tab)}
+ />
+ ))
+ .add('applications', () => (
+ tab)}
+ />
+ ))
+ .add('history', () => (
+ tab)}
+ />
+ ));
+
+storiesOf('Corporate/Components', module)
+ .add('Company', () => (
+ action(`field change ${name}:`)}
+ />
+ ))
+ .add('field error', () => (
+ action(`field change ${name}:`)}
+ />
+ ));
+
+storiesOf('Corporate', module).add('Add Member', () => test component} />)
+ .add('SelfkeyIdApplications', () => (
+ () => action(`profile switch ${identity.id}`)}
+ onCreateCorporateProfileClick={action('onCreateCorporateProfileClick')}
+ />
+ ))
+ .add('SidebarOpen', () => (
+ () => action(`profile switch ${identity.id}`)}
+ onCreateCorporateProfileClick={action('onCreateCorporateProfileClick')}
+ />
+ ))
+ .add('ProfileOpen', () => (
+ () => action(`profile switch ${identity.id}`)}
+ onCreateCorporateProfileClick={action('onCreateCorporateProfileClick')}
+ />
+ ));
+
+storiesOf('Sidebars', module).add('CORP Sidebar Switch Account', () => (
+
{sideList}
diff --git a/src/renderer/wallet/main/toolbar-container.jsx b/src/renderer/wallet/main/toolbar-container.jsx
new file mode 100644
index 000000000..483081318
--- /dev/null
+++ b/src/renderer/wallet/main/toolbar-container.jsx
@@ -0,0 +1,80 @@
+import React, { Component } from 'react';
+import Toolbar from './toolbar';
+import config from 'common/config';
+import { connect } from 'react-redux';
+import { identitySelectors, identityOperations } from 'common/identity';
+import { walletSelectors } from 'common/wallet';
+import { push } from 'connected-react-router';
+import { featureIsEnabled } from 'common/feature-flags';
+
+class ToolbarContainer extends Component {
+ state = {
+ isSidebarOpen: false,
+ isProfileOpen: false
+ };
+
+ toggleDrawer = isSidebarOpen => {
+ this.setState({
+ isSidebarOpen
+ });
+ };
+
+ closeProfile = isProfileOpen => {
+ this.setState({
+ isProfileOpen: false
+ });
+ };
+
+ toggleProfile = isProfileOpen => {
+ this.setState({
+ isProfileOpen
+ });
+ };
+
+ createCorporateProfile = evt => {
+ this.toggleProfile(!this.state.isProfileOpen);
+ this.props.dispatch(push('/main/create-corporate-profile'));
+ };
+
+ handleProfileSelect = identity => evt => {
+ evt.preventDefault();
+ this.toggleProfile(!this.state.isProfileOpen);
+ this.props.dispatch(identityOperations.switchProfileOperation(identity));
+ };
+
+ handleProfileNavigate = evt => {
+ evt.preventDefault();
+ this.props.dispatch(identityOperations.navigateToProfileOperation());
+ };
+
+ handleProfileClick = evt => {
+ evt && evt.stopPropagation();
+ this.toggleProfile(!this.state.isProfileOpen);
+ };
+ render() {
+ const { isProfileOpen, isSidebarOpen } = this.state;
+ return (
+
+ {profiles &&
+ profiles
+ .filter(el => el.id !== selectedProfile.id)
+ .map((el, index) => (
+
+
+ {el.type === 'corporate' ? (
+
+
+
+ {el.name ||
+ defaultIdentityName(el, wallet.profileName)}
+
+
+ {`${el.type.charAt(0).toUpperCase() +
+ el.type.slice(1)} Profile`}
+
+
+
+ ))}
+ {showCorporate && (
+
+
+
+
+ {/*
+
+
+
+ */}
+
+
+
+
+
+
+ )}
+
+
-
-
-
-
-
+ onToggleMenu(!isSidebarOpen)}
+ />
+
-
-
-
-
+
+
+
-
-
- this.toggleDrawer(true)}
+
+
+
+
+
+
);
}
diff --git a/src/renderer/wallet/unlock/existing-address.jsx b/src/renderer/wallet/unlock/existing-address.jsx
index 1012c1cea..a72f48aff 100644
--- a/src/renderer/wallet/unlock/existing-address.jsx
+++ b/src/renderer/wallet/unlock/existing-address.jsx
@@ -121,8 +121,8 @@ class ExistingAddress extends Component {
{wallets.map((wallet, index) => (
))}
diff --git a/stories/attribute.stories.js b/stories/attribute.stories.js
new file mode 100644
index 000000000..740a9ccc0
--- /dev/null
+++ b/stories/attribute.stories.js
@@ -0,0 +1,56 @@
+import React from 'react';
+import { action } from '@storybook/addon-actions';
+import { storiesOf } from '@storybook/react';
+import { CreateAttribute } from '../src/renderer/attributes/create-attribute';
+import { EditAttribute } from '../src/renderer/attributes/edit-attribute';
+import { DeleteAttribute } from '../src/renderer/attributes/delete-attribute';
+
+storiesOf('Attributes/CreateAttribute', module).add('default', () => (
+ - \n
- \n
- \n
Singapore is one of the largest financial centers and a top offshore banking destination due to its political and financial stability, its top-notch corporate banking facilities and its broad-range of wealth management services, investment funds, and insurance products.
\n\nIn addition, Singapore is one of the most reputed international financial centers whose banks consistently onboard companies incorporated in tax-neutral jurisdictions.
\n\nHowever, banks will want to see a solid and legitimate business backing the company. Offshore companies will need to provide enough supporting business documentation such as business plans, invoices, contracts, letters of intent, etc., to satisfy the bank’s compliance requirements.
\n\nSingapore banks are ideal for businesses that require strong transactional banking and cash management services. Companies banking in Singapore have access to some of the quickest and most affordable money transfer services worldwide.
\n\nImport/Export companies will have access to top trade finance services such as Letter of Credit and Bank guarantees.
\n\nSingaporean banks are considerably risk-averse and are not open for companies engaging in high-risk business activities.
\n\nFor Singaporean e-commerce businesses, a broad range of merchant accounts and credit card processing aggregators are available.
\n\nAn oasis of financial stability together with the most technologically-advanced private banking facilities, excellent customer service and a capital gains tax-free environment makes Singapore the top Asia-Pacific destination for international wealth management services.
', + jurisdiction: { + bankingDescription: + "Singapore is the third world’s major financial center and a top offshore banking destination due to its political and financial stability, its top-notch corporate banking facilities and its broad-range of private banking services, investment funds and insurance.
\nIn addition, Singapore is one of the most reputed international financial centers whose banks consistently onboard companies incorporated in tax-neutral jurisdictions.
\nHowever, banks will want to see a solid and legit business backing the company. Offshore companies will need to provide enough supporting business documentation such as business plans, invoices, contracts, letters of intent, etc. to satisfy the bank's compliance requirements.
\nSingapore banks are ideal for businesses that require strong transactional banking and cash management services. Companies banking in Singapore have access to some of the quickest and most affordable money transfer services.
\nImport/Export companies will have access to top trade finance services such as Letter of Credit and Bank guarantees.
\nSingaporean banks are considerably risk-averse and are not open for companies engaging in high-risk business activities.
\nFor Singaporean e-commerce businesses, a broad range of merchant accounts and credit card processing aggregators are available.
\nAn oasis of financial stability together with the most technology advanced private banking facilities, an excellent customer service and a capital gains tax-free environment makes Singapore the top Asia-Pacific destination for international wealth management services.
", + businessAccounts: [ + 'Offshore Company', + 'Regional Company', + 'Resident Company', + 'Nonresident Onshore Company' + ], + countryCode: 'SG', + countryDetails: + 'The Republic of Singapore, also known as Lion City or the Little Red Dot, is an island city-state of Asia, made up of a main island and other sixty-two islets, and founding member of the ASEAN.
\nIt is located to the south of the State of Johor in the peninsula of Malaysia and to the north of the islands Riau of Indonesia, separated of these by Strait of Singapore. Its population is about 5.5 million, of which about 75 percent are Chinese, and the rest are Malay, Indian or Eurasian minorities. This multiculturalism diversity is reflected in the four official languages of the country, English, Chinese, Malay and Tamil. Its official currency is the Singapore Dollar (SGD), which is also accepted as customary tender in Brunei. Alike, the Brunei Dollar (BND) is customarily accepted in Singapore.
\nSingapore is a unitary multiparty parliamentary republic, with a Westminster system of unicameral parliamentary government.
\nSingapore is one of the main global cities and one of the hubs of world trade, third-largest oil refining and trading centre, third largest financial center and one of the largest freight port worldwide. Singapore is the third country with the highest per capita income worldwide, in terms of purchasing power parity, as well as being among the first countries on the international lists of education, with one of the highest skilled workforce worldwide, health, political transparency and economic competitiveness.
\nIts globalized and diversified economy depends especially on international trade, refining imported raw goods to reexport, and an export-oriented manufacturing sector, mainly chemistry, oil refining, being one of the top three export refining centers in the world, mechanical engineering, biotechnology and biomedical sciences. Singapore has one of the seaports that handles the largest annual cargo volume worldwide, both in tonnage and in the number of containers.
\nThe country is also an important international financial hub, leading world’s private banking sector, offering top-notch corporate banking facilities and a broad-range of banking services, investment funds and insurance services, among others. It also has the fourth largest currency exchange and capital market worldwide, behind New York, London and Tokyo.
\nAll supported by an investor and entrepreneurship friendly tax policy. With a territorial tax system, a low tax burden and the availability of several tax breaks and incentives for startups and technological innovation.
\nSingapore welcomes thousands of foreign investors, expats entrepreneurs and multinational companies’ employees. Singapore’s immigration policy is geared towards attracting foreign talent, with several visa schemes to attract high-skilled foreign employees, entrepreneurs and investors.
', + countryName: 'Singapore', + goodFor: [ + 'Offshore Companies', + 'Transactional Banking', + 'Credit Card Processing', + 'Payment Processors', + 'Private Banking', + 'Trade Finance', + 'Credit Cards' + ], + minDeposit: ['Medium'], + payments: [ + 'PayPal', + 'Amazon Payouts', + 'Merchant Accounts', + 'Stripe', + 'Onshore CC Aggregator', + 'Prepaid / Credit Cards' + ], + personalAccounts: ['Regional'], + remote: ['In-Person'], + showApp: true, + wealthManagement: ['International'] + }, + minDeposit: 'USD 1,000.00', + personalVisitRequired: false, + price: '1750', + priceOptions: '- Corporate Bank Account (1750)', + region: 'Singapore', + shop: 'https://flagtheory.com/product/singaporean-bank-account/', + showApp: true, + showWallet: true, + templateId: '5d09d11c26f7be563f7e0650', + testDidAddress: '0xee10a3335f48e10b444e299cf017d57879109c1e32cec3e31103ceca7718d0ec', + testPrice: '0.25', + testTemplateId: '5d09d11c26f7be563f7e0650', + testWalletAddress: '0x23d233933c86f93b74705cf0d236b39f474249f8', + type: 'business', + walletAddress: '0x6ce3bdd91d3b9f55ec206970e75701043fba751d', + walletDescription: + 'Our banking support service is not just a mere introduction to the bank. We assist you in filling out the business questionnaires appropriately and help you understand and provide business details, commercial information and purpose/use of the bank account that a given bank wants to know in order to approve your account application. Banks want certainty and clarity on how the account will be used. Everything must be watertight. We will work with you to make sure there is minimal ‘back and forth’ and a smooth account opening process.
\n\nOur banking support services include introductions to payment processors and merchant accounts to better support our e-commerce clients. Whether you just need standard credit card processing or specialized services for high-risk processing, we are happy to help you with introductions that can empower your business.
\n\n\nBank Account opening requirements are subject to change at the discretion of the bank. There might be additional fees charged by the bank itself. Bank account opening is not guaranteed and is subject to the bank policies and compliance department. There might be restrictions on UBO nationalities, business activities and/or jurisdictions. A refund is guaranteed if the account is not successfully opened, but a 15% administrative fee applies.
' + }, + description: '', + env: 'development', + id: 318, + name: 'Singapore SG1b', + parentSku: null, + price: '0.25', + priceCurrency: 'USD', + sku: 'FT-BNK-SG1b', + status: 'active', + updatedAt: 1565097777686, + vendorId: 'flagtheory_banking' }, { - id: 15, - countryCode: 'kn', - region: 'Nevis', - eligibility: ['Resident Individuals', 'Regional Individuals', 'International Individuals'], - eligibilityExpanded: - 'Resident Individuals, Regional Individuals, International Individuals', - minInitialDeposit: 800, - minInitialDepositCurrency: 'USD', - goodFor: ['Transactional Banking', 'Multi-currency Cards'], - personalVisitRequired: false, - price: 200, - accountType: 'private', - currencies: ['USD, SGD, CAD'], - cards: ['Mastercard, Visa'], - timeToOpen: '1 Month', - onlineBanking: ['Internet Home Banking'] + category: 'banking', + createdAt: 1564997439862, + data: { + accounts: { + HK2bA: { + accountCode: 'HK2b', + accountTitle: 'Personal Savings Account', + bankCode: 'HK2bA', + bankName: 'Bank Of China (Hong Kong)', + cards: ['UnionPay Debit (HKD)', 'UnionPay Debit (CNY)'], + countryCode: 'HK', + countryName: 'Hong Kong', + currencies: ['HKD', 'USD', 'Multi-currency'], + eligibility: 'International Individuals (A connection with HK is a must)', + minAverageBalanceDescription: 'HKD 10,000.00', + minInitialDeposit: 'HKD 10,000.00', + minMonthlyBalance: 'HKD 10,000.00', + onboarding: + '- \n
Hong Kong is the largest financial hub in Asia and one of the safest and more convenient places to bank. Hong Kong banks are some of the most solvent and liquid banks worldwide.
\nThere are no exchange controls and accounts are available in multiple currencies, in addition to a large variety of investment and insurance products.
\nHong Kong banks are ideal for both individuals and businesses that require strong cash management services in various currencies and that have strong investment needs.
\nHong Kong is also the gateway to one of the largest and fastest-growing markets worldwide: China. Hong Kong banks offer RMB accounts and payment cards.
\nImport/Export companies will have access to top trade finance services such as Letter of Credit and Bank guarantees.
\nHong Kong online businesses with HK bank accounts also have access to a broad range of merchant accounts and credit card processing aggregators.
\nHong Kong banks are also available for companies incorporated in tax-neutral jurisdictions. However, banks will want to see a solid business background, and a relatively low-risk commercial activity to onboard an offshore company.
\nOffshore companies will need to provide enough supporting business documentation such as business plans, invoices, contracts, letters of intent, etc., to satisfy the bank’s compliance requirements.
\nAll in all, Hong Kong is a perfect banking location for local and international businesses, companies doing business in China and individuals looking for strong wealth management and investment services.
', + jurisdiction: { + businessAccounts: [ + 'Offshore Company', + 'Nonresident Onshore Company', + 'Resident Company', + 'Regional Company' + ], + countryCode: 'HK', + countryDetails: + 'Hong Kong is a Special Administrative Region of the People’s Republic of China (Hong Kong SAR). Its official languages are English and Cantonese.
\nAlthough it is part of the People’s Republic of China, the region maintains an independent economic, administrative and judicial system, and even its own currency, system of customs and external borders. Its official legal tender currency is the Hong Kong Dollar (HKD), pegged to the USD, which is the ninth most traded currency worldwide.
\nThe legislative council is the Hong Kong Parliament, which is formed by 60-members, half elected by universal suffrage in geographical circumscriptions, while the other 30 are elected by groups of representatives from different economic and social sectors.
\nIts public finances are characterized by its sustainability, with no public net debt, continuous government surplus and ample foreign exchange reserves, all supported by rigorous anti-corruption measures.
\nHong Kong’s economy is mainly based on financial services, tourism, wholesale and retail trade, and international trade, especially trade between China and the rest of the world. Hong Kong is one of the world’s major financial hub, ranking eleventh worldwide in volume of banking operations and the Hong Kong Stock Exchange being the second largest capital market in Asia, after the Tokyo Stock Exchange.
', + countryName: 'Hong Kong', + goodFor: [ + 'Transactional Banking', + 'Credit Card Processing', + 'Payment Processors', + 'Private Banking', + 'Trade Finance' + ], + minDeposit: ['Low'], + payments: [ + 'PayPal', + 'Amazon Payouts', + 'Merchant Accounts', + 'Stripe', + 'Onshore CC Aggregator', + 'Prepaid / Credit Cards' + ], + personalAccounts: ['International'], + remote: ['In-Person'], + showApp: true, + wealthManagement: ['International'] + }, + HK1bE: { + accountCode: 'HK1b', + accountTitle: 'Business Account', + bankCode: 'HK1bE', + bankName: 'Bank Of China (Hong Kong)', + cards: [ + 'UnionPay Debit (HKD)', + 'UnionPay Debit (CNY)', + 'Mastercard Credit Card (USD)', + 'Visa Credit (USD)' + ], + countryCode: 'HK', + countryName: 'Hong Kong', + currencies: ['HKD', 'USD', 'Multi-currency'], + details: + 'Any foreign business should have a Hong Kong business address (lease-agreement) in order to open an account. We can provide a Hong Kong business address for HKD 15,000 per annum. A Business connection with the region is required – via suppliers, client or company office, directors’ residency, or any other.
\nCompanies incorporated in tax-neutral jurisdictions (such as BVI, Cayman Islands, etc..) are eligible as long as they have a commercial activity and do business in Asia.
\nForeign companies engaging in high-risk businesses and/or conducting an activity which is regulated in Hong Kong (such as Money transmitter or Forex trading) are not eligible.
\nThere are no requirements in terms of business turnover or business size.
', + eligibility: 'Hong Kong Companies', + minAverageBalanceDescription: 'HKD 10,000.00', + minInitialDeposit: 'HKD 10,000.00', + minMonthlyBalance: 'HKD 10,000.00', + onboarding: + '- \n
- \n
Our banking support service is not just a mere introduction to the bank. We assist you in filling out the business questionnaires appropriately and help you understand and provide business details, commercial information and purpose/use of the bank account that a given bank wants to know in order to approve your account application. Banks want certainty and clarity on how the account will be used. Everything must be watertight. We will work with you to make sure there is minimal ‘back and forth’ and a smooth account opening process.
\n\nOur banking support services include introductions to payment processors and merchant accounts to better support our e-commerce clients. Whether you just need standard credit card processing or specialized services for high-risk processing, we are happy to help you with introductions that can empower your business.
\n\n\nBank Account opening requirements are subject to change at the discretion of the bank. There might be additional fees charged by the bank itself. Bank account opening is not guaranteed and is subject to the bank policies and compliance department. There might be restrictions on UBO nationalities, business activities and/or jurisdictions. A refund is guaranteed if the account is not successfully opened, but a 15% administrative fee applies.
' + }, + description: '', + env: 'development', + id: 321, + name: 'Hong Kong HK2b', + parentSku: null, + price: '0.25', + priceCurrency: 'USD', + sku: 'FT-BNK-HK2b', + status: 'active', + updatedAt: 1565097777686, + vendorId: 'flagtheory_banking' } ]; @@ -309,20 +402,3 @@ export const country = { currencyCode: 'USD', population: 20100001 }; - -export const translation = { - introText: - 'Banking description here
cool
',
- countryDetails:
- 'cool
Country Details here
cool country details
',
- introduction: 'cool country details
Description here
cool introduction
'
-};
-
-export const htmlServices = [
- { onboarding: "cool introduction
Services text
here
" }
-];
-
-export const accountType = {
- accountType: 'business',
- goodFor: ['International Companies', 'Offshore Companies', 'e-Commerce']
-};
diff --git a/stories/banking.stories.js b/stories/banking.stories.js
index 57c465db0..0cd319226 100644
--- a/stories/banking.stories.js
+++ b/stories/banking.stories.js
@@ -2,14 +2,7 @@ import React from 'react';
import { action } from '@storybook/addon-actions';
import { linkTo } from '@storybook/addon-links';
import { storiesOf } from '@storybook/react';
-import {
- resume,
- country,
- translation,
- bankingOffers,
- htmlServices,
- accountType
-} from './banking-data';
+import { resume, country, bankingOffers } from './banking-data';
import KYCRequirementData from './kyc-requirements-data';
import BankingOffersTable from '../src/renderer/marketplace/bank-accounts/list/offers-table';
import BankingAccountTypeTabs from '../src/renderer/marketplace/bank-accounts/list/account-type-tabs';
@@ -36,7 +29,7 @@ storiesOf('Banking', module)
here
+
+));
+
+storiesOf('Corporate/Dashboard Tabs', module)
+ .add('default', () => (
+
+
+ ))
+ .add('Company with missing attributes', () => (
+
+
+ ))
+ .add('Corporate Applications', () => (
+
+
+ ))
+ .add('Corporate Cap Table', () => (
+
+
+ ))
+ .add('Corporate Shareholding', () => (
+
+
+ ))
+ .add('Corporate Org Chart', () => (
+
+
+ ))
+ .add('Corporate Informations', () => (
+
+
+ ))
+ .add('Corporate Documents', () => (
+
+
+ ));
+
+storiesOf('Corporate/Wizard', module)
+ .add('default', () => (
+