Commit 1be0d18
committed
Merge #477: Various fixes to Send, WalletController, and general QML
18e008c Signal currentRecipientChanged before deleting in SendRecipientsListModel::remove (johnny9)
cc50078 Set m_selected_wallet to empty before unloading (johnny9)
f8eb08f Reset current index before clearing in SendRecipientsListModel (johnny9)
c8c54a1 Add missing buttonText id to EllipsisMenuToggleItem (johnny9)
Pull request description:
The following errors are resolved with these commits.
Missing id for buttonText in EllipsesMenuToggleItem
```
2025-07-27T01:40:01Z GUI: qrc:/qml/controls/EllipsisMenuToggleItem.qml:71: ReferenceError: buttonText is not defined
2025-07-27T01:40:01Z GUI: qrc:/qml/controls/EllipsisMenuToggleItem.qml:71:13: QML PropertyChanges: Cannot assign to non-existent property "color"
```
Null Property after toggling off Multiple Recipients toggle and removing Recipients with the "-" icon
```
2025-07-27T01:40:03Z GUI: qrc:/qml/pages/wallet/Send.qml:258: TypeError: Cannot read property 'label' of null
2025-07-27T01:40:03Z GUI: qrc:/qml/pages/wallet/Send.qml:234: TypeError: Cannot read property 'amount' of null
2025-07-27T01:40:03Z GUI: qrc:/qml/pages/wallet/Send.qml:212: TypeError: Cannot read property 'amount' of null
2025-07-27T01:40:03Z GUI: qrc:/qml/pages/wallet/Send.qml:178: TypeError: Cannot read property 'address' of null
```
Null properties after all wallets are unloaded
```
2025-07-27T01:40:44Z GUI: qrc:/qml/pages/wallet/Send.qml:258: TypeError: Cannot read property 'label' of null
2025-07-27T01:40:44Z GUI: qrc:/qml/pages/wallet/Send.qml:234: TypeError: Cannot read property 'amount' of null
2025-07-27T01:40:44Z GUI: qrc:/qml/pages/wallet/Send.qml:212: TypeError: Cannot read property 'amount' of null
2025-07-27T01:40:44Z GUI: qrc:/qml/pages/wallet/Send.qml:178: TypeError: Cannot read property 'address' of null
2025-07-27T01:40:44Z GUI: qrc:/qml/pages/wallet/Send.qml:31: TypeError: Cannot read property 'recipients' of null
```
ACKs for top commit:
hebasto:
ACK 18e008c, tested on Ubuntu 24.04.
Tree-SHA512: 3c58676bb19cf524b3661e5f51260ace5cc70bc43ff94fbf14ae48ea7d2a69c76cdbe2988f02435ac53ea9dce0c68d1b8d8fc0163ceab376e3c5fa6fee82c001File tree
4 files changed
+19
-11
lines changed- qml
- controls
- models
4 files changed
+19
-11
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
| 42 | + | |
42 | 43 | | |
43 | 44 | | |
44 | 45 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
93 | 93 | | |
94 | 94 | | |
95 | 95 | | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
100 | 96 | | |
| 97 | + | |
101 | 98 | | |
| 99 | + | |
102 | 100 | | |
| 101 | + | |
103 | 102 | | |
| 103 | + | |
104 | 104 | | |
| 105 | + | |
| 106 | + | |
105 | 107 | | |
106 | 108 | | |
107 | 109 | | |
| |||
152 | 154 | | |
153 | 155 | | |
154 | 156 | | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
155 | 163 | | |
156 | 164 | | |
157 | 165 | | |
| |||
167 | 175 | | |
168 | 176 | | |
169 | 177 | | |
170 | | - | |
171 | | - | |
172 | | - | |
173 | | - | |
174 | | - | |
175 | | - | |
176 | 178 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
| 19 | + | |
| 20 | + | |
20 | 21 | | |
21 | 22 | | |
22 | 23 | | |
| |||
35 | 36 | | |
36 | 37 | | |
37 | 38 | | |
| 39 | + | |
38 | 40 | | |
39 | 41 | | |
40 | 42 | | |
| |||
63 | 65 | | |
64 | 66 | | |
65 | 67 | | |
| 68 | + | |
| 69 | + | |
66 | 70 | | |
67 | 71 | | |
68 | 72 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
54 | 54 | | |
55 | 55 | | |
56 | 56 | | |
| 57 | + | |
57 | 58 | | |
58 | 59 | | |
59 | 60 | | |
| |||
0 commit comments