Skip to content

Commit 698f1f3

Browse files
committed
Fix issue #4338
1 parent 499ca4a commit 698f1f3

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

client/app/src/pages/recipient/tip/tip.component.ts

+6-3
Original file line numberDiff line numberDiff line change
@@ -157,14 +157,15 @@ export class TipComponent implements OnInit {
157157
openGrantTipAccessModal(): void {
158158
this.utils.runUserOperation("get_users_names", {}, false).subscribe({
159159
next: response => {
160+
const names = response as Record<string, string>;
160161
const selectableRecipients: Receiver[] = [];
161162
this.appDataService.public.receivers.forEach(async (receiver: Receiver) => {
162163
if (receiver.id !== this.authenticationService.session.user_id && !this.tip.receivers_by_id[receiver.id]) {
164+
receiver.name = names[receiver.id];
163165
selectableRecipients.push(receiver);
164166
}
165167
});
166168
const modalRef = this.modalService.open(GrantAccessComponent, {backdrop: 'static', keyboard: false});
167-
modalRef.componentInstance.usersNames = response;
168169
modalRef.componentInstance.selectableRecipients = selectableRecipients;
169170
modalRef.componentInstance.confirmFun = (receiver_id: Receiver) => {
170171
const req = {
@@ -187,14 +188,15 @@ export class TipComponent implements OnInit {
187188
this.utils.runUserOperation("get_users_names", {}, false).subscribe(
188189
{
189190
next: response => {
191+
const names = response as Record<string, string>;
190192
const selectableRecipients: Receiver[] = [];
191193
this.appDataService.public.receivers.forEach(async (receiver: Receiver) => {
192194
if (receiver.id !== this.authenticationService.session.user_id && this.tip.receivers_by_id[receiver.id]) {
195+
receiver.name = names[receiver.id];
193196
selectableRecipients.push(receiver);
194197
}
195198
});
196199
const modalRef = this.modalService.open(RevokeAccessComponent, {backdrop: 'static', keyboard: false});
197-
modalRef.componentInstance.usersNames = response;
198200
modalRef.componentInstance.selectableRecipients = selectableRecipients;
199201
modalRef.componentInstance.confirmFun = (receiver_id: Receiver) => {
200202
const req = {
@@ -218,14 +220,15 @@ export class TipComponent implements OnInit {
218220
this.utils.runUserOperation("get_users_names", {}, false).subscribe(
219221
{
220222
next: response => {
223+
const names = response as Record<string, string>;
221224
const selectableRecipients: Receiver[] = [];
222225
this.appDataService.public.receivers.forEach(async (receiver: Receiver) => {
223226
if (receiver.id !== this.authenticationService.session.user_id && !this.tip.receivers_by_id[receiver.id]) {
227+
receiver.name = names[receiver.id];
224228
selectableRecipients.push(receiver);
225229
}
226230
});
227231
const modalRef = this.modalService.open(TransferAccessComponent, {backdrop: 'static', keyboard: false});
228-
modalRef.componentInstance.usersNames = response;
229232
modalRef.componentInstance.selectableRecipients = selectableRecipients;
230233
modalRef.result.then(
231234
(receiverId) => {

client/app/src/pages/recipient/tips/tips.component.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,15 @@ export class TipsComponent implements OnInit {
106106
openGrantAccessModal(): void {
107107
this.utils.runUserOperation("get_users_names", {}, false).subscribe({
108108
next: response => {
109+
const names = response as Record<string, string>;
109110
const selectableRecipients: Receiver[] = [];
110111
this.appDataService.public.receivers.forEach(async (receiver: Receiver) => {
111112
if (receiver.id !== this.authenticationService.session.user_id) {
113+
receiver.name = names[receiver.id];
112114
selectableRecipients.push(receiver);
113115
}
114116
});
115117
const modalRef = this.modalService.open(GrantAccessComponent, {backdrop: 'static', keyboard: false});
116-
modalRef.componentInstance.usersNames = response;
117118
modalRef.componentInstance.selectableRecipients = selectableRecipients;
118119
modalRef.componentInstance.confirmFun = (receiver_id: Receiver) => {
119120
const req = {
@@ -137,14 +138,15 @@ export class TipsComponent implements OnInit {
137138
this.utils.runUserOperation("get_users_names", {}, false).subscribe(
138139
{
139140
next: response => {
141+
const names = response as Record<string, string>;
140142
const selectableRecipients: Receiver[] = [];
141143
this.appDataService.public.receivers.forEach(async (receiver: Receiver) => {
142144
if (receiver.id !== this.authenticationService.session.user_id) {
145+
receiver.name = names[receiver.id];
143146
selectableRecipients.push(receiver);
144147
}
145148
});
146149
const modalRef = this.modalService.open(RevokeAccessComponent, {backdrop: 'static', keyboard: false});
147-
modalRef.componentInstance.usersNames = response;
148150
modalRef.componentInstance.selectableRecipients = selectableRecipients;
149151
modalRef.componentInstance.confirmFun = (receiver_id: Receiver) => {
150152
const req = {

0 commit comments

Comments
 (0)