From bc432b104228c76f785563a903775d72403c17d6 Mon Sep 17 00:00:00 2001
From: Omar Hatem <omarh.ismail1@gmail.com>
Date: Thu, 13 Jul 2023 21:46:55 +0300
Subject: [PATCH 1/3] Fix Bitcoin transactions not showing (#978)

* handle multiple responses coming in a single event

* Add timeout for getting transaction info, to allow other transactions to be returned in case of any failure or network issue

* Handle other cases of receiving multiple messages in the same response
---
 cw_bitcoin/lib/electrum.dart | 88 +++++++++++++++++++++---------------
 1 file changed, 51 insertions(+), 37 deletions(-)

diff --git a/cw_bitcoin/lib/electrum.dart b/cw_bitcoin/lib/electrum.dart
index 70b072f7b..a05c251fe 100644
--- a/cw_bitcoin/lib/electrum.dart
+++ b/cw_bitcoin/lib/electrum.dart
@@ -66,54 +66,68 @@ class ElectrumClient {
     socket!.listen((Uint8List event) {
       try {
         final msg = utf8.decode(event.toList());
-        final response =
-            json.decode(msg) as Map<String, dynamic>;
-        _handleResponse(response);
-      } on FormatException catch (e) {
-        final msg = e.message.toLowerCase();
-
-        if (e.source is String) {
-          unterminatedString += e.source as String;
-        }
-
-        if (msg.contains("not a subtype of type")) {
-          unterminatedString += e.source as String;
-          return;
-        }
-
-        if (isJSONStringCorrect(unterminatedString)) {
-          final response =
-              json.decode(unterminatedString) as Map<String, dynamic>;
-          _handleResponse(response);
-          unterminatedString = '';
-        }
-      } on TypeError catch (e) {
-        if (!e.toString().contains('Map<String, Object>') && !e.toString().contains('Map<String, dynamic>')) {
-          return;
-        }
-
-        final source = utf8.decode(event.toList());
-        unterminatedString += source;
-
-        if (isJSONStringCorrect(unterminatedString)) {
-          final response =
-              json.decode(unterminatedString) as Map<String, dynamic>;
-          _handleResponse(response);
-          // unterminatedString = null;
-          unterminatedString = '';
+        final messagesList = msg.split("\n");
+        for (var message in messagesList) {
+          if (message.isEmpty) {
+            continue;
+          }
+          _parseResponse(message);
         }
       } catch (e) {
         print(e.toString());
       }
     }, onError: (Object error) {
       print(error.toString());
+      unterminatedString = '';
       _setIsConnected(false);
     }, onDone: () {
+      unterminatedString = '';
       _setIsConnected(false);
     });
     keepAlive();
   }
 
+  void _parseResponse(String message) {
+    try {
+      final response = json.decode(message) as Map<String, dynamic>;
+      _handleResponse(response);
+    } on FormatException catch (e) {
+      final msg = e.message.toLowerCase();
+
+      if (e.source is String) {
+        unterminatedString += e.source as String;
+      }
+
+      if (msg.contains("not a subtype of type")) {
+        unterminatedString += e.source as String;
+        return;
+      }
+
+      if (isJSONStringCorrect(unterminatedString)) {
+        final response =
+        json.decode(unterminatedString) as Map<String, dynamic>;
+        _handleResponse(response);
+        unterminatedString = '';
+      }
+    } on TypeError catch (e) {
+      if (!e.toString().contains('Map<String, Object>') && !e.toString().contains('Map<String, dynamic>')) {
+        return;
+      }
+
+      unterminatedString += message;
+
+      if (isJSONStringCorrect(unterminatedString)) {
+        final response =
+        json.decode(unterminatedString) as Map<String, dynamic>;
+        _handleResponse(response);
+        // unterminatedString = null;
+        unterminatedString = '';
+      }
+    } catch (e) {
+      print(e.toString());
+    }
+  }
+
   void keepAlive() {
     _aliveTimer?.cancel();
     _aliveTimer = Timer.periodic(aliveTimerDuration, (_) async => ping());
@@ -217,7 +231,7 @@ class ElectrumClient {
 
   Future<Map<String, dynamic>> getTransactionRaw(
           {required String hash}) async =>
-      call(method: 'blockchain.transaction.get', params: [hash, true])
+      callWithTimeout(method: 'blockchain.transaction.get', params: [hash, true], timeout: 10000)
           .then((dynamic result) {
         if (result is Map<String, dynamic>) {
           return result;
@@ -228,7 +242,7 @@ class ElectrumClient {
 
   Future<String> getTransactionHex(
           {required String hash}) async =>
-      call(method: 'blockchain.transaction.get', params: [hash, false])
+      callWithTimeout(method: 'blockchain.transaction.get', params: [hash, false], timeout: 10000)
           .then((dynamic result) {
         if (result is String) {
           return result;

From b963f83f4f024705beb01ca07d5245109752f712 Mon Sep 17 00:00:00 2001
From: Justin Ehrenhofer <justin.ehrenhofer@gmail.com>
Date: Thu, 13 Jul 2023 13:47:12 -0500
Subject: [PATCH 2/3] Fix shib and storj (#997)

---
 assets/images/shib_icon.png      | Bin 0 -> 7996 bytes
 cw_core/lib/crypto_currency.dart |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 assets/images/shib_icon.png

diff --git a/assets/images/shib_icon.png b/assets/images/shib_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..97bc94468f435e27783486e243e1f1822bed6ece
GIT binary patch
literal 7996
zcmV-CAH(2@P)<h;3K|Lk000e1NJLTq004jh004ss1^@s6MXD2J00001b5ch_0Itp)
z=>Py8_DMuRRCr$Poe7v!#qq#@J;z?Ku!16@sCW?XB#Huxh)RUSXv|-TQBV_)VAS9d
z&qN|>Vm#u3w-LkPjV504h&Lh{f}kQOilTx<ZaMbend$#mGdsI;yf?4=&CIeJsPE&0
zkEyPzuCCWdbyc-u3vAXJP@8q{w{)Jo44`2OH<W}qDH>(5g6C>#xxdR8R&UX3@inl1
zBHc<u3=9T2tfq!(RcG<8AFjR)pyqFksVL>1Or}~>-O$Ln<)<;lk3d`6xND&HJ_eMO
zb8}EJ09rp@4UK_Ol={(~F9XoR{2`*LLO3vw)HN`=;xr!fBiNQU2@UA+1R{MH7YcC&
z5OUK?eIvgr|0Va?>dlt{)cuXoWu-h|!Yrm)ws8adR-MhaCircEqaiQ{f(NvIMf!1w
zjf9v2-4-&K@MxICWhEtC>+zu_3`J8N7)_-K-BcW31`vCYFO^~^8)gj+oLzPrciXh_
zi@O%Omc#ym07HYCLj$n8f~|lO6J-KX4YeAUMHO?SF<xnaH@m`D3L<{xGHq9VANy65
z^Nvzfn6?qTwQK0weJmSn+W0a6{gA(}BpPF8@MI1x<X5I4SO*7%0-PPv{76AJ8wL2l
zjl^JnRC8ZFJk|x)_@Lq1q;U!lheMp`hh{9sZ-OUthfP~+1JIMGqQw7nt~Kjde#7=X
zFQ&#u&{W*@(5)=M`C-l33cCBHQ=oRSD7@9AxuOi-@@w4dZ>C#i557=}E`H_GnmK{d
z^s{MiZ2+}XIH)|tEE^^cxUu!s^sO4h=caU)LV1q>mxVPKDeR_3QyzuDi^A*%&96Jb
z98-E5@8gKh6})PSp98N}jiQqc9cu$<oXoGoVeU#}BIki>62lTUXJ22-;PNw>k*h^5
z^e<IBAnUj}<#vG?X;j?0B*qoHLxY<{4U@T~B+T_j5{sT?-jtn8nPUsBMiDTg)r@3q
z0Ff!&9t?4A8WY)eh;T_LcNH*8wz^u5uQ-!`Wd2YGr<W@3P;Ond>E$NIjl%R=&4@0f
zJINZRaDPdN(>%p%Y99F1^NDO}o!}$_N}2D`><!=no(={$HjTI20Z%3)u~rXgYT}HN
zUvR&m)x)`^id%u8SG$h(dko&I)eNhIRZWw5Iuy>(V`hisquMBEJcpik1;=l_7h!d{
z`ANl(0n7*n7}O$?9EwCpH;@TQwlyA{nm*)~@b&ST#bOcZXeN-5S6|NxwLRPBlwNe2
z>%b{~KZir&M~f)kdpwP%nz1&3rm4Ig3No;TflU9h!pZlVi<-%@AkO2LO-1jZc)tVo
z$|1Yg2PI8qW{_E7n`}Ctt)Xo9vF>}0%oh0@z<-+!AW2y)QwG}!#7MjjITL|5I_Thf
ziG2ZZKn^6?;JJOf^8a-y%YlsC&e^oueg;^Qu>mwO1h@4o+4gqG`=IGH7;XLgDZo)K
zOyz4{@3Pj*z}LF8>*MhMVM6L>X<PD~J++<zVh{1Ef+Jd}eg(u_cnEdzPCFe;yf%n`
z1{SpSC>4p{k-#rqXv=i&=Dd~vchjwqb25Npp8^`E@Mt*12`%0E(#3L9``g*&9?NAT
z)6!J#zl45A2Jv28>Cyo?-iiMt6J*d$Jo?!NP<%f?<5X@A2a(k*0l8*?)Q-s)@3g;{
z{}Tgo1L3r)gIa*hes0%a_04O#-@$j70sO=TST6yMlNlQhGoeLpw>^N<n7Pdaxi*Kg
zKK|O}OL4P{<kHg{*cIaUmOYv`pyEN3TlJ)uL2!kK{E;2F42*nz%YiR|&w#HT95G%t
zDRjlN;p7LAHQmWKnA{6^(N6xJF#~AL^1x`eGi@$-)&@{LiQ%0}c%g-fC`YC;Q;<`D
z)1E;7Pd0~6AnW9rId;f0sB#4&Ypv{zi{(j>eu}}1^ZGv?)AV(~4i24>Dc?<B>r9o{
zjF({m(HPT1Co{x`inRgM-_LhS%UIaLWJQi$s+%NLE<fZl0{Jq3m9i=735;kSc-J@?
z8&&wgl`nQF@FXxd<uoLhxkp<LzSo8?lbq-(BO)Ub;o9)2{NAP~)&{WZek!*vOWC4`
z)!N4T$n@(LyCM>~8HgN}-U9}^%px{DF9xne2D}K2vK)LdZuw&avb1cU-k`pLBg;?Y
zH5)S41|TtN?4EMY6v4l-VcCr9wkedKbIk-kSZ(qqxu$*FbwAk|`GB@g@7abrx_3Q;
zwKn~=HUJ^6ABvw&6K&;RauV<Zxt0Qh`vX5LH%XgZ2H@rZ@)A^T5;E@sEPVjN!j}QW
z9%Ox5<cjQ;{eW!NGQ$_7Q@#S6{Rq&8ZJd1kxx9Q{qV1S|U#g)#Fv`^l?@G;=0Ys)U
zD;VUU7OJMc04FhI=Py#oAGZ^Nmohri@AAbby?eI1{?vYEp8#fuPEHvUL!J0CfQBjj
zsU(ElYb8L=%yLoT2V_GiOM%xVkssRawT<`zWbj?%gggXyH~}<7_-)y#+-%!rUj|S+
znM2CMyw$=?Zn0L{vTnwgf#1|&ojyg+t64relVvg^nxMXxUCPglyRNLjmjSH2lg`^z
zrG$a_-3ZDq);g8Js(<YpS@r<Se26GMkjyLhQ3U)%B>OS|5jiV2z}EJ}HER{W>O)Z-
zp^0n`#hGLS;_XZwxhA6O7w&0exk&pmfHlyi+eFr<Sz%^iNG`5UM;IFg{IB7Pt6N;m
zCg2nZG8dw^Ff9~IxurFs<@*?@SfVbVcUp9d>6*6X%Xc0c)0x0w{f`Hge+V_2?{$U`
z497l>W<3Km!Wm)3eeuC>y%bK|rg`1nOVXCxg^!KY|EsuiDv+5p7xZ%Qll&ralNt8~
zXggnkl>unENLBHuH5E@xkodh+$Q2wSSHTWJjQ^`+>APQEGihcJh}<luL>omEH-}^V
z)|9`M0Yntf1>r|6#3eyIm4aM`I7PCE$It0%)KtpN4bM%Fa_cEE4yhoQV>hM$*9uMN
zo{1bHPcSxsYUtTXWnBA6=DN5fli;+DxkRseO18NpIK^2w9h<KKK1o+r6#gC3DWUs0
zbZKk=QN_Xld?$^TgdUucK|S+0C>Fb^?&~|c5oPK!^Y|zIlW1dyz|lHQ?}|h$Q%*24
zfOW8IR}~MAN(ZNXKx%-<mQA0R{&WAH>L_w>|HfT$5-#TeG59p7Gd@@cJR<{$Di#G`
zH%CsBGrn-yl!)DJS@-iB{A6pXxh4bc^f5gHOmk;br`fT>!_DMr05z~(h01X_IS)9{
zVHt3mt_q`)&5w%Qw#r^BbF|KBPAGBFNDST&YQCRKVV(vMQM?(1LtTl;8ZSv4sUTCA
zL00hQH<CVkES|#5TxnVNW&QVnRhr5k&e;d?mN^aJT?ikLIQQp<%;TUJ{+8eK*T6jB
z25&M=im4?rPIbe~X#h<yE~L2HlZ|BX?BR)Jj!?cm9C#=6JQ4yWP_qQy{SAC05tr>8
zMBaXPz)mMXung)}z(?1^A}Oj;zzTGK02UkRLM!cFH6*72#1wT#6*?q5`A<f|cq0vY
z9(w)I8E?Zvcy1rispUw#NwyircEjQD=ba~39fOw-h1G8tMx2w)?WsXCybS*3#MspU
zzJ;Btl&5#UmFCm}glZqV7&<#;Jf?^qt%oPJ0{Oc=!5$aF{uwSgC;6ry1IzxIpX73V
ze7QM^7<?Yo&Zjt61852`Eu<M~%tkVI4l~BiMm*@Ru$vGufW~j(iDH)nG>{{S(qk|T
zoo?P>S|^CO<$N2Ek-#rWM6m%)*r~{+s{v>g&y+K-(<9fEf3=Y)1y=>(M9Tu4b1#I2
zxA<gO;ATH>gn&gp+R`Us#{c;j!o~ZSi(sSX=cQ!VZFV$(8t7G_d;}}`T?V=z1j8&#
z4>oOt$J;?9Y31&4%%^sP8Eb?`ea61a_Q!Qk?=D6RJ_+jVt-7NDGz7T5M01H%ucT^_
zI41l+ui-GHHQ&^XgocN$O5&N3wZ-Z^0uFuLu9a*EA2FX?vxq+eJZHyJu$9g}_B$Ft
zOtDI3B_4S&{97K*pVIDdyyZI+vWCi9x~ZY--f;AMJ1J_uf~Oq{{FqXa)1)i|mZ!=M
zn!a6OQ7W4(1Bkx`pmG)_$rf`@u**qx=&4MjGM$>j>|ev8toJHRTNf5@<OT>^gg3u<
z0Iap$#bt;r2Z=}Rx)D*_8jhvKab-^l8=!Bc%DiFrU?e_{e3xU{L>;pTDtd!*nA+v+
zU%v{LJp&((hdMtQsdfsp!rtMhu-7F}wI75eX4_$MjW)o?H^4mc;^YZFW&sV$13JBc
zM3$6IaAim_-dH>-St?b%3JwaCM7k%-cNCmKkqI`dwwQf*0(i=*8(Ch#ECYxtJ`BJ<
z#$?4Iv9~ey7Q{ko!0<vSmE~GZ*X}8Sd)a#c70*~RyUUZ-Mi0jnve#Q^rD@<V!29Mp
zY0&(j3|>jLNHYNI4WL{Sk1=QNgjsb4G(}<0?cm}c!-xS8YzL>i{Cefy`im8C(L?au
z2hb3K3c2f=lm|D-Hnuo^Hz_8R#5mv40KSE)DrHgdCC|;@f~By}W!arSWH*?09`tHQ
z-rhWhDBkqRS#avTu+bqSc=bKd-Qp0DC5zNfGW0A<#qywLe@6qTfqoT=*+!ieM^?PR
zyMMUuDY!g`59K>O;g#RP4jnjq__;YS;x?$y;pu+)QW(0Qe?7+U`3#q04I2WwH9aS7
z36Mt`%2ZamhqGkzV!+Sx5E?k`ZkW`XWbR6Az^(~H=;ZuLMt(vRsr6^eVc?ap+Nly~
z2G5CS!0CtQAxK7YhzF&Z(yezqX$H_3;P$Z2cn!pj+P(Q__nv$QJot`z$A9w!xJ}Za
z+A&0;F#I}r^&@j3C!P+cw^m;^Z<vZH(ZRXiZAit{t*PW`2GFE<F$BXrC6G9Oi3ZLS
z&YuDkUa}(+4#JBU!x8)1wQCFPNw34{6Rkb8JaYjYWA)aTLvO?%AbtS@ctaCDy!knb
zOaqt~0&mqyb)c~ZoIFte`U;HkxdYyJdzf_%l>59?%U}9d3hQcMze{1MZN0>15(}<_
zy)sk2Yz54bBalhzBTePr&4Hq61`tzxsj})%I!GevNFISZrt<H49xS%J2TG-V&o5xi
z4@|ig9`BZa!i91>=Mzpn1SX&DvvFoK!!WUGO%HjuNSdb^Kvc0JkSMF18wwl+Jn|NJ
z!q?;H2{8xvh3Rf3*}eLb$L~j61FyFh&9$a<=P7Wu_kwFqS1$0q(#xf=t7fNe%_S+)
z9YHGo3~KJvx7>4BzftYohxtoj(ABWsXSFdoGA=X-$@7-P45R-Q@E_Z<IL)N@*&b$&
zhb~qx0~^ToG++{%pxIS5#}wNeK!MhOx9&{;2u`>iR+v1PkU?bRfiSJb$7P@}pD5!V
zgFi}ImL+_DM|kQ&*s)l35~N(;MFv8-89-FAGT>FlK^T0`fJvSxYc|5A55v@%30JWx
zthooe<>OWJU=)o(NY+|Is4Roaehk0;F_c<_4H}Y9M>D(}TBq50tL6f~nR|ex0k2XH
zGX1-~3g$~{??z$__rC`Bz6M{cX}%$LX?E35;SW+qzDO{0Aq<jDunWjN#=bki`NLr3
zK&WWzQ;NYxaHXc_wjg=j>6^eN#ez`oSMA`zB5BrwY;6O`J;IEIF!xLNdM$C!#zDKn
zRU<vVG|AkNpp!0pK&PD{Sds`Xsa_1#pF@Kb+s++pCFlK@=R+g{+f~8$c7}nw!!A9c
zWK-8dkQ0T+@|k)ioHheQ6t4xr-6>fB|G&jJ7YJ3scEe!5tDxHfAR*{pAn}IZyZ|3w
z1?xWa!fs!`OVt)HFQleaHNQ}p=?b10)|~Fzqe7;D6<ckg3K%#QdLN%3CyC%)bT`bs
z0Ae<8<K)NIcWbE^;I%<@a|PGK*ix19AXKIlx!%9?Epee6Di}Bg`dIALOhs5Y0p_;B
zF~d|ICp<~7$Q`1W78aIy8+d4$;!RinXF<xd(fNp3oVF5>IeZQTintI<PNF2J%6_3e
zf>a!Bt>d00p@!OkZY|QAW&j(ZM`xAT9Xi4vo!_f%7kb$1GWcF*rHUd-_MczDXGQRc
z<twsBgivONP-aM2kVH<PGu+uuD}4@p0Q!v1S9SL7CGY=zhma<FN`-475l8O3IHHQl
zp;&8aNvEJt_oUE#vVRKK#dJysKMXs|J8hc?=3NQ%y=!Q+nRFhxgLRq_74Y|@JWgTZ
zUj!T<CI|c`e-^9v`~4C2F@Gj65{dBj*IyHh<$94hA#A5ko!EBUj8_@l`tiom@Lwqm
z(GEad7&-R8)tYT9Q=a$8GJr^c+k<XVL9hN0w*L`qeF${k2||^iLWu;9IB1Y#lWdgg
z{tK(#hNVxyiZ>u)5F2Hqzip3%BU_@IJzL&&*Ik@*jz##a+=_MU##di`Md!}B9ye}g
z{dg5L$pTzJkZh^SzR+U`Y;$np-=$k8O3#SSqm9tCE>S{f-3JMMuazJ~xfF1Llp~;E
zWEnsW99W^^52I#-IKo>7+p?oN0{?vx-n$s2)Jr}Ptbh~5pj^uvq)~5dY^1c*pHEf>
zf8$1jSgX3_@TAqVy$%|Xl-vQZ?^Uqv5WAWKNotZw<q}t~VSPZSKg;Qq94ZyTojo4;
z7(i-wB|rXyaq#hto^Dr1J25FGlhW|5x8CB=L)|OgdD-H!Wy|Q*OX{?Hz<<ty&m>sV
z63TkOfJx1@k<5(Rm4o=FOPp_=niP+e#5gInty_9{jmmzO5E^PBT*#XsoiKz278R!Y
zoRV<#Sitn@(-|_v>P_V|>Pwd{WrrP1%AIR?B$QYNO`y|GaKtN6>0E@>ghUq3$`#O4
z9u>-lI?aFzNUOx*XaJ1?9t>-T7jQp+5Be10E?BZ=UmgT&J;H({YdBs?#_lW0*8q%X
z0MWULw=hr&N4}O=*9#5L{2h*SxenC?RYqxPM@?>oy*euvWXbmDbKufD3N3Ogy`}$v
z8999SGEMGc9~Yjl0W4p>-26l!8{voL!pY@E(Z>vCrSOqQ!{4({BpOx(G+9%F>!+j>
zMIzFF?_CLB`3Tjq=|ST<c&c~ysUcVjC-^H3w`9o@cG@Z9t#u2TYHMpLFSl6wq^RYm
znIDRRqux$z@`?#vN})QtxNAgnaTp|(G!0x0Afk9Xh{K};wd<g)*bo0`cy<rim{NQx
zPlr!QNeN9&_P2S#U=Z;iSV3m_ns8V6=`sivxung8bx<V*8?wRe6%khha6Jx=KNbE^
zfUFP`jlOg+tbQkPhi_X(E`$D?Z@$T4huIf0y!`UZx%OJQWVZyF#cIEX&bz>|^3;Oe
zzQvMT0)5;C@TXg|nrc`Z(9Z9(=9Ee+#Icy3tSuL94N>PZF21DpXe34;HG}ud5r<{S
z_x9UwXY5$>jFv84y0Ct|Pv_2;4<%{@|46Djw-Ho?9kWoIG-s87<M}kF0W=1f64nky
z$#1&=&b5B0*uNH}K9ETyj{%37GiNe*@L*4Ou(*O(uU<`Ana_+=ISM+}Ix>*a7s`wm
z;V_pP%bJk*4V~!bGyvCn0Wv2v)ProyIv~hh!06GVdE^o2l%C<khx7dN&!hZ$JvW6;
zq`<(p+3xlz%m`@)yNTqvFhv!M15Sxx#~%cbTUPhn6pG2gv!S7ZOE0~Y2@@v7v5r3a
zXeLdX#5UU$D{#L^3V8BCINtdNC^ZYndIpdNHL!n$VveKe@4W=y-GqsG1=45oOSeAm
z6^MUcWMa`o7<4q-@8EX!Pvz%10|;_Vu}(QX`dXr(rmn*-1xZD8XahKYC_MS9qYc$*
z4z7Tl6&Q>RpdN;nDqeQvvj2|ouDoj0aiPN+z}#1%-%v-zJKg;GS^|=dVv27S=~sy@
z1TPu|H?)I{5g#_VVZ#Qxc1<|8)~s0*j{)cq&{PAJTS23<bE{4>r~+ns^~GogXx<CB
z#|a3+V|TzvyMPNX;fnpc1bghfb9&L{M<0EZ6HYjx*sSxUuc6;QFxNQ)M8h`$jluo3
zrF$yp1Cr9Ew_k(-g-m$2)6?R`i`i|r^sCk5jysO?&O49F%F6heJ{%4s?p=Wc4mf~y
z>(-?)k>%k1_ur4>1OkDUzh$QA*Dt+}%d^iu8$UU;Ib1vjZgPK}W4&hAD#ItGjAsDp
z<OV5cr^sE;WB$Kkul{YWlO)5rbLYkfwk@E(zTS7Fk#G4Pxd%qMycbK{+w)pTBPl#a
zU}XS8F%saOp!TQ_I&T*2BZUMu4Wv47<li%9%-~-y{filI&fwEeKV|LOwMdwl);j(t
z738azSwi*&efspFfB*gr9XgZ+3l<>v0!fe%GckZRg&EJmVL#5rQqR$p_QNHj%b}&U
z0SFDF=j7gb9s2u^!pTRm;=@mk<I5amKeX?>^G?n^_uQ7I#~ynuPd_asIob&3ybcHE
zt|eEmIl0_2f7_P<Y=pf#E4-h{czmj>hpL!r`~36InKf$`qehL2vq?38lF|}%Ed8rb
z&KRkGuUxf~E|sm1Ac(i{{PPoef$zNY4t@LfZMzf0?AM@w?pZws3xgVYy2A>589?(=
z@YkTm`<=HdFNG_wvl6Nh$aQsfR8%C2@T3~R#QP^Q_BUgB>Zzv~G-yyf{yzzFQ8Z%2
zh<Nab{9BfTB;0h<O<Z)*MeMofo_zF?SN?S&deBVc<)>lTab5)VXPWZeiC22J0^bH8
zTw;oq%B!S|APzemUU<z)utFeLRaM2WbLH~K?PBNNd++6}v(Dn-hacv|6Wue6ZoKhE
zF1h3qX3w6Tbs8vytXVYV2K2tW;4JU!>w3+R<={)fc^SY;=)8@J*Q4;Jv+dTf_$w$c
zbZIPi^*`{y1DtZoDMX{uw68g{h5Vj88oE)FSb_^LywF!vk+p$HMA128;Xdzb+)>5-
zp%`aa^Js41J#ZeBYvGV`g+a+@F%tzdXTX3%{K{+H?x>@V;-!}?>(RP!89#nJ@~5a!
zw+0Rz3<k?g3>F79yXGTL-UcAdo8a=0!aQzj%$abv-)Bbi>27;&tKpLm;JXL8x_48h
z*HEuCo!tUGOnX`o0}y7B0MmjtZw+_v1|KhktvlG=yQyYv@FF$vr|aP=<FGfqUemn_
zi^n}&<SCc|#En2PD+qQTpsU8gxOS9YZ8LCr<7!yF6uy5jEL&zwZKGz7E?7S8*A@mK
zJfez)0r-w_Zv=6xt}y3a*tviyQdR<N0_3J@_{**E`*Bvx>ofx^;NMn_av&FU21xRW
zC>8~Aey={K;6ME#JoYq%id|B(Q0ntRCl-N)^Wcypz%t^vS~H{)EZ(X2maixVAZ%lb
z50%aPgGpKCq;Sh0VQh{{N8bHvhZqu~u^f*58O$&{G^KXJB)Z2>r;BC)&3l43f?%JG
zA&tvRVA^CjdJ~p^@uN|vHg&7vyvtys_qpDoxvtjiT?ro-N}N<WMKyr95d<)E8N2na
zsuTQuG8|sS0>H)4tR#olu7TfQ0~2oZ%b~GavqSQ62fsvewJW*-2=hibEv)i<WUfm&
zOu7Y*JF{&QE^M_fF5GqB!1<TK0}thFEmu-*1EAq+rRk%Z-}bQ;!xX<w3_yfwewAEO
z&hx9{7!JYjPKV2`htgsvshX-$ykXVw@qGB@+3?<bo&zrkZpx1;9t*|zxdnIMsBLBd
zBB6#*Oz}a$t0K8+clz%Mci)o8O=!zBtfYKW>Sp~4m~b!La1(e0h~)a>lO!87KPmIB
z_G_vkPrNoYfTT2yFgBd4Cb6g383-~foHz`|T>-oFOH?i^7DVb`!%BGYak%zISh+H<
zuRYmV!;+Pny?VxTaoP?xi2+FWB=4}RVx9ue2h)<_8%Dy0LNMe&IDZTbJ_<T*lZQcQ
zkO6Pl2p`UeJO2hxJ_WV8AL_M|SJEss7nDJEUUwVVfssy&DMurm5?1kND2-%EjpZ?F
zAm!n{yAK>Q42~EAyY+=GTS2HaQB+!D0%hYS4w^_q!a1|(b9j9QJof_3n+FZnaTZ1@
zlZTvFXa@B%e)`#ntQC@x4y`EqK-Lh52ACRjDokZS&)O)GG?UrCaRRwt2{91E7)2g%
zuG1Xe3FaC%DiUJ5Fo0y=R!Odl;#uF$qarD(P-HbUG-*yMg?|)^X1;XVl>sC>vlhB`
zQA`WMQTcYTJ+#+Q-K06SJq>)zB-kDl<R-%cDCryE+K@)VaSa~(X<xmG!Kd|_lRDv&
zUf&MHZI?5ElU^kBtW<Gt0QPPNdUF*aKFup`T@&N#O}V)<)lr8rfMkcH6mlK>q*QTD
z!5m7a+H%1YuYXK2wIRmUo#2~1$+c<o4rc(V+R>mkLf?u2=LR%CQzj2z7e>AEnCa}O
z=C+maOmFb{;&EYw$%jgZHUOuNO9E>t3<?JLiP9XRU`GW~&B{+-rSQtPF_<6KywC{G
ze*&M_<lf~oIBn6^k5bw~u7dLrU&A+07J$xG(76t}R6&UtMs4DWi`sJ7SPvVvN;qaB
ysx6%Z1@EyL!Og}1%+#^@VQn#h&2P-pdi?**ZZQ05ShMH=0000<MNUMnLSTZRl{Pj2

literal 0
HcmV?d00001

diff --git a/cw_core/lib/crypto_currency.dart b/cw_core/lib/crypto_currency.dart
index 9d586c85b..86ea3f214 100644
--- a/cw_core/lib/crypto_currency.dart
+++ b/cw_core/lib/crypto_currency.dart
@@ -191,7 +191,7 @@ class CryptoCurrency extends EnumerableItem<int> with Serializable<int> implemen
   static const nexo = CryptoCurrency(title: 'NEXO', tag: 'ETH', fullName: 'Nexo', raw: 76, name: 'nexo', iconPath: 'assets/images/nexo_icon.png');
   static const cake = CryptoCurrency(title: 'CAKE', tag: 'BSC', fullName: 'PancakeSwap', raw: 77, name: 'cake', iconPath: 'assets/images/cake_icon.png');
   static const pepe = CryptoCurrency(title: 'PEPE', tag: 'ETH', fullName: 'Pepe', raw: 78, name: 'pepe', iconPath: 'assets/images/pepe_icon.png');
-  static const storj = CryptoCurrency(title: 'STORJ', tag: 'ETH', fullName: 'Storj', raw: 79, name: 'storj', iconPath: 'assets/images/stroj_icon.png');
+  static const storj = CryptoCurrency(title: 'STORJ', tag: 'ETH', fullName: 'Storj', raw: 79, name: 'storj', iconPath: 'assets/images/storj_icon.png');
   static const tusd = CryptoCurrency(title: 'TUSD', tag: 'ETH', fullName: 'TrueUSD', raw: 80, name: 'tusd', iconPath: 'assets/images/tusd_icon.png');
   static const wbtc = CryptoCurrency(title: 'WBTC', tag: 'ETH', fullName: 'Wrapped Bitcoin', raw: 81, name: 'wbtc', iconPath: 'assets/images/wbtc_icon.png');
   static const weth = CryptoCurrency(title: 'WETH', tag: 'ETH', fullName: 'Wrapped Ethereum', raw: 82, name: 'weth', iconPath: 'assets/images/weth_icon.png');

From e34ba6cfbc3b63fe421003b12a4f4e4fad6fd508 Mon Sep 17 00:00:00 2001
From: Omar Hatem <omarh.ismail1@gmail.com>
Date: Fri, 14 Jul 2023 20:18:46 +0300
Subject: [PATCH 3/3] Update app versions (#998)

---
 assets/text/Monerocom_Release_Notes.txt |  9 ++++++---
 assets/text/Release_Notes.txt           | 11 +++++++----
 ios/Podfile.lock                        |  8 ++++----
 lib/utils/exception_handler.dart        |  4 ++--
 scripts/android/app_env.sh              |  8 ++++----
 scripts/ios/app_env.sh                  |  8 ++++----
 scripts/macos/app_env.sh                |  4 ++--
 7 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/assets/text/Monerocom_Release_Notes.txt b/assets/text/Monerocom_Release_Notes.txt
index d95478116..6b5d8affe 100644
--- a/assets/text/Monerocom_Release_Notes.txt
+++ b/assets/text/Monerocom_Release_Notes.txt
@@ -1,3 +1,6 @@
-Enable iPad/Tablet separate layout from mobile UI
-SideShift update and fixes
-Bug Fixes
\ No newline at end of file
+Improved edit/delete for nodes and wallets
+Wallets can now be renamed
+Accessibility improvements
+Improve Monero wallet rescan
+Additional exchange assets: SHIB, AAVE, ARB, BAT, COMP, CRO, ENS, FTM, FRAX, GUSD, GTC, GRT, LDO, NEXO, CAKE, PEPE, STORJ, TUSD, WBTC, WETH, ZRX, DYDX, STETH
+Cake Pay is temporarily removed, see https://cakelabs.com/news/cake-pay-mobile-to-shut-down/
\ No newline at end of file
diff --git a/assets/text/Release_Notes.txt b/assets/text/Release_Notes.txt
index 38e3e21df..01e7da1cf 100644
--- a/assets/text/Release_Notes.txt
+++ b/assets/text/Release_Notes.txt
@@ -1,4 +1,7 @@
-Enable iPad/Tablet separate layout from mobile UI
-SideShift update and fixes
-Add MoonPay sell
-Bug Fixes
\ No newline at end of file
+Improved edit/delete for nodes and wallets
+Wallets can now be renamed
+Accessibility improvements
+Bitcoin transaction bug fixes
+Improve Monero wallet rescan
+Additional exchange assets: SHIB, AAVE, ARB, BAT, COMP, CRO, ENS, FTM, FRAX, GUSD, GTC, GRT, LDO, NEXO, CAKE, PEPE, STORJ, TUSD, WBTC, WETH, ZRX, DYDX, STETH
+Cake Pay is temporarily removed, see https://cakelabs.com/news/cake-pay-mobile-to-shut-down/
\ No newline at end of file
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index d5453bd06..5c6ed30a6 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -126,7 +126,7 @@ PODS:
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - permission_handler_apple (9.1.0):
+  - permission_handler_apple (9.1.1):
     - Flutter
   - platform_device_id (0.0.1):
     - Flutter
@@ -271,12 +271,12 @@ SPEC CHECKSUMS:
   OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
   package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
   path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
-  permission_handler_apple: 8f116445eff3c0e7c65ad60f5fef5490aa94b4e4
+  permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
   platform_device_id: 81b3e2993881f87d0c82ef151dc274df4869aef5
   ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
   SDWebImage: 2aea163b50bfcb569a2726b6a754c54a4506fcf6
   share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
-  shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c
+  shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
   SwiftProtobuf: 40bd808372cb8706108f22d28f8ab4a6b9bc6989
   SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
   uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
@@ -286,4 +286,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 09df1114e7c360f55770d35a79356bf5446e0100
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.1
diff --git a/lib/utils/exception_handler.dart b/lib/utils/exception_handler.dart
index aeb81fb66..ce988bf4b 100644
--- a/lib/utils/exception_handler.dart
+++ b/lib/utils/exception_handler.dart
@@ -132,9 +132,9 @@ class ExceptionHandler {
   static const List<String> _ignoredErrors = const [
     "Bad file descriptor",
     "No space left on device",
-    "Write failed (OS Error: Broken pipe)",
+    "Write failed (OS Error: Broken pipe",
     "Can't assign requested address",
-    "Read failed (OS Error: Socket is not connected)",
+    "Read failed (OS Error: Socket is not connected",
     "Operation timed out",
     "No route to host",
     "Software caused connection abort",
diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh
index 8e4a338ab..e90d26406 100644
--- a/scripts/android/app_env.sh
+++ b/scripts/android/app_env.sh
@@ -14,14 +14,14 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
 APP_ANDROID_TYPE=$1
 
 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="1.3.8"
-MONERO_COM_BUILD_NUMBER=51
+MONERO_COM_VERSION="1.4.0"
+MONERO_COM_BUILD_NUMBER=52
 MONERO_COM_BUNDLE_ID="com.monero.app"
 MONERO_COM_PACKAGE="com.monero.app"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="4.6.7"
-CAKEWALLET_BUILD_NUMBER=161
+CAKEWALLET_VERSION="4.7.0"
+CAKEWALLET_BUILD_NUMBER=162
 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
 CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
 
diff --git a/scripts/ios/app_env.sh b/scripts/ios/app_env.sh
index 114c9191f..52cb07183 100644
--- a/scripts/ios/app_env.sh
+++ b/scripts/ios/app_env.sh
@@ -13,13 +13,13 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
 APP_IOS_TYPE=$1
 
 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="1.3.8"
-MONERO_COM_BUILD_NUMBER=49
+MONERO_COM_VERSION="1.4.0"
+MONERO_COM_BUILD_NUMBER=50
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="4.6.7"
-CAKEWALLET_BUILD_NUMBER=159
+CAKEWALLET_VERSION="4.7.0"
+CAKEWALLET_BUILD_NUMBER=165
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 HAVEN_NAME="Haven"
diff --git a/scripts/macos/app_env.sh b/scripts/macos/app_env.sh
index e05172bad..b31a5a973 100755
--- a/scripts/macos/app_env.sh
+++ b/scripts/macos/app_env.sh
@@ -15,8 +15,8 @@ if [ -n "$1" ]; then
 fi
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="1.0.6"
-CAKEWALLET_BUILD_NUMBER=25
+CAKEWALLET_VERSION="1.0.7"
+CAKEWALLET_BUILD_NUMBER=26
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then