Merge staging-merged-with-master into staging-send-to-self #3682
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
https://www.msys2.org/news/?utm_source=chatgpt.com#2022-10-10-libssp-is-no-longer-required > Building with _FORTIFY_SOURCE no longer requires explicitly linking with libssp (-lssp) and enabling stack protection no longer pulls in libssp. This brings things in line with other platforms. Thanks to Martin Storsjö for implementing this in mingw-w64. Once all our affected packages are rebuilt we will remove the libssp package from our repo. It seems maybe a recent GitHub Windows-2022 runner image update bumped the toolchain to one that removed libssp, as copying libssp failed with `cp: cannot stat 'C:/mingw64/bin/libssp-0.dll': No such file or directory`.
It's failing because locize-cli in the Docker image is outdated and we won't bother making a new Docker image in the release branch just for that.
Was used to have smoother testing with unsigned Nova firmware, which is not needed anymore.
the bottom nav sometimes leaves an unwanted underline on ios. This commit fixes it by rendering a line when a menu item is active, instead of using the default text-decoration CSS property.
kylemanna/bitcoind uses only `latest`, so switching to bitcoin/bitcoin where we can fix the version. Electrs updated to v0.10.10, Dockefile inlined below: ``` FROM rust:1.90.0 RUN apt-get update RUN apt-get install -y clang cmake RUN git clone --depth 1 --branch v0.10.10 https://github.com/romanz/electrs.git /electrs-src RUN cd /electrs-src && cargo build --release WORKDIR /electrs RUN cp /electrs-src/target/release/electrs /electrs/ STOPSIGNAL SIGKILL ENTRYPOINT ["/electrs/electrs"] ```
Reproduce by: - draft transaction - click Review - cancel - click 'Edit transaction' - click Review again --> duplicate key in PSBT error The reason is that we update the PSBT with key info before we sign it, and btcd's PSBT library, somewhat unexpectedly, returns an error if you try to add the same key info again. This error is safely ignored.
--sidebar-header-size was only used in two places, removing to reduce CSS varibles.
--sidebar-header-line-heigh was only used once, also line-height should ideally not be defined in px.
Brings down the known vulnerabilities from 21 vulnerabilities (12 low, 4 moderate, 2 high, 3 critical to 15 vulnerabilities (9 low, 6 moderate) In the future it would be great to upgrade vite to > 7.2.0 and @walletconnect/types@2.23.0 although these are only types.
…elf-dropdown-merged2 One noticable conflict was due to a bugfix on release 4.49 branch, that fixed camera reloading, see 9eb83a8 Conflicts: CHANGELOG.md frontends/web/src/routes/account/send/components/inputs/receiver-address-input.tsx
Collaborator
Author
|
and after resolving all conflicts I noticed a small bug in darkmode |
thisconnect
changed the title
thisconnect
changed the base branch from
master
to
staging-send-to-self-dropdown
thisconnect
changed the title
thisconnect
merged commit b083f7d
into
BitBoxSwiss:staging-send-to-self-dropdown
13 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.