Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master into staging-ln #3088

Merged

Conversation

thisconnect
Copy link
Collaborator

@thisconnect thisconnect commented Dec 3, 2024

The only conflict was in

        frontends/web/src/components/transactions/transaction.tsx

Beerosagos and others added 30 commits October 1, 2024 10:53
Also remove unused "button.buy" locize label.
With different translations the action buttons (send, receive, buy
& sell and WC) did not break nicely on small screen.

Due to limited button height the text could be outside of the button
and only visible in darkmode but not in normal mode (white on gray).

Changed to let the buttons break onto 2 lines of text if there is
not enough horozontal space.
this commit ensures consistent spacing between "Receiver address"
and "Transaction details" by using a container with fixed height
and margin, always rendered, regardless of coin control being
enabled or disabled.
Mantaining a json-blob is not as easy as maintaining a yaml multiline
string. I don't think icon_emoji and props/card pull their weight for us
to use the "PAYOLOAD" field instead of the "TEXT" field.
The "No priority" option has been removed because it can be confusing
for users, and selecting it during high fee times can cause transactions
to get stuck. Advanced users can still set custom fees if needed.
…4.45-merged

Conflicts:
	frontends/android/BitBoxApp/app/build.gradle
	frontends/web/src/locales/ja/app.json
	frontends/web/src/routes/account/account.module.css
Identical UI with the select account dropdown in buy & sell page
with icon and coin name on the option and selected value.
7c0b2f6 introduced a 300ms wait between the QrScanner creation and its
start to fix a bug on re-renders of the component, but it seems not
to be enough on certain devices, which still show the bug.

It would be nice to change the 300ms fixed wait to a better way to know
when the scanner is ready to be started but we could not find it.

This commit improves the general structure of the component, to limit
race conditions across re-renders and seems to improve the behavior and
fix the bug with the tested devices.
BTC Direct supports buying and selling LTC through their private
trading desk, so the link and info should also be shown to Litecoin
accounts on exchange selection.
benma and others added 26 commits November 26, 2024 14:32
Until now a send-to-self transaction looked more like an outgoing
transaction with the amount sent.

Changed to only show the fee paid as outgoing and the amount of
coin as conversion amount.
Prefixing this style prevents it from leaking globally and changing
all label elements to render with gray font.
This allows to add platform specific CSS, i.e. for scrollbars
Changed to use native scrollbars on macOS, iOS and Android.

Only keep custom scrollbar CSS for Linux and Windows.
Before the checkbox was hard to see in normal mode and very bright
in dark mode.
Radio inputs should be consistent with checkbox input elements.
To improve codebase by reducing redundancy, we create a reusable
single & multi dropdown based on ReactSelect.
use the Dropdown component in several places:
- Country selector
- Coin selector
- Language & default currency selector
- Active currencies (multi select) selector

and removed unused SingleDropdown component
This adds a GitHub Action job to build the Windows app and create the
installer. Artifacts will be reported on Mattermost, like with other
platforms.

Notable differences to our previous Appveyor CI:

* The GitHub windows-2019 image comes with Vistual Studio Enterprise
instead of the Community edition. A directoy junction is created to
point calls from the Community to the Enterprise path.
* NSIS, MinGW and Make are pre-installed already, not requiring any
installations with choco anymore.
* Qt is not pre-installed anymore and now installed using an Action.

Because there are no changes to other files, the Appveyor build will
continue to work and can be used in parallel.
Show dialog when enabling remember wallet to better inform users
about what the feature is. The dialog is an element itself called
EnableRememberWalletDialog.

This dialog is (also) controlled by a new config variable called
hideEnableRememberWalletDialog.

Also created DisableRememberWalletDialog component (just a
refactor).
…master

Conflicts:
	frontends/web/src/components/transactions/transaction.tsx
@thisconnect thisconnect changed the title Staging ln merge master Merge master into staging-ln Dec 3, 2024
Copy link
Collaborator

@Beerosagos Beerosagos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! 🙏

@thisconnect thisconnect merged commit dd2a2ce into BitBoxSwiss:staging-ln Dec 3, 2024
7 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants