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.

Sign up for GitHub

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

Jump to bottom

[LIVE-13096][LIVE-13098][LLM][Flex] Wrong redirection and text overlaps during Send #7223

Merged
merged 2 commits into from
Jul 1, 2024
Merged

[LIVE-13096][LIVE-13098][LLM][Flex] Wrong redirection and text overlaps during Send #7223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba54c8f
fix(llm): fix wrong redirection bug
jiyuzhuang Jun 27, 2024
4818a20
fix(llm): lottie display bug for Flex
jiyuzhuang Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/plenty-weeks-double.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"live-mobile": patch
---

Fix image overlaps bug during Send on Flex.
5 changes: 5 additions & 0 deletions .changeset/weak-kings-flow.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"live-mobile": patch
---

Fix redirecting to wrong workflow bug.
Copy link
Contributor

Choose a reason for hiding this comment

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

One changeset file should be enough

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This PR contains fixes for 2 tickets, so I think it's better to specify.

4 changes: 2 additions & 2 deletions apps/ledger-live-mobile/src/components/DeviceAction/rendering.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import {
getFeesUnit,
} from "@ledgerhq/live-common/account/index";
import { TFunction } from "react-i18next";
import { DeviceModelId } from "@ledgerhq/types-devices";
import { DeviceModelId, QRCodeDevices } from "@ledgerhq/types-devices";
import type { DeviceModelInfo } from "@ledgerhq/types-live";
import { StackNavigationProp } from "@react-navigation/stack";
import { ParamListBase } from "@react-navigation/native";
Expand Down Expand Up @@ -773,7 +773,7 @@ export function renderDeviceNotOnboarded({
navigation: StackNavigationProp<ParamListBase>;
}) {
const navigateToOnboarding = () => {
if (device.modelId === DeviceModelId.stax) {
if (QRCodeDevices.includes(device.modelId)) {
// On pairing success, navigate to the Sync Onboarding Companion
navigation.navigate(NavigatorName.BaseOnboarding, {
screen: NavigatorName.SyncOnboarding,
Expand Down
4 changes: 2 additions & 2 deletions apps/ledger-live-mobile/src/components/ValidateOnDevice.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { getDeviceModel } from "@ledgerhq/devices";
import { useTheme } from "@react-navigation/native";
import styled from "styled-components/native";
import { Flex } from "@ledgerhq/native-ui";
import { DeviceModelId } from "@ledgerhq/types-devices";
import { QRCodeDevices } from "@ledgerhq/types-devices";
import Alert from "./Alert";
import perFamilyTransactionConfirmFields from "../generated/TransactionConfirmFields";
import { DataRowUnitValue, TextValueField } from "./ValidateOnDeviceDataRow";
Expand Down Expand Up @@ -170,7 +170,7 @@ export default function ValidateOnDevice({
<AnimationContainer>
<Animation
source={getDeviceAnimation({ device, key: "sign", theme })}
style={device.modelId === DeviceModelId.stax ? { height: 210 } : {}}
style={QRCodeDevices.includes(device.modelId) ? { height: 210 } : {}}
/>
</AnimationContainer>
{Title ? (
Expand Down
Loading