Merge branch 'master' into edge-support

1 files changed, 33 insertions, 0 deletions

diff --git a/ui/app/account-and-transaction-details.js b/ui/app/account-and-transaction-details.js
new file mode 100644
index 000000000..03101d37a
--- /dev/null
+++ b/ui/app/account-and-transaction-details.js
@@ -0,0 +1,33 @@
+const Component = require('react').Component
+const h = require('react-hyperscript')
+const inherits = require('util').inherits
+// Main Views
+const TxView = require('./components/tx-view')
+const WalletView = require('./components/wallet-view')
+
+module.exports = AccountAndTransactionDetails
+
+inherits(AccountAndTransactionDetails, Component)
+function AccountAndTransactionDetails () {
+  Component.call(this)
+}
+
+AccountAndTransactionDetails.prototype.render = function () {
+  return h('div.account-and-transaction-details', [
+    // wallet
+    h(WalletView, {
+      style: {
+      },
+      responsiveDisplayClassname: '.lap-visible',
+    }, [
+    ]),
+
+    // transaction
+    h(TxView, {
+      style: {
+      },
+    }, [
+    ]),
+  ])
+}
+