Removed conflicts from Jake Archibald pull request

[ianbjacobs]

#305

The following tasks have been completed:

• web platform tests (link)
• MDN Docs added (link)

Implementation commitment:

• Safari (link to issue)
• Chrome (link to issue)
• Firefox (link to issue)
• Edge (public signal)

---

Preview | Diff

[ianbjacobs]

Hi @rsolomakhin and @jakearchibald,

I endeavored to resolve the merge conflicts between Jake's pull request:
#305

and the current draft of the spec.

@rsolomakhin, I removed the bits you suggested be removed. I did not (yet) review the full algorithm to see whether it still makes sense in light of the edits.

Ian

[rsolomakhin]

Looks good, but need to preserve the fields in PaymentRequestEvent.

[rsolomakhin]

Let's keep total, paymentRequestId, instrumentKey, and modifiers in the PaymentRequestEvent for now.

Suggested change

	</dd>
	</dd>
	<dt>
	<a data-lt="PaymentRequestEvent.total">total</a>
	</dt>
	<dd>
	A <a>structured clone</a> of the total field on
	the <a>PaymentDetailsInit</a> from the corresponding
	<a>PaymentRequest</a>.
	</dd>
	<dt>
	<a data-lt="PaymentRequestEvent.paymentRequestId">paymentRequestId</a>
	</dt>
	<dd>
	The [[\details]].<a>id</a> from the <a>PaymentRequest</a>.
	</dd>
	<dt>
	<a data-lt="PaymentRequestEvent.instrumentKey">instrumentKey</a>
	</dt>
	<dd>
	The <a>instrumentKey</a> of the selected <a>PaymentInstrument</a>,
	or the empty string if none was selected.
	</dd>
	<dt>
	<a data-lt="PaymentRequestEvent.modifiers">modifiers</a>
	</dt>
	<dd>
	The result of executing the <a>Modifiers Population Algorithm</a>.
	</dd>

[rsolomakhin]

Could you move these fields from canmakepayment event to paymentrequest event, please?

• total
• paymentRequestId
• instrumentKey

[rsolomakhin]

Almost missed this :-)

The field names in canmakepayment event should be associated with CanMakePaymentEvent, not the PaymentRequestEvent.

[rsolomakhin]

Suggested change

	<a data-lt="PaymentRequestEvent.topOrigin">topOrigin</a>
	<a data-lt="CanMakePaymentEvent.topOrigin">topOrigin</a>

[rsolomakhin]

Suggested change

	"PaymentRequestEvent.paymentRequestOrigin">paymentRequestOrigin</a>
	"CanMakePaymentEvent.paymentRequestOrigin">paymentRequestOrigin</a>

[rsolomakhin]

Suggested change

	<a data-lt="PaymentRequestEvent.methodData">methodData</a>
	<a data-lt="CanMakePaymentEvent.methodData">methodData</a>

[rsolomakhin]

Suggested change

	<a data-lt="PaymentRequestEvent.modifiers">modifiers</a>
	<a data-lt="CanMakePaymentEvent.modifiers">modifiers</a>

[rsolomakhin]

LGTM!