From 2dfb3ab8388bd9f64416012f0ad41b6412955290 Mon Sep 17 00:00:00 2001 From: Siddarth Kumar Date: Mon, 1 Apr 2024 16:26:44 +0530 Subject: [PATCH] upgrade nixpkgs to 23-11 (#19369) fixes #18311 This PR upgrades `nixpkgs` to latest release version of 23-11 ref -> https://github.com/NixOS/nixpkgs/releases/tag/23.11 - `Gradle` from `8.0.1` -> `8.4` - `Git` from `2.40.1` -> `2.42.0` - `Curl` from `8.0.1` -> `8.4.0` - `OpenSSL` from `3.0.8` -> `3.0.13` - `NodeJS` from `18.16.0` -> `18.19.1` - `Python` from `3.10.11` -> `3.10.13` - `Clojure` from `1.11.1.1273` -> `1.11.1.1413` - and some more stuff - `xcbeautify` , this was added in 23-11 ->https://github.com/NixOS/nixpkgs/pull/289446 - `idb-companion`, this was also added in 23-11 -> https://github.com/NixOS/nixpkgs/pull/296440 --- ios/Podfile.lock | 4 +- ios/StatusIm.xcodeproj/project.pbxproj | 294 +++++++++--------- logs/README.md | 4 +- nix/overlay.nix | 18 +- nix/pkgs.nix | 7 +- nix/pkgs/idb-companion/default.nix | 29 -- nix/pkgs/xcbeautify/default.nix | 36 --- scripts/run-ios.sh | 3 +- src/legacy/status_im/bottom_sheet/view.cljs | 12 +- src/legacy/status_im/chat/models/loading.cljs | 13 +- .../status_im/chat/models/message_test.cljs | 23 +- src/legacy/status_im/ens/core.cljs | 10 +- src/legacy/status_im/keycard/fx.cljs | 4 +- src/legacy/status_im/popover/core.cljs | 4 +- .../status_im/ui/components/action_sheet.cljs | 4 +- .../status_im/ui/components/colors.cljs | 18 +- .../status_im/ui/components/list/item.cljs | 12 +- .../status_im/ui/components/text_input.cljs | 7 +- .../status_im/ui/components/topbar.cljs | 5 +- .../ui/screens/browser/permissions/views.cljs | 29 +- .../ui/screens/reset_password/views.cljs | 4 +- src/legacy/status_im/utils/random_test.cljs | 5 +- .../animated_header_flatlist/view.cljs | 3 +- .../components/avatars/user_avatar/view.cljs | 5 +- .../gradient/gradient_cover/view.cljs | 7 +- src/quo/components/graph/utils_test.cljs | 3 +- .../navigation/bottom_nav_tab/view.cljs | 8 +- .../components/navigation/top_nav/style.cljs | 3 +- .../buttons/record_button_big.cljs | 5 +- src/react_native/keychain.cljs | 24 +- src/status_im/common/scan_qr_code/view.cljs | 4 +- .../chat/messenger/composer/selection.cljs | 3 +- .../messages/content/deleted/view.cljs | 3 +- .../profile/contact/add_nickname/view.cljs | 3 +- .../profile/contact/block_contact/view.cljs | 3 +- .../contexts/profile/contact/header/view.cljs | 3 +- .../contexts/profile/contact/view.cljs | 3 +- src/status_im/contexts/profile/utils.cljs | 3 +- .../contact_verification/view.cljs | 5 +- .../components/floating_screens/style.cljs | 9 +- src/status_im/subs/shell.cljs | 6 +- 41 files changed, 287 insertions(+), 361 deletions(-) delete mode 100644 nix/pkgs/idb-companion/default.nix delete mode 100644 nix/pkgs/xcbeautify/default.nix diff --git a/ios/Podfile.lock b/ios/Podfile.lock index c5127be5d2..223ab8e30b 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1459,7 +1459,7 @@ SPEC CHECKSUMS: FBLazyVector: 56e0e498dbb513b96c40bac6284729ba4e62672d FBReactNativeSpec: 146c741a3f40361f6bc13a4ba284678cbedb5881 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 - glog: 5ce14391bd2885c921f691b0abdff44138728fac + glog: 37f1918ec8d57cbace2b409e117ef06bade68a64 HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352 Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8 libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef @@ -1554,4 +1554,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: c9c6dfac28e31314e1a2ee2dc47364ad151f13f2 -COCOAPODS: 1.12.0 +COCOAPODS: 1.13.0 diff --git a/ios/StatusIm.xcodeproj/project.pbxproj b/ios/StatusIm.xcodeproj/project.pbxproj index 54a38f3247..b007ab7412 100644 --- a/ios/StatusIm.xcodeproj/project.pbxproj +++ b/ios/StatusIm.xcodeproj/project.pbxproj @@ -8,11 +8,10 @@ /* Begin PBXBuildFile section */ 00E356F31AD99517003FC87E /* StatusImTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* StatusImTests.m */; }; - 061AC5E3D44813C6D987FC70 /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C5D722CC6309CA4C8BC48244 /* libPods-Status-StatusImPR.a */; }; 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; - 17F5C611511E64ACE76B00A3 /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7AFB8653840373E5B625E16E /* libPods-Status-StatusIm.a */; }; 25DC9C9DC25846BD8D084888 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */; }; + 2B6F8F28B81E862D44C8723D /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 87038678EE47E8EF6E93EB54 /* libPods-Status-StatusImPR.a */; }; 3870E1E692E24133A80B07DE /* Inter-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 693A62DB37BC4CD5A30E5C96 /* Inter-SemiBold.otf */; }; 393D26E3080B443A998F4A2F /* Inter-Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = B07176ACDAA1422E8F0A3D6B /* Inter-Italic.otf */; }; 3A2626CF245C3F2200D5F94B /* Dummy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A2626CE245C3F2200D5F94B /* Dummy.swift */; }; @@ -37,7 +36,7 @@ 3AAD2AD324A3A60E0075D594 /* Inter-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 693A62DB37BC4CD5A30E5C96 /* Inter-SemiBold.otf */; }; 3AAD2AD424A3A60E0075D594 /* Inter-SemiBoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */; }; 3ABC7AF8245FF85900612C45 /* InterStatus-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 9C76AF5A418D4D65A4CAD1D9 /* InterStatus-Regular.otf */; }; - 536FC260A89500EC9FDB1585 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F311917BE57976CED3B9842 /* libPods-Status-StatusIm-StatusImTests.a */; }; + 42AC64E4D3CA4E676400C598 /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D2D9E4943562065BF98E304 /* libPods-Status-StatusIm.a */; }; 57C854A7993C47A3B1AECD32 /* Inter-MediumItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = C6B1215047604CD59A4C74D6 /* Inter-MediumItalic.otf */; }; 65F6941925780A4F00A45E76 /* Bridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F6941825780A4F00A45E76 /* Bridge.swift */; }; 65F6941A25780A4F00A45E76 /* Bridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F6941825780A4F00A45E76 /* Bridge.swift */; }; @@ -47,6 +46,7 @@ 715D8133290BE850006F5C88 /* UbuntuMono-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */; }; 74B758FC20D7C00B003343C3 /* launch-image-universal.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */; }; 8391E8E0E93C41A98AAA6631 /* Inter-SemiBoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */; }; + 8CF1CA9463A4048F97BABB82 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 466C47BA171B53CAE0AD6A19 /* libPods-Status-StatusIm-StatusImTests.a */; }; B24FC7FD1DE7195700D694FF /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FC1DE7195700D694FF /* Social.framework */; }; B24FC7FF1DE7195F00D694FF /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FE1DE7195F00D694FF /* MessageUI.framework */; }; B2F2D1BC1D9D531B00B7B453 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B2F2D1BB1D9D531B00B7B453 /* Images.xcassets */; }; @@ -108,37 +108,39 @@ 00E356EE1AD99517003FC87E /* StatusImTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = StatusImTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 00E356F21AD99517003FC87E /* StatusImTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StatusImTests.m; sourceTree = ""; }; + 0C331FD392B615DDAD0997F5 /* Pods-Status-StatusImPR.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.release.xcconfig"; sourceTree = ""; }; 13B07F961A680F5B00A75B9A /* StatusIm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = StatusIm.app; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = StatusIm/AppDelegate.h; sourceTree = ""; }; 13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = StatusIm/AppDelegate.mm; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = StatusIm/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = StatusIm/main.m; sourceTree = ""; }; 1426DF592BA248FC81D955CB /* Inter-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Regular.otf"; path = "../resources/fonts/Inter-Regular.otf"; sourceTree = ""; }; - 1E0A54C37353D912620563B4 /* Pods-Status-StatusIm.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.release.xcconfig"; sourceTree = ""; }; - 1F311917BE57976CED3B9842 /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 2756A97EBFF084FA94990AA5 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.release.xcconfig"; sourceTree = ""; }; + 2D2D9E4943562065BF98E304 /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 3A2626CE245C3F2200D5F94B /* Dummy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dummy.swift; sourceTree = ""; }; 3A6406FB24A3ADF90046ED37 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 3A8F8EA924A4D31600BF206D /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = System/Library/Frameworks/GameKit.framework; sourceTree = SDKROOT; }; 3AAD2ADC24A3A60E0075D594 /* Status PR.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Status PR.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 3AB1C3AD245C043900098F67 /* StatusIm-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "StatusIm-Bridging-Header.h"; sourceTree = ""; }; + 466C47BA171B53CAE0AD6A19 /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 4C16DE0B1F89508700AA10DB /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; 4E586E1B0E544F64AA9F5BD1 /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; + 5AAC8D9B1AF8BB7C8AB89845 /* Pods-Status-StatusImPR.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.debug.xcconfig"; sourceTree = ""; }; 65F693BD2578002500A45E76 /* CoreNFC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreNFC.framework; path = System/Library/Frameworks/CoreNFC.framework; sourceTree = SDKROOT; }; 65F693BF2578003600A45E76 /* CoreNFC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreNFC.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk/System/iOSSupport/System/Library/Frameworks/CoreNFC.framework; sourceTree = DEVELOPER_DIR; }; 65F6941725780A4E00A45E76 /* StatusImTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "StatusImTests-Bridging-Header.h"; sourceTree = ""; }; 65F6941825780A4F00A45E76 /* Bridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bridge.swift; sourceTree = ""; }; + 680C14B0F642A5F544C397B7 /* Pods-Status-StatusIm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.debug.xcconfig"; sourceTree = ""; }; 693A62DB37BC4CD5A30E5C96 /* Inter-SemiBold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-SemiBold.otf"; path = "../resources/fonts/Inter-SemiBold.otf"; sourceTree = ""; }; 715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "UbuntuMono-Regular.ttf"; path = "../resources/fonts/UbuntuMono-Regular.ttf"; sourceTree = ""; }; 74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "launch-image-universal.storyboard"; sourceTree = ""; }; - 7625793B15B3B2A8E58F6277 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.release.xcconfig"; sourceTree = ""; }; - 79B38E3D4B033A711A7852FF /* Pods-Status-StatusImPR.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.release.xcconfig"; sourceTree = ""; }; - 7AFB8653840373E5B625E16E /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 7FA4F04CE45319370F87C4FD /* Pods-Status-StatusIm.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.release.xcconfig"; sourceTree = ""; }; + 87038678EE47E8EF6E93EB54 /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; }; 922C4CA61F4D5F8B0033C753 /* StatusIm.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = StatusIm.entitlements; path = StatusIm/StatusIm.entitlements; sourceTree = ""; }; 9C76AF5A418D4D65A4CAD1D9 /* InterStatus-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterStatus-Regular.otf"; path = "../resources/fonts/InterStatus-Regular.otf"; sourceTree = ""; }; 9EC0135C1E06FB1900155B5C /* RCTWKWebView.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWKWebView.xcodeproj; path = "../node_modules/react-native-wkwebview-reborn/ios/RCTWKWebView.xcodeproj"; sourceTree = ""; }; A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-SemiBoldItalic.otf"; path = "../resources/fonts/Inter-SemiBoldItalic.otf"; sourceTree = ""; }; - AE3313A464E280B64599C3BA /* Pods-Status-StatusIm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.debug.xcconfig"; sourceTree = ""; }; B07176ACDAA1422E8F0A3D6B /* Inter-Italic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Italic.otf"; path = "../resources/fonts/Inter-Italic.otf"; sourceTree = ""; }; B24FC7FC1DE7195700D694FF /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; }; B24FC7FE1DE7195F00D694FF /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; }; @@ -148,12 +150,10 @@ C14C5F8C29C0A149005C58A7 /* launch-icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon@3x.png"; path = "StatusIm/launch-icon@3x.png"; sourceTree = ""; }; C14C5F9029C0AD9C005C58A7 /* launch-icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon@2x.png"; path = "StatusIm/launch-icon@2x.png"; sourceTree = ""; }; C14C5F9229C0ADB5005C58A7 /* launch-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon.png"; path = "StatusIm/launch-icon.png"; sourceTree = ""; }; - C5D722CC6309CA4C8BC48244 /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; }; C6B1215047604CD59A4C74D6 /* Inter-MediumItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-MediumItalic.otf"; path = "../resources/fonts/Inter-MediumItalic.otf"; sourceTree = ""; }; - CA58075FD8E5F9A0CA74E512 /* Pods-Status-StatusImPR.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.debug.xcconfig"; sourceTree = ""; }; CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Bold.otf"; path = "../resources/fonts/Inter-Bold.otf"; sourceTree = ""; }; CE4E31B21D8695250033ED64 /* Statusgo.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Statusgo.xcframework; path = "../modules/react-native-status/ios/RCTStatus/Statusgo.xcframework"; sourceTree = ""; }; - D1CE733E3486B3A8B9185945 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; sourceTree = ""; }; + D42A8AC52E48DA4C89F20C13 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -161,7 +161,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 536FC260A89500EC9FDB1585 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */, + 8CF1CA9463A4048F97BABB82 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -174,7 +174,7 @@ CE4E31B31D8695250033ED64 /* Statusgo.xcframework in Frameworks */, 25DC9C9DC25846BD8D084888 /* libc++.tbd in Frameworks */, BA68A2377A20496EA737000D /* libz.tbd in Frameworks */, - 17F5C611511E64ACE76B00A3 /* libPods-Status-StatusIm.a in Frameworks */, + 42AC64E4D3CA4E676400C598 /* libPods-Status-StatusIm.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -188,7 +188,7 @@ 3AAD2AC224A3A60E0075D594 /* Statusgo.xcframework in Frameworks */, 3AAD2AC524A3A60E0075D594 /* libc++.tbd in Frameworks */, 3AAD2AC624A3A60E0075D594 /* libz.tbd in Frameworks */, - 061AC5E3D44813C6D987FC70 /* libPods-Status-StatusImPR.a in Frameworks */, + 2B6F8F28B81E862D44C8723D /* libPods-Status-StatusImPR.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -314,9 +314,9 @@ CE4E31B21D8695250033ED64 /* Statusgo.xcframework */, 8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */, 4E586E1B0E544F64AA9F5BD1 /* libz.tbd */, - 7AFB8653840373E5B625E16E /* libPods-Status-StatusIm.a */, - 1F311917BE57976CED3B9842 /* libPods-Status-StatusIm-StatusImTests.a */, - C5D722CC6309CA4C8BC48244 /* libPods-Status-StatusImPR.a */, + 2D2D9E4943562065BF98E304 /* libPods-Status-StatusIm.a */, + 466C47BA171B53CAE0AD6A19 /* libPods-Status-StatusIm-StatusImTests.a */, + 87038678EE47E8EF6E93EB54 /* libPods-Status-StatusImPR.a */, ); name = Frameworks; sourceTree = ""; @@ -324,12 +324,12 @@ D0D5C8D06825D33BA2D2121E /* Pods */ = { isa = PBXGroup; children = ( - AE3313A464E280B64599C3BA /* Pods-Status-StatusIm.debug.xcconfig */, - 1E0A54C37353D912620563B4 /* Pods-Status-StatusIm.release.xcconfig */, - D1CE733E3486B3A8B9185945 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */, - 7625793B15B3B2A8E58F6277 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */, - CA58075FD8E5F9A0CA74E512 /* Pods-Status-StatusImPR.debug.xcconfig */, - 79B38E3D4B033A711A7852FF /* Pods-Status-StatusImPR.release.xcconfig */, + 680C14B0F642A5F544C397B7 /* Pods-Status-StatusIm.debug.xcconfig */, + 7FA4F04CE45319370F87C4FD /* Pods-Status-StatusIm.release.xcconfig */, + D42A8AC52E48DA4C89F20C13 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */, + 2756A97EBFF084FA94990AA5 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */, + 5AAC8D9B1AF8BB7C8AB89845 /* Pods-Status-StatusImPR.debug.xcconfig */, + 0C331FD392B615DDAD0997F5 /* Pods-Status-StatusImPR.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -341,11 +341,11 @@ isa = PBXNativeTarget; buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "StatusImTests" */; buildPhases = ( - 8F717D50D3D590696A6046EB /* [CP] Check Pods Manifest.lock */, + 99EA576680D5849CA4274106 /* [CP] Check Pods Manifest.lock */, 00E356EA1AD99517003FC87E /* Sources */, 00E356EB1AD99517003FC87E /* Frameworks */, 00E356EC1AD99517003FC87E /* Resources */, - 1A83906735641F17B807EB39 /* [CP] Copy Pods Resources */, + 835B3E5945D5F723935FD4E1 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -361,14 +361,14 @@ isa = PBXNativeTarget; buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "StatusIm" */; buildPhases = ( - FD7194DC9A3E5A5277869CFC /* [CP] Check Pods Manifest.lock */, + 140572B0EA34D6F884AB6CC4 /* [CP] Check Pods Manifest.lock */, 13B07F871A680F5B00A75B9A /* Sources */, 13B07F8C1A680F5B00A75B9A /* Frameworks */, 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, 20B6B6891D92C42700CC5C6A /* Embed Frameworks */, E3914A731DF919ED00EBB515 /* Run Script */, - 88DEE6D9CF4D6BA6F6D8DCB5 /* [CP] Copy Pods Resources */, + 5BEC29A10D63DFF8AFF5B788 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -383,14 +383,14 @@ isa = PBXNativeTarget; buildConfigurationList = 3AAD2AD924A3A60E0075D594 /* Build configuration list for PBXNativeTarget "StatusImPR" */; buildPhases = ( - 4EE2E0EC4F119397E1A6B768 /* [CP] Check Pods Manifest.lock */, + 78F85303177A5D4820A08DC1 /* [CP] Check Pods Manifest.lock */, 3AAD2ABB24A3A60E0075D594 /* Sources */, 3AAD2ABF24A3A60E0075D594 /* Frameworks */, 3AAD2AC924A3A60E0075D594 /* Resources */, 3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */, 3AAD2AD624A3A60E0075D594 /* Embed Frameworks */, 3AAD2AD724A3A60E0075D594 /* Run Script */, - 1B5C687FDBFFB60FD1043432 /* [CP] Copy Pods Resources */, + 776D3E96946780BFE216ACF2 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -542,81 +542,9 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = "/usr/bin/env sh"; - shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\"${NODE_ARGS:- --max-old-space-size=16384 }\"\n\nbash -x ../node_modules/react-native/scripts/react-native-xcode.sh > ../logs/react-native-xcode.log 2>&1"; + shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\"${NODE_ARGS:- --max-old-space-size=16384 }\"\n\n\"../node_modules/react-native/scripts/react-native-xcode.sh\"\n"; }; - 1A83906735641F17B807EB39 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle", - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - 1B5C687FDBFFB60FD1043432 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle", - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - 3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Bundle React Native code and images"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = "/usr/bin/env sh"; - shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\"${NODE_ARGS:- --max-old-space-size=16384 }\"\n\nbash -x ../node_modules/react-native/scripts/react-native-xcode.sh > ../logs/react-native-xcode.log 2>&1"; - }; - 3AAD2AD724A3A60E0075D594 /* Run Script */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 8; - files = ( - ); - inputPaths = ( - ); - name = "Run Script"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 1; - shellPath = "/usr/bin/env sh"; - shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ../logs/set_xcode_version.log 2>&1"; - }; - 4EE2E0EC4F119397E1A6B768 /* [CP] Check Pods Manifest.lock */ = { + 140572B0EA34D6F884AB6CC4 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -631,14 +559,42 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Status-StatusImPR-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-Status-StatusIm-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 88DEE6D9CF4D6BA6F6D8DCB5 /* [CP] Copy Pods Resources */ = { + 3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Bundle React Native code and images"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = "/usr/bin/env sh"; + shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\"${NODE_ARGS:- --max-old-space-size=16384 }\"\n\n\"../node_modules/react-native/scripts/react-native-xcode.sh\"\n"; + }; + 3AAD2AD724A3A60E0075D594 /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 8; + files = ( + ); + inputPaths = ( + ); + name = "Run Script"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 1; + shellPath = "/usr/bin/env sh"; + shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\"\n"; + }; + 5BEC29A10D63DFF8AFF5B788 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -660,7 +616,73 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 8F717D50D3D590696A6046EB /* [CP] Check Pods Manifest.lock */ = { + 776D3E96946780BFE216ACF2 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle", + ); + name = "[CP] Copy Pods Resources"; + outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + 78F85303177A5D4820A08DC1 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Status-StatusImPR-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + 835B3E5945D5F723935FD4E1 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle", + ); + name = "[CP] Copy Pods Resources"; + outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + 99EA576680D5849CA4274106 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -694,29 +716,7 @@ ); runOnlyForDeploymentPostprocessing = 1; shellPath = "/usr/bin/env sh"; - shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ../logs/set_xcode_version.log 2>&1"; - }; - FD7194DC9A3E5A5277869CFC /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Status-StatusIm-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; + shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ./logs/set_xcode_version.log 2>&1\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -765,7 +765,7 @@ /* Begin XCBuildConfiguration section */ 00E356F61AD99517003FC87E /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D1CE733E3486B3A8B9185945 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */; + baseConfigurationReference = D42A8AC52E48DA4C89F20C13 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_ID_SUFFIX = .debug; @@ -795,14 +795,14 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "StatusImTests-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.2; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/StatusIm.app/StatusIm"; }; name = Debug; }; 00E356F71AD99517003FC87E /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7625793B15B3B2A8E58F6277 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */; + baseConfigurationReference = 2756A97EBFF084FA94990AA5 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_ID_SUFFIX = ""; @@ -828,14 +828,14 @@ PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "StatusImTests-Bridging-Header.h"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.2; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/StatusIm.app/StatusIm"; }; name = Release; }; 13B07F941A680F5B00A75B9A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = AE3313A464E280B64599C3BA /* Pods-Status-StatusIm.debug.xcconfig */; + baseConfigurationReference = 680C14B0F642A5F544C397B7 /* Pods-Status-StatusIm.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)"; BUNDLE_ID_SUFFIX = .debug; @@ -901,14 +901,14 @@ "$(inherited)", "-lc++", "-ObjC", + "-lresolv", ); - PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum; PRODUCT_NAME = StatusIm; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "StatusIm-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.2; TARGETED_DEVICE_FAMILY = 1; VALID_ARCHS = "x86_64 arm64"; "VALID_ARCHS[sdk=iphonesimulator*]" = "x86_64 "; @@ -917,7 +917,7 @@ }; 13B07F951A680F5B00A75B9A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1E0A54C37353D912620563B4 /* Pods-Status-StatusIm.release.xcconfig */; + baseConfigurationReference = 7FA4F04CE45319370F87C4FD /* Pods-Status-StatusIm.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)"; BUNDLE_ID_SUFFIX = ""; @@ -977,14 +977,14 @@ "$(inherited)", "-lc++", "-ObjC", + "-lresolv", ); - PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum; PRODUCT_NAME = StatusIm; PROVISIONING_PROFILE = "e2202b12-7a66-4ff7-af3c-a52e35f32dc1"; PROVISIONING_PROFILE_SPECIFIER = "match AdHoc im.status.ethereum"; SWIFT_OBJC_BRIDGING_HEADER = "StatusIm-Bridging-Header.h"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.2; TARGETED_DEVICE_FAMILY = 1; VALID_ARCHS = arm64; }; @@ -992,7 +992,7 @@ }; 3AAD2ADA24A3A60E0075D594 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CA58075FD8E5F9A0CA74E512 /* Pods-Status-StatusImPR.debug.xcconfig */; + baseConfigurationReference = 5AAC8D9B1AF8BB7C8AB89845 /* Pods-Status-StatusImPR.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)"; BUNDLE_ID_SUFFIX = .debug; @@ -1057,13 +1057,14 @@ "$(inherited)", "-lc++", "-ObjC", + "-lresolv", ); PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum.pr; PRODUCT_NAME = "Status PR"; PROVISIONING_PROFILE_SPECIFIER = "match Development im.status.ethereum.pr"; SWIFT_OBJC_BRIDGING_HEADER = "StatusIm-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.2; TARGETED_DEVICE_FAMILY = 1; VALID_ARCHS = arm64; }; @@ -1071,7 +1072,7 @@ }; 3AAD2ADB24A3A60E0075D594 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 79B38E3D4B033A711A7852FF /* Pods-Status-StatusImPR.release.xcconfig */; + baseConfigurationReference = 0C331FD392B615DDAD0997F5 /* Pods-Status-StatusImPR.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = "AppIconPR$(BUNDLE_ID_SUFFIX)"; BUNDLE_ID_SUFFIX = ""; @@ -1130,12 +1131,13 @@ "$(inherited)", "-lc++", "-ObjC", + "-lresolv", ); PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum.pr; PRODUCT_NAME = "Status PR"; PROVISIONING_PROFILE_SPECIFIER = "match AdHoc im.status.ethereum.pr"; SWIFT_OBJC_BRIDGING_HEADER = "StatusIm-Bridging-Header.h"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.2; TARGETED_DEVICE_FAMILY = 1; VALID_ARCHS = arm64; }; @@ -1174,6 +1176,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = 8B5X2M6H2Y; ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -1228,7 +1231,6 @@ "-DFOLLY_CFG_NO_COROUTINES=1", ); OTHER_LDFLAGS = "$(inherited)"; - PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; USE_HERMES = false; @@ -1270,6 +1272,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = YES; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = 8B5X2M6H2Y; ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; @@ -1315,7 +1318,6 @@ "-DFOLLY_CFG_NO_COROUTINES=1", ); OTHER_LDFLAGS = "$(inherited)"; - PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; USE_HERMES = false; diff --git a/logs/README.md b/logs/README.md index f52b132ba9..01a3f4934a 100644 --- a/logs/README.md +++ b/logs/README.md @@ -22,6 +22,8 @@ This directory is the destination of logs created during build time of debug bui These log files are uploaded to Jenkins as CI job artifacts on failure using `archiveArtifacts`. * `react-native-xcode.log` - Output from `node_modules/react-native/scripts/react-native-xcode.sh`. - - Created by redirecting output of `shellScript` in `ios/StatusIm.xcodeproj/project.pbxproj`. + - Created by redirecting output of `shellScript` in `ios/StatusIm.xcodeproj/project.pbxproj` for "Bundle React Native code and images" build Phase. +* `set_xcode_version.log` - Output from `node_modules/react-native/scripts/react-native-xcode.sh`. + - Created by redirecting output of `shellScript` in `ios/StatusIm.xcodeproj/project.pbxproj` for "Run Script" build Phase. * `Status PR-StatusImPR.log - Created by [Fastlane Gym](https://docs.fastlane.tools/actions/gym/). - Configred via [`Fastfile`](../Fastfile) using `buildlog_path` argument for `build_ios_app`. diff --git a/nix/overlay.nix b/nix/overlay.nix index 395c6caae7..f84ad6da52 100644 --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -51,7 +51,7 @@ in { }; # Package version adjustments - gradle = super.gradle_8_3; + gradle = super.gradle_8; nodejs = super.nodejs-18_x; ruby = super.ruby_3_1; yarn = super.yarn.override { nodejs = super.nodejs-18_x; }; @@ -65,10 +65,16 @@ in { buildGoPackage = super.buildGo119Package; buildGoModule = super.buildGo119Module; gomobile = (super.gomobile.overrideAttrs (old: { - patches = self.fetchurl { # https://github.com/golang/mobile/pull/84 - url = "https://github.com/golang/mobile/commit/f20e966e05b8f7e06bed500fa0da81cf6ebca307.patch"; - sha256 = "sha256-TZ/Yhe8gMRQUZFAs9G5/cf2b9QGtTHRSObBFD5Pbh7Y="; - }; + patches = [ + (self.fetchurl { # https://github.com/golang/mobile/pull/84 + url = "https://github.com/golang/mobile/commit/f20e966e05b8f7e06bed500fa0da81cf6ebca307.patch"; + sha256 = "sha256-TZ/Yhe8gMRQUZFAs9G5/cf2b9QGtTHRSObBFD5Pbh7Y="; + }) + (self.fetchurl { # https://github.com/golang/go/issues/58426 + url = "https://github.com/golang/mobile/commit/406ed3a7b8e44dc32844953647b49696d8847d51.patch"; + sha256 = "sha256-dqbYukHkQEw8npOkKykOAzMC3ot/Y4DEuh7fE+ptlr8="; + }) + ]; })).override { # FIXME: No Android SDK packages for aarch64-darwin. withAndroidPkgs = stdenv.system != "aarch64-darwin"; @@ -84,6 +90,4 @@ in { aapt2 = callPackage ./pkgs/aapt2 { }; patchMavenSources = callPackage ./pkgs/patch-maven-srcs { }; goMavenResolver = callPackage ./pkgs/go-maven-resolver { }; - xcbeautify = callPackage ./pkgs/xcbeautify { }; - idb-companion = callPackage ./pkgs/idb-companion { }; } diff --git a/nix/pkgs.nix b/nix/pkgs.nix index c9d33186a4..27123f7db4 100644 --- a/nix/pkgs.nix +++ b/nix/pkgs.nix @@ -6,10 +6,11 @@ let # For testing local version of nixpkgs #nixpkgsSrc = (import { }).lib.cleanSource "/home/jakubgs/work/nixpkgs"; - # We follow a fork of nixpkgs where we bump gradle to 8.3 and update build tools + # We follow release 23-11 of nixpkgs + # https://github.com/NixOS/nixpkgs/releases/tag/23.11 nixpkgsSrc = builtins.fetchTarball { - url = "https://github.com/status-im/nixpkgs/archive/44d8b23ebbe40ed16ef1aecef6c5354657c48b19.tar.gz"; - sha256 = "sha256:0s7kjnc8drchzp268yzbv5snc4702hswcns9hrncjq4im8cv6mf9"; + url = "https://github.com/NixOS/nixpkgs/archive/224fd9a362487ab2894dac0df161c84ab1d8880b.tar.gz"; + sha256 = "sha256:1syvl39pi1h8lf5gkd9h7ksn5hp34cj7pa3abr59217kv0bdklhy"; }; # Status specific configuration defaults diff --git a/nix/pkgs/idb-companion/default.nix b/nix/pkgs/idb-companion/default.nix deleted file mode 100644 index 6d65f00b72..0000000000 --- a/nix/pkgs/idb-companion/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - pname = "idb-companion"; - version = "1.1.8"; - - src = fetchurl { - url = "https://github.com/facebook/idb/releases/download/v${version}/idb-companion.universal.tar.gz"; - sha256 = "sha256-O3LMappbGiKhiCBahAkNOilDR6hGGA79dVzxo8hI4+c="; - }; - - buildInputs = [ ]; - - unpackPhase = '' - tar -xzf $src - ''; - - installPhase = '' - mkdir -p $out/bin - cp -r ./* $out/bin/ - ''; - - meta = with lib; { - description = "A powerful command line tool for automating iOS simulators and devices"; - homepage = "https://github.com/facebook/idb"; - license = licenses.mit; - platforms = platforms.darwin; - }; -} diff --git a/nix/pkgs/xcbeautify/default.nix b/nix/pkgs/xcbeautify/default.nix deleted file mode 100644 index 77ac96c7ac..0000000000 --- a/nix/pkgs/xcbeautify/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, unzip, lib }: - -let - inherit (lib) getAttr; -in -stdenv.mkDerivation rec { - pname = "xcbeautify"; - version = "1.4.0"; - arch = if stdenv.hostPlatform.isAarch64 then "arm64" else "x86_64"; - - - src = fetchurl { - url = "https://github.com/cpisciotta/xcbeautify/releases/download/${version}/xcbeautify-${version}-${arch}-apple-macosx.zip"; - sha256 = getAttr arch { - arm64 = "sha256-4b4mXT5IfNOS8iOrZASDhTrmOehG4mePcoiKxR+IdZk="; - x86_64 = "sha256-adEfAK7n3Q/Yd1deyJx7htX7hZaGDztEeBv4z2A0wzg="; - }; - }; - - buildInputs = [ unzip ]; - - unpackPhase = '' - unzip $src - ''; - - installPhase = '' - install -D xcbeautify $out/bin/xcbeautify - ''; - - meta = with lib; { - description = "A little beautifier tool for xcodebuild"; - homepage = "https://github.com/cpisciotta/xcbeautify"; - license = licenses.mit; - platforms = platforms.darwin; - }; -} diff --git a/scripts/run-ios.sh b/scripts/run-ios.sh index 49a3ae45fc..cb38d2d145 100755 --- a/scripts/run-ios.sh +++ b/scripts/run-ios.sh @@ -6,6 +6,7 @@ GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel) XCRUN_INSTALL_LOG_FILE="${GIT_ROOT}/logs/xcrun_install.log" XCRUN_LAUNCH_LOG_FILE="${GIT_ROOT}/logs/xcrun_launch.log" XCRUN_SIMULATOR_JSON_FILE="${GIT_ROOT}/logs/ios_simulators_list.log" +XCODEBUILD_LOG_FILE="${GIT_ROOT}/logs/react-native-xcode.log" # Install on the simulator installAndLaunchApp() { @@ -60,7 +61,7 @@ open -a Simulator --args -CurrentDeviceUDID "${UDID}" BUILD_DIR="${GIT_ROOT}/build" #iOS build of debug scheme -xcodebuild -workspace "ios/StatusIm.xcworkspace" -configuration Debug -scheme StatusIm -destination id="${UDID}" -derivedDataPath "${BUILD_DIR}" -verbose | xcbeautify +xcodebuild -workspace "ios/StatusIm.xcworkspace" -configuration Debug -scheme StatusIm -destination id="${UDID}" -derivedDataPath "${BUILD_DIR}" -verbose | xcbeautify | tee -a "${XCODEBUILD_LOG_FILE}" 2>&1 APP_PATH="${BUILD_DIR}/Build/Products/Debug-iphonesimulator/StatusIm.app" diff --git a/src/legacy/status_im/bottom_sheet/view.cljs b/src/legacy/status_im/bottom_sheet/view.cljs index c074e424ee..70db00d90d 100644 --- a/src/legacy/status_im/bottom_sheet/view.cljs +++ b/src/legacy/status_im/bottom_sheet/view.cljs @@ -187,9 +187,9 @@ (with-animation (+ bg-height-expanded (.-value pan-y)))) ;; Workaround for ;; https://github.com/software-mansion/react-native-reanimated/issues/1758#issue-817145741 - ;; withTiming/withSpring callback not working on-expanded should - ;; be called as a callback of with-animation instead, once this - ;; issue has been resolved + ;; withTiming/withSpring callback not working on-expanded + ;; should be called as a callback of with-animation instead, + ;; once this issue has been resolved (timer/set-timeout on-expanded animation-delay)) (do (reanimated/set-shared-value @@ -197,9 +197,9 @@ (with-animation (+ bg-height (.-value pan-y)))) ;; Workaround for ;; https://github.com/software-mansion/react-native-reanimated/issues/1758#issue-817145741 - ;; withTiming/withSpring callback not working on-collapsed should - ;; be called as a callback of with-animation instead, once this - ;; issue has been resolved + ;; withTiming/withSpring callback not working on-collapsed + ;; should be called as a callback of with-animation instead, + ;; once this issue has been resolved (timer/set-timeout on-collapsed animation-delay))) (= @show-bottom-sheet? false) diff --git a/src/legacy/status_im/chat/models/loading.cljs b/src/legacy/status_im/chat/models/loading.cljs index e98a6220a8..d0d33937b3 100644 --- a/src/legacy/status_im/chat/models/loading.cljs +++ b/src/legacy/status_im/chat/models/loading.cljs @@ -120,12 +120,13 @@ {:keys [message-id from] :as message}] (let [message - ;; For example, when a user receives a list of 4 image messages while inside - ;; the chat screen we shouldn't group the images into albums. When the user - ;; exists the chat screen then enters the chat screen again, we now need to - ;; group the images into albums (like WhatsApp). The albumize? boolean is used - ;; to know whether we need to group these images into albums now or not. The - ;; album-id can't be used for this because it will always be there. + ;; For example, when a user receives a list of 4 image messages while + ;; inside the chat screen we shouldn't group the images into albums. When + ;; the user exists the chat screen then enters the chat screen again, we + ;; now need to group the images into albums (like WhatsApp). The albumize? + ;; boolean is used to know whether we need to group these images into + ;; albums now or not. The album-id can't be used for this because it will + ;; always be there. (if (and (:album-id message) (nil? (get all-messages message-id))) (assoc message :albumize? true) message)] diff --git a/src/legacy/status_im/chat/models/message_test.cljs b/src/legacy/status_im/chat/models/message_test.cljs index dd0f994c76..09e2c9974a 100644 --- a/src/legacy/status_im/chat/models/message_test.cljs +++ b/src/legacy/status_im/chat/models/message_test.cljs @@ -22,9 +22,7 @@ :alias "alias" :name "name" :from "from"}] - ;; <- cursor - ;; <- message - ;; <- top of the chat + ;; <- cursor <- message <- top of the chat (testing "there's no hidden item" (with-redefs [list.state/first-not-visible-item (atom nil)] (is @@ -41,10 +39,7 @@ cofx #js {:messages (to-array [message])}) :utils/dispatch-later))))) - ;; <- cursor - ;; <- first-hidden-item - ;; <- message - ;; <- top of the chat + ;; <- cursor <- first-hidden-item <- message <- top of the chat (testing "the hidden item has a clock value less than the current" (with-redefs [list.state/first-not-visible-item (atom {:clock-value (dec clock-value)})] (is @@ -61,10 +56,7 @@ cofx #js {:messages (to-array [message])}) :utils/dispatch-later))))) - ;; <- cursor - ;; <- message - ;; <- first-hidden-item - ;; <- top of the chat + ;; <- cursor <- message <- first-hidden-item <- top of the chat (testing "the message falls between the first-hidden-item and cursor" (with-redefs [list.state/first-not-visible-item (atom {:clock-value (inc clock-value)})] (let [result (dissoc (message/receive-many @@ -77,9 +69,7 @@ (is (= clock-value (get-in result [:db :pagination-info chat-id :cursor-clock-value]))) (is (= (loading/clock-value->cursor clock-value) (get-in result [:db :pagination-info chat-id :cursor]))))))) - ;; <- message - ;; <- first-hidden-item - ;; <- top of the chat + ;; <- message <- first-hidden-item <- top of the chat (testing "the message falls between the first-hidden-item and cursor is nil" (with-redefs [list.state/first-not-visible-item (atom {:clock-value (inc clock-value)})] (let [result (dissoc (message/receive-many @@ -96,10 +86,7 @@ (is (= clock-value (get-in result [:db :pagination-info chat-id :cursor-clock-value]))) (is (= (loading/clock-value->cursor clock-value) (get-in result [:db :pagination-info chat-id :cursor]))))))) - ;; <- message - ;; <- cursor - ;; <- first-hidden-item - ;; <- top of the chat + ;; <- message <- cursor <- first-hidden-item <- top of the chat (testing "the message falls before both the first-hidden-item and cursor" (with-redefs [list.state/first-not-visible-item (atom {:clock-value (inc clock-value)})] (let [message #js diff --git a/src/legacy/status_im/ens/core.cljs b/src/legacy/status_im/ens/core.cljs index cd79a620ee..d10a5e181b 100644 --- a/src/legacy/status_im/ens/core.cljs +++ b/src/legacy/status_im/ens/core.cljs @@ -56,8 +56,7 @@ (rf/defn redirect-to-ens-summary {:events [::redirect-to-ens-summary]} [cofx] - ;; we reset navigation so that navigate back doesn't return - ;; into the registration flow + ;; we reset navigation so that navigate back doesn't return into the registration flow (rf/merge cofx (navigation/navigate-back-to :my-profile) (navigation/navigate-to :ens-confirmation {}))) @@ -161,8 +160,8 @@ (and (= response utils.ens/default-address) (not custom-domain?)) (re-frame/dispatch [::name-resolved username :available]) - ;; if we get an address back, we try to get the public key associated - ;; with the username as well + ;; if we get an address back, we try to get the public key associated with the username as + ;; well (get addresses (eip55/address->checksum response)) (ens/pubkey chain-id @@ -271,8 +270,7 @@ (rf/merge cofx ;; clear registration data {:db (dissoc db :ens/registration)} - ;; we reset navigation so that navigate back doesn't return - ;; into the registration flow + ;; we reset navigation so that navigate back doesn't return into the registration flow (navigation/navigate-back-to :my-profile) (navigation/navigate-to :ens-main {}))) diff --git a/src/legacy/status_im/keycard/fx.cljs b/src/legacy/status_im/keycard/fx.cljs index 99b09d8bea..ace6932eac 100644 --- a/src/legacy/status_im/keycard/fx.cljs +++ b/src/legacy/status_im/keycard/fx.cljs @@ -184,8 +184,8 @@ ;; TODO: Should act differently on different views (re-frame/reg-fx :keycard/listen-to-hardware-back-button - ;;NOTE: not done in view because effect should happen under different conditions and is not dependent on - ;;particular screen to be loaded. An fx is easier to re-use and test. + ;;NOTE: not done in view because effect should happen under different conditions and is not + ;;dependent on particular screen to be loaded. An fx is easier to re-use and test. (fn [] (re-frame/dispatch [:keycard/add-listener-to-hardware-back-button (.addEventListener BackHandler diff --git a/src/legacy/status_im/popover/core.cljs b/src/legacy/status_im/popover/core.cljs index ee6c6de0b1..c9fc60c70a 100644 --- a/src/legacy/status_im/popover/core.cljs +++ b/src/legacy/status_im/popover/core.cljs @@ -8,8 +8,8 @@ (let [delay-ms (or (:delay-ms value) 250) value (dissoc value :delay-ms)] {:show-popover nil - ;; We should probably refactor to start the animation on mount, so that the - ;; delay can be removed. See comment for more details: + ;; We should probably refactor to start the animation on mount, so that the delay can be + ;; removed. See comment for more details: ;; https://github.com/status-im/status-mobile/pull/15222#issuecomment-1450162137 :dispatch-later [{:ms delay-ms :dispatch [:show-popover-db value]}] :dismiss-keyboard nil})) diff --git a/src/legacy/status_im/ui/components/action_sheet.cljs b/src/legacy/status_im/ui/components/action_sheet.cljs index a4eca2ee23..76ae3c3313 100644 --- a/src/legacy/status_im/ui/components/action_sheet.cljs +++ b/src/legacy/status_im/ui/components/action_sheet.cljs @@ -15,8 +15,8 @@ (defn- prepare-options [title message options] - (let [destructive-opt-index (utils/first-index :destructive? options)] ;; TODO Can only be a single - ;; destructive? + (let [destructive-opt-index (utils/first-index :destructive? options)] ;; TODO Can only be a + ;; single destructive? (clj->js (merge {:options (conj (mapv :label options) (i18n/label :t/cancel)) :cancelButtonIndex (count options)} (when destructive-opt-index diff --git a/src/legacy/status_im/ui/components/colors.cljs b/src/legacy/status_im/ui/components/colors.cljs index 137cf2c326..c5f5875e26 100644 --- a/src/legacy/status_im/ui/components/colors.cljs +++ b/src/legacy/status_im/ui/components/colors.cljs @@ -22,13 +22,15 @@ {:positive-01 "rgba(68,208,88,1)" ; Primary Positive, text, icons color :positive-02 "rgba(78,188,96,0.1)" ; Secondary Positive, Supporting color for success ; illustrations - :positive-03 "rgba(78,188,96,1)" ; Lighter Positive, Supporting color for success illustrations + :positive-03 "rgba(78,188,96,1)" ; Lighter Positive, Supporting color for success + ; illustrations :negative-01 "rgba(255,45,85,1)" ; Primary Negative, text, icons color :negative-02 "rgba(255,45,85,0.1))" ; Secondary Negative, Supporting color for errors ; illustrations :warning-01 "rgba(255, 202, 15, 1)" :warning-02 "rgba(255, 202, 15, 0.1)" - :interactive-01 "rgba(67,96,223,1)" ; Accent color, buttons, own message, actions,active state + :interactive-01 "rgba(67,96,223,1)" ; Accent color, buttons, own message, actions,active + ; state :interactive-02 "rgba(236,239,252,1)" ; Light Accent, buttons background, actions background, ; messages :interactive-03 "rgba(255,255,255,0.1)" ; Background for interactive above accent @@ -130,12 +132,14 @@ (def mentioned-background (:mentioned-background old-colors-mapping-light)) (def mentioned-border (:mentioned-border old-colors-mapping-light)) -(def red-light "#ffe5ea") ;; error tooltip TODO (andrey) should be white, but shadow needed +(def red-light "#ffe5ea") ;; error tooltip TODO (andrey) should be white, but shadow + ;; needed ;; BLACK (def black (:text-01 light-theme)) ;; Used as the default text color (def black-persist (:ui-background dark-theme)) ;; this doesn't with theme -(def black-transparent (:ui-02 light-theme)) ;; Used as background color for rounded button on dark background and as background +(def black-transparent (:ui-02 light-theme)) ;; Used as background color for rounded button on dark background and as + ;; background ;; color for containers like "Backup recovery phrase" (def black-transparent-20 (:backdrop light-theme)) ; accounts divider (def black-transparent-40 (:backdrop light-theme)) @@ -145,7 +149,8 @@ (def black-transparent-86 (:ui-03 light-theme)) ;; DARK GREY -(def gray (:text-02 light-theme)) ;; Dark grey, used as a background for a light foreground and as +(def gray (:text-02 light-theme)) ;; Dark grey, used as a background for a light foreground and + ;; as ;; section header and secondary text color (def gray-transparent-10 (alpha gray 0.1)) (def gray-transparent-40 (alpha gray 0.4)) @@ -153,7 +158,8 @@ (def gray-lighter (:ui-01 light-theme)) ;; Light Grey, used as a background or shadow ;; ACCENT BLUE -(def blue (:interactive-01 light-theme)) ;; Accent blue, used as main wallet color, and ios home add button +(def blue (:interactive-01 light-theme)) ;; Accent blue, used as main wallet color, and ios home add + ;; button (def blue-persist (:interactive-01 light-theme)) ;; LIGHT BLUE (def blue-light (:interactive-02 light-theme)) ;; Light Blue diff --git a/src/legacy/status_im/ui/components/list/item.cljs b/src/legacy/status_im/ui/components/list/item.cljs index e7c836c7fe..4db1ead115 100644 --- a/src/legacy/status_im/ui/components/list/item.cljs +++ b/src/legacy/status_im/ui/components/list/item.cljs @@ -100,8 +100,8 @@ (and title subtitle) [:<> - ;; FIXME(Ferossgp): ReactNative 63 will support view inside text on andrid, remove thess if when - ;; migrating + ;; FIXME(Ferossgp): ReactNative 63 will support view inside text on andrid, remove thess if + ;; when migrating (if (string? title) [text/text {:weight (or title-text-weight :medium) @@ -179,13 +179,13 @@ {:style (merge {:align-items :center :justify-content :flex-end :flex-direction :row - ;; Grow to occupy full space, shrink when need be, but always maitaining 16px left - ;; gutter + ;; Grow to occupy full space, shrink when need be, but always maitaining 16px + ;; left gutter :flex-grow 1 :flex-shrink 0 :margin-left 16 - ;; When the left-side leaves no room for right-side, the rendered element is pushed - ;; out. A flex-basis ensures that there is some room reserved. + ;; When the left-side leaves no room for right-side, the rendered element is + ;; pushed out. A flex-basis ensures that there is some room reserved. ;; The number 80px was determined by trial and error. :flex-basis 80} accessory-style)} diff --git a/src/legacy/status_im/ui/components/text_input.cljs b/src/legacy/status_im/ui/components/text_input.cljs index fab1065edc..e47883c64b 100644 --- a/src/legacy/status_im/ui/components/text_input.cljs +++ b/src/legacy/status_im/ui/components/text_input.cljs @@ -188,8 +188,8 @@ :on-press #(reset! visible true)} :else after) - secure (boolean (and secure-text-entry (not @visible))) ; must be a boolean to work on - ; iOS + secure (boolean (and secure-text-entry (not @visible))) ; must be a boolean to + ; work on iOS auto-complete (cond (= keyboard-type :visible-password) :off @@ -211,8 +211,7 @@ :default ; the correct approach on Android would be keep secure-text-entry on set - ; keyboard type - ; to visible-password. But until + ; keyboard type to visible-password. But until ; https://github.com/facebook/react-native/issues/27946 ; is solved that's the second best way. (and platform/android? secure-text-entry) diff --git a/src/legacy/status_im/ui/components/topbar.cljs b/src/legacy/status_im/ui/components/topbar.cljs index b1478aa861..d8543b0767 100644 --- a/src/legacy/status_im/ui/components/topbar.cljs +++ b/src/legacy/status_im/ui/components/topbar.cljs @@ -26,8 +26,9 @@ (defn topbar [{:keys [navigation use-insets right-accessories modal? content border-bottom? new-ui?] ;; remove - ;; new-ui? key, - ;; temp fix + ;; new-ui? + ;; key, temp + ;; fix :or {border-bottom? true new-ui? false} :as props}] diff --git a/src/legacy/status_im/ui/screens/browser/permissions/views.cljs b/src/legacy/status_im/ui/screens/browser/permissions/views.cljs index 530151c1e9..8bb7b86c06 100644 --- a/src/legacy/status_im/ui/screens/browser/permissions/views.cljs +++ b/src/legacy/status_im/ui/screens/browser/permissions/views.cljs @@ -50,18 +50,17 @@ {:UNSAFE_componentWillUpdate (fn [_ [_ _ {:keys [requested-permission]}]] (cond @update? - ;; the component has been updated with a new permission, we show the - ;; panel + ;; the component has been updated with a new permission, we + ;; show the panel (do (reset! update? false) (show-panel-anim bottom-anim-value alpha-value)) (and @current-permission requested-permission) - ;; a permission has been accepted/denied by the user, and there is - ;; another permission that needs to be processed by the user - ;; we hide the processed permission with an animation and update - ;; `current-permission` with a delay so that the information is - ;; still - ;; available during the animation + ;; a permission has been accepted/denied by the user, and there + ;; is another permission that needs to be processed by the user + ;; we hide the processed permission with an animation and + ;; update `current-permission` with a delay so that the + ;; information is still available during the animation (do (reset! update? true) (js/setTimeout #(reset! current-permission (permission-details requested-permission)) @@ -70,20 +69,18 @@ requested-permission ;; the dapp is asking for a permission, we put it in - ;; current-permission - ;; and start the show-animation + ;; current-permission and start the show-animation (do (reset! current-permission (get browser.permissions/supported-permissions requested-permission)) (show-panel-anim bottom-anim-value alpha-value)) :else - ;; a permission has been accepted/denied by the user, and there is - ;; no other permission that needs to be processed by the user - ;; we hide the processed permission with an animation and update - ;; `current-permission` with a delay so that the information is - ;; still - ;; available during the animation + ;; a permission has been accepted/denied by the user, and there + ;; is no other permission that needs to be processed by the + ;; user we hide the processed permission with an animation and + ;; update `current-permission` with a delay so that the + ;; information is still available during the animation (do (js/setTimeout #(reset! current-permission nil) 500) (hide-panel-anim bottom-anim-value alpha-value))))} (when @current-permission diff --git a/src/legacy/status_im/ui/screens/reset_password/views.cljs b/src/legacy/status_im/ui/screens/reset_password/views.cljs index a75bcf1bb6..16f5edb0f0 100644 --- a/src/legacy/status_im/ui/screens/reset_password/views.cljs +++ b/src/legacy/status_im/ui/screens/reset_password/views.cljs @@ -78,8 +78,8 @@ {:on-press on-submit :accessibility-label :next-button :disabled (or (not next-enabled?) - ;; disable on resetting? so the user cannot press the next button - ;; recklessly + ;; disable on resetting? so the user cannot press the next + ;; button recklessly ;; https://github.com/status-im/status-mobile/pull/12245#issuecomment-874827573 resetting?) :type :secondary diff --git a/src/legacy/status_im/utils/random_test.cljs b/src/legacy/status_im/utils/random_test.cljs index a1da0d7157..fd411c4e6d 100644 --- a/src/legacy/status_im/utils/random_test.cljs +++ b/src/legacy/status_im/utils/random_test.cljs @@ -49,9 +49,8 @@ (is (empty? (filter #(< % 0) sample))) ;no result should be larger than n (is (empty? (filter #(>= % n) sample))) - ;and while there is a very small probability - ;it is very unlikely and probably wrong if all 1000 calls - ;got us the same number. + ;and while there is a very small probability it is very unlikely and probably wrong if all 1000 + ;calls got us the same number. (is (> (count sample) 1)))) (deftest test-seeded-rand-nth diff --git a/src/quo/components/animated_header_flatlist/view.cljs b/src/quo/components/animated_header_flatlist/view.cljs index cda1cc5fa5..17920a318d 100644 --- a/src/quo/components/animated_header_flatlist/view.cljs +++ b/src/quo/components/animated_header_flatlist/view.cljs @@ -57,7 +57,8 @@ (let [theme (quo.theme/use-theme-value) window-height (:height (rn/get-window)) {:keys [top bottom]} (safe-area/get-insets) - ;; view height calculation is different because window height is different on iOS and Android: + ;; view height calculation is different because window height is different on iOS and + ;; Android: view-height (if platform/ios? (- window-height bottom) (+ window-height top)) diff --git a/src/quo/components/avatars/user_avatar/view.cljs b/src/quo/components/avatars/user_avatar/view.cljs index 877e6177a5..f708696ab2 100644 --- a/src/quo/components/avatars/user_avatar/view.cljs +++ b/src/quo/components/avatars/user_avatar/view.cljs @@ -54,9 +54,8 @@ [rn/view {:style outer-styles :accessibility-label :user-avatar} (if (and full-name (not (or profile-picture-fn profile-picture))) - ;; this is for things that's not user-avatar - ;; but are currently using user-avatar to render the initials - ;; e.g. community avatar + ;; this is for things that's not user-avatar but are currently using user-avatar to render + ;; the initials e.g. community avatar [initials-avatar props] [image-view {:accessibility-label :profile-picture diff --git a/src/quo/components/gradient/gradient_cover/view.cljs b/src/quo/components/gradient/gradient_cover/view.cljs index 5f759b964f..5d2ae3dae1 100644 --- a/src/quo/components/gradient/gradient_cover/view.cljs +++ b/src/quo/components/gradient/gradient_cover/view.cljs @@ -8,10 +8,9 @@ (defn- view-internal [{:keys [customization-color opacity container-style height] :or {customization-color :blue}}] - ;; `when` added for safety, `linear-gradient` will break if `nil` is passed, - ;; the `:or` destructuring won't work because it's only applied when the - ;; `:customization-color` key is non-existent. While deleting an account the key exists - ;; and has a `nil` value. + ;; `when` added for safety, `linear-gradient` will break if `nil` is passed, the `:or` + ;; destructuring won't work because it's only applied when the `:customization-color` key is + ;; non-existent. While deleting an account the key exists and has a `nil` value. (let [color-top (colors/resolve-color customization-color 50 20) color-bottom (colors/resolve-color customization-color 50 0)] (when (and color-top color-bottom) diff --git a/src/quo/components/graph/utils_test.cljs b/src/quo/components/graph/utils_test.cljs index f59bac5444..12ea0cf151 100644 --- a/src/quo/components/graph/utils_test.cljs +++ b/src/quo/components/graph/utils_test.cljs @@ -73,7 +73,8 @@ (testing "Downsampling works with large input data and max-array-size (randomized test)" (let [large-data (range 1000) max-array-size 500 - expected-output (range 0 1000 2)] ; expected-output contains every 2nd element from 0 to 1000 + expected-output (range 0 1000 2)] ; expected-output contains every 2nd element from 0 to + ; 1000 (is (= (utils/downsample-data large-data max-array-size) expected-output))))) (deftest format-compact-number diff --git a/src/quo/components/navigation/bottom_nav_tab/view.cljs b/src/quo/components/navigation/bottom_nav_tab/view.cljs index 0f0044a5a7..723eb13d23 100644 --- a/src/quo/components/navigation/bottom_nav_tab/view.cljs +++ b/src/quo/components/navigation/bottom_nav_tab/view.cljs @@ -55,12 +55,10 @@ :accessibility-label accessibility-label} [reanimated/view {:style background-animated-style} ;; In android animations are not working for the animated components which are nested by - ;; hole-view, - ;; Interestingly this only happens when hole view and blur view are used together + ;; hole-view,. Interestingly this only happens when hole view and blur view are used together ;; Similar behavior is also seen while removing holes, and to fix that we used key and - ;; force-rendered view - ;; But we need animations faster for tab clicks, so we can't rely on reagent atoms, - ;; so for now only using hole view for the ios tab icon notification boundary + ;; force-rendered view. But we need animations faster for tab clicks, so we can't rely on + ;; reagent atoms, so for now only using hole view for the ios tab icon notification boundary (if platform/ios? [hole-view/hole-view {:key new-notifications? ;; Key is required to force removal of holes diff --git a/src/quo/components/navigation/top_nav/style.cljs b/src/quo/components/navigation/top_nav/style.cljs index afecb61a36..e877c95d13 100644 --- a/src/quo/components/navigation/top_nav/style.cljs +++ b/src/quo/components/navigation/top_nav/style.cljs @@ -5,8 +5,7 @@ (let [right-offset (cond (> unread-count max-value) -14 - ;; Greater than 9 means we'll need 2 digits to represent - ;; the text. + ;; Greater than 9 means we'll need 2 digits to represent the text. (> unread-count 9) -10 :else -6)] diff --git a/src/quo/components/record_audio/record_audio/buttons/record_button_big.cljs b/src/quo/components/record_audio/record_audio/buttons/record_button_big.cljs index 80dd511a97..2254a36495 100644 --- a/src/quo/components/record_audio/record_audio/buttons/record_button_big.cljs +++ b/src/quo/components/record_audio/record_audio/buttons/record_button_big.cljs @@ -98,9 +98,8 @@ (fn [] (helpers/set-value opacity 1) (helpers/animate-linear scale 2.6 signal-anim-duration) - ;; TODO: Research if we can implement this with withSequence method - ;; from Reanimated 2 - ;; GitHub issue [#14561]: + ;; TODO: Research if we can implement this with withSequence method from + ;; Reanimated 2. GitHub issue [#14561]: ;; https://github.com/status-im/status-mobile/issues/14561 (reset! clear-timeout (js/setTimeout diff --git a/src/react_native/keychain.cljs b/src/react_native/keychain.cljs index aa904f5dee..2b900fd03a 100644 --- a/src/react_native/keychain.cljs +++ b/src/react_native/keychain.cljs @@ -20,24 +20,20 @@ ;; see this article for more details: ;; https://developer.apple.com/documentation/security/keychain_services/keychain_items/restricting_keychain_item_accessibility?language=objc (def keychain-restricted-availability - ;; From Apple's documentation: - ;; > The kSecAttrAccessible attribute enables you to control item availability - ;; > relative to the lock state of the device. - ;; > It also lets you specify eligibility for restoration to a new device. - ;; > If the attribute ends with the string ThisDeviceOnly, - ;; > the item can be restored to the same device that created a backup, - ;; > but it isn’t migrated when restoring another device’s backup data. - ;; > ... - ;; > For extremely sensitive data - ;; > THAT YOU NEVER WANT STORED IN iCloud, - ;; > you might choose kSecAttrAccessibleWhenPasscodeSetThisDeviceOnly. - ;; That is exactly what we use there. - ;; Note that the password won't be stored if the device isn't locked by a passcode. + ;; From Apple's documentation: > The kSecAttrAccessible attribute enables you to control item + ;; availability > relative to the lock state of the device. > It also lets you specify eligibility + ;; for restoration to a new device. > If the attribute ends with the string ThisDeviceOnly, > the + ;; item can be restored to the same device that created a backup, > but it isn’t migrated when + ;; restoring another device’s backup data. > ... > For extremely sensitive data > THAT YOU NEVER + ;; WANT STORED IN iCloud, > you might choose kSecAttrAccessibleWhenPasscodeSetThisDeviceOnly. That + ;; is exactly what we use there. Note that the password won't be stored if the device isn't locked + ;; by a passcode. #js {:accessible (enum-val "ACCESSIBLE" "WHEN_PASSCODE_SET_THIS_DEVICE_ONLY")}) (def keychain-secure-hardware ;; (Android) Requires storing the encryption key for the entry in secure hardware - ;; or StrongBox (see https://developer.android.com/training/articles/keystore#ExtractionPrevention) + ;; or StrongBox (see + ;; https://developer.android.com/training/articles/keystore#ExtractionPrevention) #js {:accessible (enum-val "SECURITY_LEVEL" "SECURE_HARDWARE")}) ;; Android only diff --git a/src/status_im/common/scan_qr_code/view.cljs b/src/status_im/common/scan_qr_code/view.cljs index 80a72e80c9..3af38d4ca8 100644 --- a/src/status_im/common/scan_qr_code/view.cljs +++ b/src/status_im/common/scan_qr_code/view.cljs @@ -132,8 +132,8 @@ [{:keys [event error-message validate-fn on-success-scan on-failed-scan scan-code?]}] (let [scanned-value (string/trim (oops/oget event "nativeEvent.codeStringValue")) validated? (if validate-fn (validate-fn scanned-value) true)] - ;; Note - camera-kit keeps scanning until the screen is dismissed, - ;; so disable scanning to make sure the on-read-code doesn't get executed multiple times + ;; Note - camera-kit keeps scanning until the screen is dismissed, so disable scanning to make + ;; sure the on-read-code doesn't get executed multiple times (reset! scan-code? false) (if validated? (on-success-scan scanned-value) diff --git a/src/status_im/contexts/chat/messenger/composer/selection.cljs b/src/status_im/contexts/chat/messenger/composer/selection.cljs index 5da3731919..bcf872420b 100644 --- a/src/status_im/contexts/chat/messenger/composer/selection.cljs +++ b/src/status_im/contexts/chat/messenger/composer/selection.cljs @@ -24,7 +24,8 @@ [text-input-handle selection-start selection-end] ;; to avoid something like this ;; https://lightrun.com/answers/facebook-react-native-textinput-controlled-selection-broken-on-both-ios-and-android - ;; use native invoke instead! do not use setNativeProps! e.g. (.setNativeProps ^js text-input (clj->js + ;; use native invoke instead! do not use setNativeProps! e.g. (.setNativeProps ^js text-input + ;; (clj->js ;; {:selection {:start selection-start :end selection-end}})) (let [manager (rn/selectable-text-input-manager)] (oops/ocall manager :setSelection text-input-handle selection-start selection-end))) diff --git a/src/status_im/contexts/chat/messenger/messages/content/deleted/view.cljs b/src/status_im/contexts/chat/messenger/messages/content/deleted/view.cljs index b4ac290122..5b10c1ad85 100644 --- a/src/status_im/contexts/chat/messenger/messages/content/deleted/view.cljs +++ b/src/status_im/contexts/chat/messenger/messages/content/deleted/view.cljs @@ -57,8 +57,7 @@ animation-duration (when-let [deleted-till (or deleted-undoable-till deleted-for-me-undoable-till)] (- deleted-till (datetime/timestamp))) - ;; enable long press only when - ;; undo delete timer timedout + ;; enable long press only when undo delete timer timedout ;; message pinned and user has permission to unpin on-long-press (when (and (not animation-duration) (or (and (or in-pinned-view? pinned) message-pin-enabled) diff --git a/src/status_im/contexts/profile/contact/add_nickname/view.cljs b/src/status_im/contexts/profile/contact/add_nickname/view.cljs index 8441bd0195..df538c142b 100644 --- a/src/status_im/contexts/profile/contact/add_nickname/view.cljs +++ b/src/status_im/contexts/profile/contact/add_nickname/view.cljs @@ -14,7 +14,8 @@ [] (let [{:keys [public-key primary-name nickname customization-color] :as profile} (rf/sub [:contacts/current-contact]) - ;; TODO(@mohsen): remove default color, https://github.com/status-im/status-mobile/issues/18733 + ;; TODO(@mohsen): remove default color, + ;; https://github.com/status-im/status-mobile/issues/18733 customization-color (or customization-color constants/profile-default-color) full-name (profile.utils/displayed-name profile) profile-picture (profile.utils/photo profile) diff --git a/src/status_im/contexts/profile/contact/block_contact/view.cljs b/src/status_im/contexts/profile/contact/block_contact/view.cljs index 76b350ff5a..636d5f3774 100644 --- a/src/status_im/contexts/profile/contact/block_contact/view.cljs +++ b/src/status_im/contexts/profile/contact/block_contact/view.cljs @@ -13,7 +13,8 @@ [] (let [{:keys [customization-color contact-request-state public-key] :as contact} (rf/sub [:contacts/current-contact]) - ;; TODO(@mohsen): remove default color, https://github.com/status-im/status-mobile/issues/18733 + ;; TODO(@mohsen): remove default color, + ;; https://github.com/status-im/status-mobile/issues/18733 customization-color (or customization-color constants/profile-default-color) full-name (profile.utils/displayed-name contact) profile-picture (profile.utils/photo contact) diff --git a/src/status_im/contexts/profile/contact/header/view.cljs b/src/status_im/contexts/profile/contact/header/view.cljs index ec5751f459..23c03848c3 100644 --- a/src/status_im/contexts/profile/contact/header/view.cljs +++ b/src/status_im/contexts/profile/contact/header/view.cljs @@ -29,7 +29,8 @@ (let [{:keys [public-key customization-color ens-name nickname secondary-name emoji-hash bio blocked? contact-request-state] :as contact} (rf/sub [:contacts/current-contact]) - ;; TODO(@mohsen): remove default color, https://github.com/status-im/status-mobile/issues/18733 + ;; TODO(@mohsen): remove default color, + ;; https://github.com/status-im/status-mobile/issues/18733 customization-color (or customization-color constants/profile-default-color) full-name (profile.utils/displayed-name contact) profile-picture (profile.utils/photo contact) diff --git a/src/status_im/contexts/profile/contact/view.cljs b/src/status_im/contexts/profile/contact/view.cljs index 10ca3551d0..541aecf3c4 100644 --- a/src/status_im/contexts/profile/contact/view.cljs +++ b/src/status_im/contexts/profile/contact/view.cljs @@ -32,7 +32,8 @@ {:navigate-back? true :height 148 :on-scroll #(reanimated/set-shared-value scroll-y %) - ;; TODO(@mohsen): remove default color, https://github.com/status-im/status-mobile/issues/18733 + ;; TODO(@mohsen): remove default color, + ;; https://github.com/status-im/status-mobile/issues/18733 :cover-color (colors/resolve-color (or customization-color constants/profile-default-color) theme 20) diff --git a/src/status_im/contexts/profile/utils.cljs b/src/status_im/contexts/profile/utils.cljs index 9d6ce859d2..f8ca89994d 100644 --- a/src/status_im/contexts/profile/utils.cljs +++ b/src/status_im/contexts/profile/utils.cljs @@ -3,8 +3,7 @@ (defn displayed-name [{:keys [name display-name preferred-name alias ens-verified primary-name]}] - ;; `preferred-name` is our own name - ;; otherwise we make sure the `name` is verified and use it + ;; `preferred-name` is our own name otherwise we make sure the `name` is verified and use it (let [display-name (when-not (string/blank? display-name) display-name) preferred-name (when-not (string/blank? preferred-name) diff --git a/src/status_im/contexts/shell/activity_center/notification/contact_verification/view.cljs b/src/status_im/contexts/shell/activity_center/notification/contact_verification/view.cljs index 1b091ff1a3..cb3a2827e9 100644 --- a/src/status_im/contexts/shell/activity_center/notification/contact_verification/view.cljs +++ b/src/status_im/contexts/shell/activity_center/notification/contact_verification/view.cljs @@ -158,9 +158,8 @@ (let [{:keys [id message contact-verification-status]} notification challenger? (:outgoing message)] - ;; TODO(@ilmotta): Declined challenges should only be displayed for the - ;; challengee, not the challenger. - ;; https://github.com/status-im/status-mobile/issues/14354 + ;; TODO(@ilmotta): Declined challenges should only be displayed for the challengee, not the + ;; challenger. Https://github.com/status-im/status-mobile/issues/14354 (when-not (and challenger? (= contact-verification-status constants/contact-verification-status-declined)) diff --git a/src/status_im/contexts/shell/jump_to/components/floating_screens/style.cljs b/src/status_im/contexts/shell/jump_to/components/floating_screens/style.cljs index ef24410e4c..77eb30cdd1 100644 --- a/src/status_im/contexts/shell/jump_to/components/floating_screens/style.cljs +++ b/src/status_im/contexts/shell/jump_to/components/floating_screens/style.cljs @@ -16,11 +16,10 @@ :z-index screen-z-index} {:background-color (colors/theme-colors colors/white colors/neutral-95 theme) :overflow :hidden - ;; KeyboardAvoidingView which is used for chat screen composer, - ;; not working when we use :absolute layout. One fix is to add - ;; KeyboardAvoidingView :behaviour height in android, which is also - ;; recommended in the documentation. It fixes KeyboardAvoidingView but - ;; the pushing of views by the keyboard is not smooth & while animating it creates a weird jump. + ;; KeyboardAvoidingView which is used for chat screen composer, not working when we use + ;; :absolute layout. One fix is to add. KeyboardAvoidingView :behaviour height in android, which + ;; is also recommended in the documentation. It fixes KeyboardAvoidingView but the pushing of + ;; views by the keyboard is not smooth & while animating it creates a weird jump. :position (if (= screen-id shell.constants/chat-screen) :relative :absolute) :flex -1})) diff --git a/src/status_im/subs/shell.cljs b/src/status_im/subs/shell.cljs index 42a6a73717..f4e526c305 100644 --- a/src/status_im/subs/shell.cljs +++ b/src/status_im/subs/shell.cljs @@ -40,8 +40,7 @@ {:content-type constants/content-type-text :data content} - ;; Currently mock image is used as placeholder, - ;; as last-message don't have image + ;; Currently mock image is used as placeholder, as last-message don't have image ;; https://github.com/status-im/status-mobile/issues/14625 (= content-type constants/content-type-image) {:content-type constants/content-type-image @@ -234,7 +233,8 @@ (and (not muted) (= chat-type constants/one-to-one-chat-type)) - ;; Note - for 1-1 chats, all unread messages are counted as mentions and shown with counter + ;; Note - for 1-1 chats, all unread messages are counted as mentions and shown with + ;; counter (-> acc (update-in [:chats-stack :unviewed-messages-count] + unviewed-messages-count) (update-in [:chats-stack :unviewed-mentions-count] + unviewed-messages-count))