From 354134b15443a472552be3abe0ee158369828048 Mon Sep 17 00:00:00 2001
From: Noelle Daley <adriannenoelle@gmail.com>
Date: Fri, 27 Mar 2020 16:24:39 -0700
Subject: [PATCH 1/3] show OTP if there is one, otherwise show placeholder

---
 ui/app/templates/components/shamir-flow.hbs | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/ui/app/templates/components/shamir-flow.hbs b/ui/app/templates/components/shamir-flow.hbs
index d5d9065ab56f..539074b2d1b6 100644
--- a/ui/app/templates/components/shamir-flow.hbs
+++ b/ui/app/templates/components/shamir-flow.hbs
@@ -4,11 +4,7 @@
       <HoverCopyButton @copyValue={{encoded_token}} />
       <div class="message-body">
         <h4 class="title is-7 is-marginless">
-          {{#if otp}}
-            Encoded Operation Token
-          {{else}}
-            Encrypted Operation Token
-          {{/if}}
+          Encoded Operation Token
         </h4>
         <code class="is-word-break">{{encoded_token}}</code>
       </div>
@@ -23,10 +19,10 @@
           <code class="is-word-break">{{otp}}</code>
         </div>
       </div>
+    {{/if}}
       <div class="message is-list has-copy-button" tabindex="-1">
-        {{#let
-            (concat 'vault operator generate-root -dr-token -otp="' otp '" -decode="' encoded_token '"')
-        as |cmd|}}
+        {{#with (if otp
+          (concat 'vault operator generate-root -otp="' otp '" -decode="' encoded_token '"') (concat 'vault operator generate-root -otp="<enter your otp here>" -decode="' encoded_token '"') ) as |cmd|}}
           <HoverCopyButton @copyValue={{cmd}} />
           <div class="message-body">
             <h4 class="title is-7 is-marginless">
@@ -34,9 +30,8 @@
             </h4>
             <code class="is-word-break">{{cmd}}</code>
           </div>
-        {{/let}}
+        {{/with}}
       </div>
-    {{/if}}
   </div>
   <div class="box is-marginless is-shadowless">
     <button type="button" class="button" {{action 'reset'}}>

From f619412ebad9fb8589ab1382f5049318796a4f53 Mon Sep 17 00:00:00 2001
From: Noelle Daley <adriannenoelle@gmail.com>
Date: Fri, 27 Mar 2020 16:56:07 -0700
Subject: [PATCH 2/3] show OTP during first step of token generation process

---
 ui/app/templates/components/shamir-flow.hbs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/ui/app/templates/components/shamir-flow.hbs b/ui/app/templates/components/shamir-flow.hbs
index 539074b2d1b6..06d0448d3198 100644
--- a/ui/app/templates/components/shamir-flow.hbs
+++ b/ui/app/templates/components/shamir-flow.hbs
@@ -126,6 +126,20 @@
         </div>
       {{/if}}
       <div class="box is-shadowless is-marginless no-padding-top is-fullwidth" data-test-form-text>
+        {{#if otp}}
+          <p>
+            <AlertBanner @type="info" @message="Below is the generated OTP. This will be used to encode the generated Operation Token. Make sure to save this, as you will need it later to decode the Operation Token." />
+          </p>
+          <div class="message is-list has-copy-button" tabindex="-1">
+            <HoverCopyButton @copyValue={{otp}} />
+            <div class="message-body">
+              <h4 class="title is-7 is-marginless">
+                One Time Password (otp)
+              </h4>
+              <code class="is-word-break">{{otp}}</code>
+            </div>
+          </div>
+        {{/if}}
         {{#if (has-block)}}
           {{yield}}
         {{else if formText}}

From 3594c69dbd0b6ada5078e4fca801569abc652c4a Mon Sep 17 00:00:00 2001
From: Noelle Daley <adriannenoelle@gmail.com>
Date: Mon, 30 Mar 2020 13:22:59 -0700
Subject: [PATCH 3/3] use let instead of with

---
 ui/app/templates/components/shamir-flow.hbs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/app/templates/components/shamir-flow.hbs b/ui/app/templates/components/shamir-flow.hbs
index 06d0448d3198..edc58ea02e8a 100644
--- a/ui/app/templates/components/shamir-flow.hbs
+++ b/ui/app/templates/components/shamir-flow.hbs
@@ -21,7 +21,7 @@
       </div>
     {{/if}}
       <div class="message is-list has-copy-button" tabindex="-1">
-        {{#with (if otp
+        {{#let (if otp
           (concat 'vault operator generate-root -otp="' otp '" -decode="' encoded_token '"') (concat 'vault operator generate-root -otp="<enter your otp here>" -decode="' encoded_token '"') ) as |cmd|}}
           <HoverCopyButton @copyValue={{cmd}} />
           <div class="message-body">
@@ -30,7 +30,7 @@
             </h4>
             <code class="is-word-break">{{cmd}}</code>
           </div>
-        {{/with}}
+        {{/let}}
       </div>
   </div>
   <div class="box is-marginless is-shadowless">