Merge branch 'soon' into staging

2019-06-03 17:24:39 +02:00
parent eb12178fe7 4c18289b40
commit 5e62cc2245
10 changed files with 79 additions and 45 deletions
--- a/www/common/toolbar3.js
+++ b/www/common/toolbar3.js
@@ -304,8 +304,10 @@ MessengerUI, Messages) {
            } else if (Common.isLoggedIn() && data.curvePublic && !friends[data.curvePublic]
                && !priv.readOnly) {
                if (pendingFriends[data.curvePublic] && pendingFriends[data.curvePublic] > friendTo) {
-                    $('<span>', {'class': 'cp-toolbar-userlist-friend'}).text(Messages.userlist_pending)
-                        .appendTo($rightCol);
+                    $('<button>', {
+                        'class': 'fa fa-hourglass-half cp-toolbar-userlist-button',
+                        'title': Messages.profile_friendRequestSent
+                    }).appendTo($nameSpan);
                } else if (friendRequests[data.curvePublic]) {
                    $('<button>', {
                        'class': 'fa fa-bell cp-toolbar-userlist-button',