From 1ee74a3ce8832cd8287dbd0a83475eb36bf6e432 Mon Sep 17 00:00:00 2001
From: Changaco <changaco@changaco.oy.lc>
Date: Thu, 21 Mar 2024 09:55:07 +0100
Subject: [PATCH 1/3] list the primary address first in `/~/emails/`

closes #2325
---
 www/%username/emails/index.spt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/www/%username/emails/index.spt b/www/%username/emails/index.spt
index bad510a56..e961ab288 100644
--- a/www/%username/emails/index.spt
+++ b/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

From e1cb5b37e631e99e05ec67345716a33757662fb0 Mon Sep 17 00:00:00 2001
From: Changaco <changaco@changaco.oy.lc>
Date: Thu, 21 Mar 2024 10:11:57 +0100
Subject: [PATCH 2/3] fix handling of PayPal refunds lacking descriptions

fixes LIBERAPAYCOM-24E
---
 liberapay/payin/paypal.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/liberapay/payin/paypal.py b/liberapay/payin/paypal.py
index 9317a4dcf..b5d183c57 100644
--- a/liberapay/payin/paypal.py
+++ b/liberapay/payin/paypal.py
@@ -224,7 +224,7 @@ def record_order_result(db, payin, order):
             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(

From ee8fec45fd46c041693784c2d04366ef15972f74 Mon Sep 17 00:00:00 2001
From: Changaco <changaco@changaco.oy.lc>
Date: Fri, 22 Mar 2024 10:05:33 +0100
Subject: [PATCH 3/3] change icon in takes table

---
 templates/macros/team-members.html | 2 +-
 www/assets/icons.svg               | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/templates/macros/team-members.html b/templates/macros/team-members.html
index e56ae8829..ad092527d 100644
--- a/templates/macros/team-members.html
+++ b/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>
diff --git a/www/assets/icons.svg b/www/assets/icons.svg
index 8327ce2eb..7666bbd4a 100644
--- a/www/assets/icons.svg
+++ b/www/assets/icons.svg
@@ -164,9 +164,6 @@
     <path d="M14 1a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1zM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2z"/>
     <path d="M5.5 12a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0m-3-8.5a1 1 0 0 1 1-1c5.523 0 10 4.477 10 10a1 1 0 1 1-2 0 8 8 0 0 0-8-8 1 1 0 0 1-1-1m0 4a1 1 0 0 1 1-1 6 6 0 0 1 6 6 1 1 0 1 1-2 0 4 4 0 0 0-4-4 1 1 0 0 1-1-1"/>
   </symbol>
-  <symbol viewBox="0 0 16 16" id="save">
-    <path d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1H9.5a1 1 0 0 0-1 1v7.293l2.646-2.647a.5.5 0 0 1 .708.708l-3.5 3.5a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L7.5 9.293V2a2 2 0 0 1 2-2H14a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V2a2 2 0 0 1 2-2h2.5a.5.5 0 0 1 0 1z"/>
-  </symbol>
   <symbol viewBox="0 0 16 16" id="search">
     <path d="M11.742 10.344a6.5 6.5 0 1 0-1.397 1.398h-.001q.044.06.098.115l3.85 3.85a1 1 0 0 0 1.415-1.414l-3.85-3.85a1 1 0 0 0-.115-.1zM12 6.5a5.5 5.5 0 1 1-11 0 5.5 5.5 0 0 1 11 0"/>
   </symbol>