From 803eaaf968161f16aaf72d59b979dfbb7fb9b352 Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Fri, 13 Oct 2017 16:19:22 -0400 Subject: [NewUI] SendV2-#8: Send container handles tokens; gas info dynamic from state (#2364) * Adds memo field to send-v2. * Vertical align transaction with flexbox. * Customize Gas UI * Remove internal state from InputNumber and fix use in gastooltip. * Move customize-gas-modal to its own folder and minor cleanup * Create send container, get account info from state, and make currency display more reusable * Adjusts send-v2 and container for send-token. Dynamically getting suggested gas prices. --- ui/app/app.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'ui/app/app.js') diff --git a/ui/app/app.js b/ui/app/app.js index 92fc5e697..08d24d86c 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -10,7 +10,7 @@ const NewKeyChainScreen = require('./new-keychain') // accounts const MainContainer = require('./main-container') const SendTransactionScreen = require('./send') -const SendTransactionScreen2 = require('./send-v2.js') +const SendTransactionScreen2 = require('./components/send/send-v2-container') const SendTokenScreen = require('./components/send-token') const ConfirmTxScreen = require('./conf-tx') // notice @@ -356,7 +356,12 @@ App.prototype.renderPrimary = function () { case 'sendToken': log.debug('rendering send token screen') - return h(SendTokenScreen, {key: 'sendToken'}) + + const SendTokenComponentToRender = checkFeatureToggle('send-v2') + ? SendTransactionScreen2 + : SendTokenScreen + + return h(SendTokenComponentToRender, {key: 'sendToken'}) case 'newKeychain': log.debug('rendering new keychain screen') -- cgit v1.2.3