Various

liberapay/payin/paypal.py

@@ -224,7 +224,7 @@
             refund_amount = refund['amount']
             refund_amount = Money(refund_amount['value'], refund_amount['currency_code'])
             reversed_amount += refund_amount
-            refund_description = refund['note_to_payer']
+            refund_description = refund.get('note_to_payer')
             refund_status = REFUND_STATUSES_MAP[refund['status']]
             refund_error = refund.get('status_details', {}).get('reason')
             payin_refund = record_payin_refund(

templates/macros/team-members.html

@@ -73,7 +73,7 @@
                             }}" placeholder="auto" />
                             <div class="input-group-btn">
                                 <button class="btn btn-default" title="{{ _('Update my nominal take') }}">{{
-                                    icon('save')
+                                    icon('check-lg')
                                 }}</button>
                             </div>
                         </div>

www/%username/emails/index.spt

@@ -59,6 +59,10 @@ if not participant.email_lang:
 title = participant.username
 subhead = _("Email settings")
 emails = participant.get_emails()
+emails.sort(key=lambda e: (
+    -(e.address == participant.email),
+    e.id
+))
 email_locale = website.locales.get(participant.email_lang) or website.locales['en']
 
 [---] text/html