Clarify when the user can abort the payment request algorithm (#810)

marcoscaceres · web-flow · commit a1e773a79239 · 2019-01-10T19:09:13.000+11:00
diff --git a/index.html b/index.html
@@ -4578,13 +4578,13 @@ <h2>
           "PaymentResponse.payerPhone">payerPhone</a> value, the user agent
           SHOULD format the phone number to adhere to [[E.164]].
           </li>
+          <li>Set <var>request</var>.<a>[[\state]]</a> to "<a>closed</a>".
+          </li>
           <li>If <var>isRetry</var> is true, resolve
           <var>response</var>.<a>[[\retryPromise]]</a> with undefined.
           Otherwise, resolve <var>request</var>.<a>[[\acceptPromise]]</a> with
           <var>response</var>.
           </li>
-          <li>Set <var>request</var>.<a>[[\state]]</a> to "<a>closed</a>".
-          </li>
         </ol>
       </section>
       <section>
@@ -4602,10 +4602,6 @@ <h2>
           <li>Let <var>request</var> be the <a>PaymentRequest</a> object that
           the user is interacting with.
           </li>
-          <li>If the <var>request</var>.<a>[[\updating]]</a> is true, then
-          terminate this algorithm and take no further action. The <a>user
-          agent</a> user interface SHOULD ensure that this never occurs.
-          </li>
           <li>If <var>request</var>.<a>[[\state]]</a> is not
           "<a>interactive</a>", then terminate this algorithm and take no
           further action. The <a>user agent</a> user interface SHOULD ensure
@@ -4637,6 +4633,9 @@ <h2>
           <li>Otherwise, reject <var>request</var>.<a>[[\acceptPromise]]</a>
           with <var>error</var>.
           </li>
+          <li>Abort the current user interaction and close down any remaining
+          user interface.
+          </li>
         </ol>
       </section>
       <section>
@@ -4654,10 +4653,13 @@ <h2>
           blocked. The user agent SHOULD provide the user with a means to abort
           a payment request. Implementations MAY choose to implement a timeout
           for pending updates if <var>detailsPromise</var> doesn't settle in a
-          reasonable amount of time. If an implementation chooses to implement
-          a timeout, they MUST execute the steps listed below in the "upon
-          rejection" path. Such a timeout is a fatal error for the payment
-          request.
+          reasonable amount of time.
+        </p>
+        <p>
+          In the case where a timeout occurs, or the user manually aborts, or
+          the <a>payment handler</a> decides to abort this particular payment,
+          the user agent MUST run the <a>user aborts the payment request
+          algorithm</a>.
         </p>
         <ol class="algorithm">
           <li>Set <var>request</var>.<a>[[\updating]]</a> to true.
