From 3b25f00041a9bd846dfcd1088b4c338b9e251077 Mon Sep 17 00:00:00 2001
From: Sander van Grieken <sander@outrightsolutions.nl>
Date: Mon, 11 Apr 2022 11:25:42 +0200
Subject: [PATCH] update History page delegates when rates or rate settings
 change

---
 electrum/gui/icons/confirmed_bw.png     | Bin 0 -> 5113 bytes
 electrum/gui/qml/components/History.qml |  40 ++++++++++++++++++------
 2 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 electrum/gui/icons/confirmed_bw.png

diff --git a/electrum/gui/icons/confirmed_bw.png b/electrum/gui/icons/confirmed_bw.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba66aa084911d4e7140d88c82e7c003e04dae2b0
GIT binary patch
literal 5113
zcmV<V69(*wP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00006VoOIv00000
z008+zyMF)x010qNS#tmY0Y(4-0Y(8b@^;k#000McNliru-3bv80uD}T8!rF=6NX7d
zK~#9!&0BqRl+~I4J@?*s-kD@b$QP18R3cDiMLr@{+`5e(YlT)sw@IbdQ)73b9;;UE
z>RNjYv#n>f<@kYaTX9uttG1acEvS@Qmr*I8CSnl~Q9&B{2qENSCYhP{z4t!*$4o-_
z4v+x%<m8W;dEa}V-~HX^KA*(Q80Zm=MkPv0LJpw1_9VlO<9v~X`8pY{1W^$IE|CoY
zZ~&43Gl)9Cw8Ij%fN298ya$0sKfb#?FE20M*w~n=tE;mEy;d4X0G2LY>LwD2T*}Em
z8x}Va%oG7zEQtdE0t_esL_qH!m?`@>GhhiY3>X5mh4c*5HWIYdX#1?M><+IbH(6VI
zNty>};l~XC5z&$*OG1w0<R^S_4Z+k(m<j^tA|tRk#Dn`zycdXlKL#v;JO+0gs4bes
zbFLfwgY-IEue|cg<naP=TmVF((ZIM+Q3=7^F4(VD#6`>;BHAl710awFSOf3?_y%MF
zp&4Wam;exiNq`jy4lxG+asWtRFEGroL`WG{t(L@dzD+$Q)9KyS)z#h!1t0>5am$ts
z6`s6|SVyGLXAn_v?=BK&gypn_OlXKrfLNs@Vl4T6-N8C1NAELncXu}_m9M%4f58>>
zRVgtQ){IuLLjZOG1bf*;#B4cbNo}<x?-!m}s`Z}s>gsAU=m0#nbg5gW#b^uq?*RE1
z1Dr>_G$#unX@Ol9@^uURj+4AL97ejy7(F%|_NuC?^br;4$dQ3?d%GiqQ0-cuCdj!;
z8FRfLQ%*!VV3s|{gF$i4qLHM!yC}z5S5;M&8WaGCh@Se>pTc3vnHCWGL1Ht4z)tUu
zFp?Iu%~0SM0YfhYgC-FO1ky(mxIa_JVllTRnH<8toG!`UrpTN{gxtMAkY>=%G~|7{
zWax|6U3g)<zq+Ac01!a`yKGrO*r)FXSpQIvEy?O|0F<&Mb{Z?5p#Yxj+~Kwjq?X=~
z9RVFG$%9T`8dP+bg!cs^%4KE(h#A<UN&Tv`+df)bJ#BYZ1syj46n*v8)7Uz7F1%}r
zke@y44A35r#q&bpXC^VUwWj8x)L;m{|5(u2=#>1UwZOXeI%Ulr1Rf4RQs!of`>b9z
z!rWOseR}heKsXWr^t;8cl?s7h1>s)`*xVj%Y(YDWRX<9!B^TG$&g@{upbNhLk$hsw
zl2DNm;~{8)B6~K01KIT@eRBR!8@lP*t1kcia3CBK03xF2mn<(5>^~Hu^uGeg$$q0X
z(-zHg4y8L+S65djaS}%qkj@|fT&^Yk!hv5!giv;!Ngrxij<mC<PoKW~P|OsEdhx5P
zR}UfK-4-POs=dO)(~$3_J$ZHe&aEp>w(tN@4ValTuh`1c+-Tq|Vn%n?Y6vO#mvtF&
zcYXb9c}K;7XmnMGLWyrHcn=6dA()9l+Cr>m!Pi|geR>lBi&JaR3yT*IQ^I*P0CN=q
zK_X&iYV|-rNbGKY@rE02NF9*@kyuQboX+zldl3OH%ql#~jL$ruzx%<v@1Ban0|3vO
zF=Lmp>JCHBTMYP_+rbt|;Qml?>9}Y#Dh~?)5m7~(R~WGTpddaiW5p6%P^)Lf9UIqn
zeKr^#*|Ch8ni@$&`)?p$JL4-mQfd7?3-uv0EC7-)BOT&jrc{0r5z!$5c<7<}V9@1R
zip;qL$gD=~HtakVq`X*N-Lc!;13Av0Gsnp(E}i(Dn{PfR5{U%&2f;DjThqqQW|G^o
zH-MC^#|0gp^~^KN-9rIDXN)Z@RmR*7a5!sfY7M#C<J2QpUG=5JDRIz=#6`n~o&MF!
zuXyHbUzxsCg$t@{YHC9JD8}k)BZn2NwIqKEqIlMr%aP3A4;K1`dyTk007PT4T+RB&
zf_ONxp1OtDsY%_kY0a9J6Jg-=XUv^DKRj;i_*;Y0jB%wMIr^-#ezIpze9ZpGp?d1n
zWQQ<|G^=$C7yv>-k5FW9u3xn(xDNo4NJNN)U+S=#PJ}@AyR?CP-gE3fPL*>%XU-fa
z?zMffI6pi~3UVz-`@UU!_63u+G4lay^qZR6wc+~#WLQ85Dl*r}_V%LeCT9RBt*i_h
z%e9hhkC_V#>d=~hdHv;=cb_WMcZUr-z4H7i4?ARwzzomuj<?_Z+r1^O+jg*LX3w7O
zQ;=3`7Ha|007wuQYa{<H8qKgk06-a#;|O~VklB3(`5JPi>1y56ABW;Zj0YclDtFx2
z@wWz*IST~g8|qxYVZ)CTiRO<F$Iuej?X--a0-VSwbq*?UjZ!;v06@fIF_{#BNdjhg
z4<O9wvQ|9u$%ql%rwa93;!VBOXTb0B%o`#wbm_u{3)6>twyLU1Yhl+I$Q{|3qma<0
z+6j$~Mx#=+01jJxgTOtS)L6*Pl;(AH$M4Gzh|`l>R#rY~@{~t=sPAjq-ninedy&|&
zr$5Sh2uiyx)L)3m%iIVYBEqaxD&G}Ir&R!4nF&#6{CjQX)8Vk~Iz^}-9$RtFZ6ReV
zKoHuZ<HL;`?_o}V++XGV^{-c^l%S`WIhkd+LyUisg}xBJFT%t+uSY9drY@4{KTe-E
z%{$ti8Vu^UC7Y%c=jYCnL@qPDcuN0;U9oKb{Q2plc$M|K+O`>%+ZnJ#5R%PE$2vJ8
zz&wVC%X;X~B%2TnCip0nUsiaRGD8xP8VKs=m6wkkf8LbG9O5DdbJ~ce_gAf&i_XsW
zqu+=U4<z0LpaDP-yM}100@+E~_&u0mEb}_FwH;M-m6@4{dct64ps1f;8os@k`UZO%
z)->F?ZQGVlAAY#r9!B^85qSsdh8ANu|04;Q4A;pKY)S+HBQoi!ECXOaITj%X(o#G>
zqxGj0<>y|TrGC1tEA^-15yNBk_4VEn*5Dm%Eo~JQ+99)^2wBC>QUYy)K!rdix=KVA
zB=&^EVS6&Q{<QM)k&`R4)Mw_j5ubh7_}&BmIcG=wST|zF%P$+>`XBb$Tq44mg4hH>
zd((3aiYF2YKABqoj8W(OASi7G2_lba&&ri={UDKO-NJnACV5?5oec@mN_%4&1m;cw
zLTldyr63z`tEf0B0L+;)$7zc<O&K~QI7<?_#&Wu~J^s7G+_IHVJn@8oyzfsY9cw^l
zFV|QJ0*V2&?4_Xa(b#xWs6VW{eB{JF)K3}u<bx0Y{^;Dfw+@Iao=L}%&Ln1;01}F^
z@3mnKyOoudC!YFGJry46<o-uM+6p3~wBeSOZ>+fG?YCarn$_$BlWbw;Y&75<A~<5d
z>z=?A-n=<PC!G3CO;ZZ;a;vk{Pd2x<JzYGeyrH3?!3QvKnWi2?foKXdZxt4#v)SCt
z$I|44!&~V@Qh(H_Q6nZ!nDTf)ppe0~TVvy=O`D&Xd-Kg*19`=^wt519WM%?$3q!cV
zvS<T(g9$_=bDKl`X8;k=f&~k54icd3Uxa7={2@iBkGVS_c~pk_*uC=26}P<~i+w)8
zQ78(R1ViXa=z^?e_yQ!haqrzo!df0toJjObm`Efd=05Ofxpi~vzJKSPV=uYn5_PoH
z?`~_GQV<S)LlRue+|{(b`SBdbtXaN%`G9(&u~<x|yujHaYx4kLB1#L*@)H6IvY#nI
z7~dgfzXWMbr;E-SUGdxDh50vs>0d5geBs5Hj=v-lQT<~MXw;~4MogY~!Q+nLLT0vI
z9@g&K)w*!rym<p2hiGYOaa^G<;;h%p;3CV|Eg;2a&V-8qKnmi~Ie~!FAL_R>#~qSN
zf+!Fqd)DO2$uC|k0+ls2HGv~NKY#vXLrP8`d2djdGYLeVrRKk_Tz=;}v86i)BLM5V
zt|H<}>~+*UW@;6j>WW*IJw^rzYld=ncg4Z7DEph7Cf?k<ab3fWDPMd5f(=MM^StvW
z)Q>rL;y>5c9uTkJhx)rZx-KXf5}HYXt1Tx!-n@05NhH<|H1&I<zaq~i@C0JcIDQZ*
zrS%Sx@1o5JY|my<07A%8;5(^Qe(*>yt*@^)AFW;c$@=#iuS*%Z0ZcX^ZTX~$6Mi##
z{Lrt>n>R1_VAL-!A2V|Nc@rL&#Dx}Y5-Hoz(b@9*1q&7oO0qQ;i>WlFDkbsIOx%Nv
zfoSR!o+p?&4PaSMxQGEqF<%l6%V2+AUSD5tKKf|wruB^t-%1(!h?#6aaM{_TD}E8k
zFTC-Qg$sxF_0b=AU_oBl=!$z?Vb36dd`&yweJgg?mi6nK2P^l`0tCs5TCfde&%b8I
z3K`F_qOq|t#lm^Uu;|KWPy~@KL(oi!#bT<zAZ*<D!NxW3HC~&xViSX`BScC0@YCkz
zh|rIoe!9LG07W7Zl{WDUhUNrj65#p<@eLa{-QVnBeSLks84Tfxh|t{~7Gy8VmfiuN
zBtyQqxjbM+U0t1p!`plz*JoqrARtV}-m`ss*O2~BR9|0jHgEi3!@KXib8Xttrwmw0
zC@2}4`#lP(`Oik9Ww}K~<!ArXxW}bHfd%V?XWvBHycB)-;S>gGJhObctBkr%kSPS1
z7_ge<wxky8>Z+=&0DzsopRz{$)-v}jL=l<E!F)Bbzbxnhp<!ig!`rJ@U+Y=g%mgb1
zhUABxs{<-$SxNDTM_ggf$V6Vn_SJ9w^}hA%-)S8z>Jx#2oqi!h-vs8I%;r*3Gd*cL
zWLIxu<d$jEyny2`)fCvqS$~<B^T_g#TUye2M>Fa2<;(ROuf4kN?NzI1c}8pjk&y&9
zr1+enVP_f<1+=A(_dodHzEnK^;b2i80G2Fi3@O1ksXqBmO>(DD=J&O=m!x|E0KlEi
z&AW{ij{`j=CQyR(WVo0bi9`ZNGjT&hgCBeC)wOT0dh=T;O`r8dVhM1JWxqX<eod(G
zD@RId98Ux~5{ZbU*>$Fbt_8AnLqtgn`8)~=I(k^wYx36C)}}+Cs3G}TFAIP?CCo#U
zCQUj$5{ZbT2jR8%SFc?8EzgS2GF6@6v=yJfziP!#TyJ;Vu~5Hn1p08l8F%TWMMB_V
z342<$-k6OQyBy6=R!^PUt8+wO!zP_BZL=CbXHdM?egKcsQvLG0sZ)!OHum4p(BQxM
z`k&XVeq-hJX-!)_gO+#RefOSEKh>L#HRGHG?Xd3giWMuu)Y*NDg1M+S;tdfu!g;i<
zEzp8KF@OV#q@G>0s3@p%pLNN<tf%e{L|vN2uY^wjbmq*N?MEHuJ^y@X!ueAtl%0O&
zmpx?`Jb2e#@xeOxu~;m)yUUvyV1GUc#hC&xXbtD}&ZNEm#+rRg<_@6smaDIBGvK>?
zs4abtLXKo}qm}OUix>ZG$k8sUp`pQldQbD3&;7*z{Os<#2d&biv9ZzF-O)A0Vf{0J
zi+d_sEyOl!)E)oWFztXF=b&YBjg5`Yr#m|@Rh(L=de0CsgIYAHdmNLB&X_S{(01`y
z#$!vDy2A}kc3^)aU`O?AE<?1Xt-QNC&;88}2dN}KsA8+Etn|~4zd~Cz&w@I8-DlVm
zhy4eva&LV8l~)S-*4muRvEb#GbIPn!<-k5i`v{MO$119&{=*H2D5F1YsqC*``fFiO
z*++upT?1qdiA+IqyKm_Q#rnTy%$TtYC#i^nh^W54KF=94<Vw=!0f0+sZ;eB@Pk}|b
zGIaa2X%`=|a{P$J($BpV8xah6PdM<adO*mc+ijrU5(?jI`uO7=x7>0|`a}vJiA2=6
zDN~AJ)g2DJ8wF69HFm(DZXeDoiKM>uhU&vtjQ6Wt{-tHhhO>tU75te(P?-0&#&`yD
zvn6@I%jrLF-@d(L_UzgIAPX)=UvNd(;f{&Q*q=)>=L$lo&zib?mdmWPHxER)eDCjG
zh{cMWc>0Hm%)bk8L7!$O3sAx*@u4;LCverOisIsUWo6}n0uhZyW!!ah3Y01}mhN?6
zrvqHjQ_z`hm}vJA_`URV>#n}~q81EL!$j|STeN6VzEPp;1nYYwVHm)D9VG)GuAw$q
z!ecD>btDqWl9H0tv9`@b08#n!%fVza88o^1V;sx3E0`)lJd~OHR(xs$xy?Y_m(a<@
zwKHdS^tZm@sGFvu(N!TE>^N5fKX+gz6CoF1u@4YLU7F=CCcGiY{y`HpI_b3U`@Zff
zDbZ(Uf|LY|L|dqpGSwNSNG9XLbsb9QB!!B{Rg&mTH<0s9VeRF_{ux9fx3^Czvn$Mu
zZUg!|TX9o-&(2K;s|X)Z0D9;MgbNW8-*m{{No-3A`|L<oPg16Jj*(&^w_DKr%wkjK
z;E=MyI)G3FQUC?WngStgkzhWJiAx1Imw+IH1GLYTO>Ds_3$@E<@ucVC$zVrE>j`O_
z+u!W$>M~_X_V1J6uL_ua%Jlcqfi^rW5%~a{OlF#UJd55oT4olRq%8{&iGy^LS`Z~Q
z<WAo@&pJN++L+c|H8nNI+^cllt+SCxM2s8v<s9oIPa`F-S1>gawhYW65ELDzE2V$V
z4=f4tm?@=M?DVBrAgx!AWYM01Xwn+U=4pyXR|R#bHCK`|o~-z`fWA<`4wu9(0|5dF
z28&*=lCvSo>^~xKMw_!`hQ~rBtwoc8c#{<UQ3b@hjwac4N;OX(oE0%OZd^;yaY|H*
zydfaILJ=+l(O58-0h}kmK&D>D2g74Rnm{QK#jO>eS|OHL-(QhJs=Zj1d&y*Fy1E(z
b9zFVhpyOgQ7`oGt00000NkvXXu0mjfDMYXo

literal 0
HcmV?d00001

diff --git a/electrum/gui/qml/components/History.qml b/electrum/gui/qml/components/History.qml
index e14e57848..8f1d05dca 100644
--- a/electrum/gui/qml/components/History.qml
+++ b/electrum/gui/qml/components/History.qml
@@ -82,7 +82,7 @@ Pane {
                                     "../../../gui/icons/clock3.png",
                                     "../../../gui/icons/clock4.png",
                                     "../../../gui/icons/clock5.png",
-                                    "../../../gui/icons/confirmed.png"
+                                    "../../../gui/icons/confirmed_bw.png"
                                 ]
 
                                 Layout.preferredWidth: constants.iconSizeLarge
@@ -106,18 +106,34 @@ Pane {
                                 font.family: FixedFont
                                 font.pixelSize: constants.fontSizeMedium
                                 Layout.alignment: Qt.AlignRight
-                                text: Config.formatSats(model.bc_value)
                                 font.bold: true
                                 color: model.incoming ? constants.colorCredit : constants.colorDebit
+
+                                function updateText() {
+                                    text = Config.formatSats(model.bc_value)
+                                }
+                                Component.onCompleted: updateText()
                             }
                             Label {
                                 font.pixelSize: constants.fontSizeSmall
                                 text: model.date
                             }
                             Label {
-                                font.pixelSize: constants.fontSizeXSmall
+                                id: fiatLabel
+                                font.pixelSize: constants.fontSizeSmall
                                 Layout.alignment: Qt.AlignRight
-                                text: model.fee !== undefined ? 'fee: ' + model.fee : ''
+                                color: constants.mutedForeground
+
+                                function updateText() {
+                                    if (!Daemon.fx.enabled) {
+                                        text = ''
+                                    } else if (Daemon.fx.historicRates) {
+                                        text = Daemon.fx.fiatValueHistoric(model.bc_value, model.timestamp) + ' ' + Daemon.fx.fiatCurrency
+                                    } else {
+                                        text = Daemon.fx.fiatValue(model.bc_value, false) + ' ' + Daemon.fx.fiatCurrency
+                                    }
+                                }
+                                Component.onCompleted: updateText()
                             }
                             Item { Layout.columnSpan: 3; Layout.preferredWidth: 1; Layout.preferredHeight: 1 }
                         }
@@ -135,12 +151,16 @@ Pane {
                 // hook up events that might change the appearance
                 Connections {
                     target: Config
-                    function onBaseUnitChanged() {
-                        valueLabel.text = Config.formatSats(model.bc_value)
-                    }
-                    function onThousandsSeparatorChanged() {
-                        valueLabel.text = Config.formatSats(model.bc_value)
-                    }
+                    function onBaseUnitChanged() { valueLabel.updateText() }
+                    function onThousandsSeparatorChanged() { valueLabel.updateText() }
+                }
+
+                Connections {
+                    target: Daemon.fx
+                    function onHistoricRatesChanged() { fiatLabel.updateText() }
+                    function onQuotesUpdated() { fiatLabel.updateText() }
+                    function onHistoryUpdated() { fiatLabel.updateText() }
+                    function onEnabledUpdated() { fiatLabel.updateText() }
                 }
 
                 Component.onCompleted: {