From 752d16f6c072b0dd54eb245209881a25ff06cb8e Mon Sep 17 00:00:00 2001 From: Frankie Date: Thu, 18 Aug 2016 10:40:35 -0700 Subject: WIP: ShapeShift tx --- ui/app/reducers/app.js | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'ui/app/reducers/app.js') diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index 95b60f929..63804d478 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -476,7 +476,21 @@ function reduceApp (state, action) { data: action.value.data, }, }) - default: + + case actions.SHOW_QR_VIEW: + return extend(appState, { + currentView: { + name: 'qr', + context: appState.currentView.context, + }, + transForward: true, + Qr: { + message: action.value.message, + image: action.value.qr, + data: action.value.data, + }, + }) + default: return appState } } -- cgit From 3525dc080110e7af1f9544e18b5646c87fb9ae95 Mon Sep 17 00:00:00 2001 From: Frankie Date: Thu, 18 Aug 2016 15:20:26 -0700 Subject: Create a ShapeShift tx in tx History --- ui/app/reducers/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ui/app/reducers/app.js') diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index 63804d478..8c2696877 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -490,7 +490,7 @@ function reduceApp (state, action) { data: action.value.data, }, }) - default: + default: return appState } } -- cgit