From 39938750732cc4a218c59d3be8551461c1701067 Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Fri, 26 Apr 2019 17:21:39 +0200 Subject: [PATCH 1/3] added basic transactions skeleton and pages with routing --- public/data/appConfig.json | 2 +- src/support/routes.js | 5 +++ .../components/TopNavigationAccount/index.js | 10 +++++ .../TopNavigationAccount/index.messages.js | 5 +++ .../Account/Transactions/bitcoin/index.js | 13 +++++++ .../Account/Transactions/ethereum/index.js | 13 +++++++ .../views/Account/Transactions/index.js | 38 +++++++++++++++++++ .../Account/Transactions/ripple/index.js | 13 +++++++ src/views/index.js | 5 +++ 9 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 src/views/Wallet/views/Account/Transactions/bitcoin/index.js create mode 100644 src/views/Wallet/views/Account/Transactions/ethereum/index.js create mode 100644 src/views/Wallet/views/Account/Transactions/index.js create mode 100644 src/views/Wallet/views/Account/Transactions/ripple/index.js diff --git a/public/data/appConfig.json b/public/data/appConfig.json index 2520b4cb..60721342 100644 --- a/public/data/appConfig.json +++ b/public/data/appConfig.json @@ -149,7 +149,7 @@ "url": "https://api.coingecko.com/api/v3/coins/ripple" } ], - + "transactions": true, "supportedBrowsers": { "chrome": { "version": 59, diff --git a/src/support/routes.js b/src/support/routes.js index 77f84172..e57d4160 100644 --- a/src/support/routes.js +++ b/src/support/routes.js @@ -77,6 +77,11 @@ export const routes: Array = [ pattern: '/device/:device', fields: ['device'], }, + { + name: 'wallet-account-transactions', + pattern: '/device/:device/network/:network/account/:account/transactions', + fields: ['device', 'network', 'account', 'transactions'], + }, { name: 'wallet-account-summary', pattern: '/device/:device/network/:network/account/:account', diff --git a/src/views/Wallet/components/TopNavigationAccount/index.js b/src/views/Wallet/components/TopNavigationAccount/index.js index b092c67b..df7263dc 100644 --- a/src/views/Wallet/components/TopNavigationAccount/index.js +++ b/src/views/Wallet/components/TopNavigationAccount/index.js @@ -109,6 +109,16 @@ class TopNavigationAccount extends React.PureComponent { + {config.transactions && ( + + + + + + )} diff --git a/src/views/Wallet/components/TopNavigationAccount/index.messages.js b/src/views/Wallet/components/TopNavigationAccount/index.messages.js index 17b909fa..85f8de65 100644 --- a/src/views/Wallet/components/TopNavigationAccount/index.messages.js +++ b/src/views/Wallet/components/TopNavigationAccount/index.messages.js @@ -3,6 +3,11 @@ import { defineMessages } from 'react-intl'; import type { Messages } from 'flowtype/npm/react-intl'; const definedMessages: Messages = defineMessages({ + TR_NAV_TRANSACTIONS: { + id: 'TR_NAV_TRANSACTIONS', + defaultMessage: 'Transactions', + description: 'Title of the navigation tab that contains tx history.', + }, TR_NAV_SUMMARY: { id: 'TR_NAV_SUMMARY', defaultMessage: 'Summary', diff --git a/src/views/Wallet/views/Account/Transactions/bitcoin/index.js b/src/views/Wallet/views/Account/Transactions/bitcoin/index.js new file mode 100644 index 00000000..c4bea72d --- /dev/null +++ b/src/views/Wallet/views/Account/Transactions/bitcoin/index.js @@ -0,0 +1,13 @@ +import React from 'react'; +import Title from 'views/Wallet/components/Title'; +import Content from 'views/Wallet/components/Content'; + +const BitcoinTransactions = () => { + return ( + + Bitcoin Transactions + + ); +}; + +export default BitcoinTransactions; diff --git a/src/views/Wallet/views/Account/Transactions/ethereum/index.js b/src/views/Wallet/views/Account/Transactions/ethereum/index.js new file mode 100644 index 00000000..4a98a978 --- /dev/null +++ b/src/views/Wallet/views/Account/Transactions/ethereum/index.js @@ -0,0 +1,13 @@ +import React from 'react'; +import Title from 'views/Wallet/components/Title'; +import Content from 'views/Wallet/components/Content'; + +const EthereumTransactions = () => { + return ( + + Ethereum Transactions + + ); +}; + +export default EthereumTransactions; diff --git a/src/views/Wallet/views/Account/Transactions/index.js b/src/views/Wallet/views/Account/Transactions/index.js new file mode 100644 index 00000000..dd301b36 --- /dev/null +++ b/src/views/Wallet/views/Account/Transactions/index.js @@ -0,0 +1,38 @@ +/* @flow */ +import React from 'react'; +import { connect } from 'react-redux'; + +import type { State } from 'flowtype'; + +import EthereumTransactions from './ethereum'; +import RippleTransactions from './ripple'; +import BitcoinTransactions from './bitcoin'; + +export type BaseProps = {| + selectedAccount: $ElementType, + localStorage: $ElementType, +|}; + +export default connect( + (state: State): BaseProps => ({ + selectedAccount: state.selectedAccount, + localStorage: state.localStorage, + }), + null +)((props: BaseProps) => { + const { config } = props.localStorage; + if (!config.transactions) return null; // turn off by feature tag + const { network } = props.selectedAccount; + if (!network || !config) return null; + + switch (network.type) { + case 'ethereum': + return ; + case 'ripple': + return ; + case 'bitcoin': + return ; + default: + return null; + } +}); diff --git a/src/views/Wallet/views/Account/Transactions/ripple/index.js b/src/views/Wallet/views/Account/Transactions/ripple/index.js new file mode 100644 index 00000000..9146f477 --- /dev/null +++ b/src/views/Wallet/views/Account/Transactions/ripple/index.js @@ -0,0 +1,13 @@ +import React from 'react'; +import Title from 'views/Wallet/components/Title'; +import Content from 'views/Wallet/components/Content'; + +const RippleTransactions = () => { + return ( + + Ripple Transactions + + ); +}; + +export default RippleTransactions; diff --git a/src/views/index.js b/src/views/index.js index c8191b6b..db5444a0 100644 --- a/src/views/index.js +++ b/src/views/index.js @@ -18,6 +18,7 @@ import InstallBridge from 'views/Landing/views/InstallBridge/Container'; // wallet views import WalletContainer from 'views/Wallet'; import AccountSummary from 'views/Wallet/views/Account/Summary'; +import AccountTransactions from 'views/Wallet/views/Account/Transactions'; import AccountSend from 'views/Wallet/views/Account/Send'; import AccountReceive from 'views/Wallet/views/Account/Receive'; import AccountSignVerify from 'views/Wallet/views/Account/SignVerify/Container'; @@ -109,6 +110,10 @@ const App = () => ( path={getPattern('wallet-account-summary')} component={AccountSummary} /> + Date: Fri, 26 Apr 2019 17:46:19 +0200 Subject: [PATCH 2/3] add dev connect with tx history --- src/actions/TrezorConnectActions.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/actions/TrezorConnectActions.js b/src/actions/TrezorConnectActions.js index 0b5ce5f2..cecf500d 100644 --- a/src/actions/TrezorConnectActions.js +++ b/src/actions/TrezorConnectActions.js @@ -154,10 +154,12 @@ export const init = (): AsyncAction => async ( if (buildUtils.isDev()) { // eslint-disable-next-line - window.__TREZOR_CONNECT_SRC = - typeof LOCAL === 'string' ? LOCAL : 'https://sisyfos.trezor.io/connect/'; // eslint-disable-line no-underscore-dangle - // window.__TREZOR_CONNECT_SRC = typeof LOCAL === 'string' ? LOCAL : 'https://localhost:8088/'; // eslint-disable-line no-underscore-dangle + window.__TREZOR_CONNECT_SRC = typeof LOCAL === 'string' + ? LOCAL + : 'https://connect.sldev.cz/feature/eth-ripple-get-account-info/'; // eslint-disable-line no-underscore-dangle window.TrezorConnect = TrezorConnect; + // typeof LOCAL === 'string' ? LOCAL : 'https://sisyfos.trezor.io/connect/'; // eslint-disable-line no-underscore-dangle + // window.__TREZOR_CONNECT_SRC = typeof LOCAL === 'string' ? LOCAL : 'https://localhost:8088/'; // eslint-disable-line no-underscore-dangle } try { From 5f1adbde21d89e39985314aef358e23c3c3617d0 Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Wed, 22 May 2019 15:01:37 +0200 Subject: [PATCH 3/3] turn off transaction to be able merge --- public/data/appConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/data/appConfig.json b/public/data/appConfig.json index 60721342..7f23c006 100644 --- a/public/data/appConfig.json +++ b/public/data/appConfig.json @@ -149,7 +149,7 @@ "url": "https://api.coingecko.com/api/v3/coins/ripple" } ], - "transactions": true, + "transactions": false, "supportedBrowsers": { "chrome": { "version": 59,