Skip to content

Commit

Permalink
Merge branch 'develop' into 19645
Browse files Browse the repository at this point in the history
  • Loading branch information
ibrkhalil authored Apr 19, 2024
2 parents 46361bd + 2e2104d commit bc60bd5
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 12 deletions.
6 changes: 3 additions & 3 deletions nix/overlay.nix
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ in {
version = "15.0";
allowHigher = true;
};
go = super.go_1_19;
go = super.go_1_20;
clang = super.clang_15;
buildGoPackage = super.buildGo119Package;
buildGoModule = super.buildGo119Module;
buildGoPackage = super.buildGo120Package;
buildGoModule = super.buildGo120Module;
gomobile = (super.gomobile.overrideAttrs (old: {
patches = [
(self.fetchurl { # https://github.com/golang/mobile/pull/84
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,18 @@

(defn- step-item
[item index _ {:keys [checked? customization-color]}]
[rn/view {:style style/step-item}
[quo/selectors
{:type :checkbox
:customization-color customization-color
:on-change #(swap! checked? assoc (keyword (str index)) %)}]
[quo/text {:style {:margin-left 12}} (i18n/label item)]])
(let [item-key (keyword (str index))
value (get @checked? item-key)]
[rn/pressable
{:style style/step-item
:hit-slop {:top 8 :bottom 8}
:on-press #(swap! checked? assoc item-key (not value))}
[quo/selectors
{:type :checkbox
:checked? value
:customization-color customization-color
:on-change #(swap! checked? assoc item-key %)}]
[quo/text {:style {:margin-left 12}} (i18n/label item)]]))

(defn view
[]
Expand Down
6 changes: 3 additions & 3 deletions status-go-version.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"_comment": "Instead use: scripts/update-status-go.sh <rev>",
"owner": "status-im",
"repo": "status-go",
"version": "v0.179.5",
"commit-sha1": "a39c01d7fe1ac60dc2a34bb16d550f09c64d3a3d",
"src-sha256": "0g53nqkhpyzy9iwz9lfh2qq8s5wrfa69lic29ps0qb92h0ac428l"
"version": "v0.179.6",
"commit-sha1": "5e9f9618cd83134b8a0d19d9bfce643b9232cb9e",
"src-sha256": "18cw2bpr0nrvws8gka4l3sfkvilg0g07z9sw5azpwph94k2sh0rb"
}

0 comments on commit bc60bd5

Please sign in to comment.