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

fix: swap percentage done btn icon #6406

Merged
merged 4 commits into from
Dec 26, 2024
Merged

fix: swap percentage done btn icon #6406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
21439c7
fix: swap percentage done btn icon
ezailWang Dec 24, 2024
520ca52
Merge branch 'x' into fix/native-check-btn
originalix Dec 26, 2024
479959e
Merge branch 'x' into fix/native-check-btn
originalix Dec 26, 2024
59b94f7
Merge branch 'x' into fix/native-check-btn
originalix Dec 26, 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
8 changes: 2 additions & 6 deletions packages/kit/src/views/Swap/pages/components/SwapActionsState.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ function PageFooter({
actionComponent: React.JSX.Element;
}) {
const isShow = useIsKeyboardShown();
const intl = useIntl();
return (
<Page.Footer>
<Page.FooterActions
Expand Down Expand Up @@ -101,6 +100,7 @@ function PageFooter({
/>
))}
<Button
icon="CheckLargeOutline"
flex={1}
h="$10"
size="small"
Expand All @@ -111,11 +111,7 @@ function PageFooter({
onPress={() => {
Keyboard.dismiss();
}}
>
{intl.formatMessage({
id: ETranslations.global_confirm,
})}
</Button>
/>
</>
</XStack>
) : null}
Expand Down
49 changes: 49 additions & 0 deletions packages/shared/src/locale/enum/translations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1486,6 +1486,55 @@
p2sh_p2wpkh_desc = 'p2sh_p2wpkh_desc',
p2tr_desc = 'p2tr_desc',
p2wpkh_desc = 'p2wpkh_desc',
prime_agree_to_terms = 'prime.agree_to_terms',
prime_change_email = 'prime.change_email',
prime_change_password = 'prime.change_password',
prime_code_resend = 'prime.code_resend',
prime_confirm_password = 'prime.confirm_password',
prime_confirm_password_description = 'prime.confirm_password_description',
prime_currently_email = 'prime.currently_email',
prime_description = 'prime.description',
prime_email_changed = 'prime.email_changed',
prime_end_date = 'prime.end_date',
prime_enter_verification_code = 'prime.enter_verification_code',
prime_forget_password = 'prime.forget_password',
prime_incorrect_password = 'prime.incorrect_password',
prime_invalid_verification_code = 'prime.invalid_verification_code',
prime_log_out = 'prime.log_out',
prime_manage_subscription = 'prime.manage_subscription',
prime_manage_your_onekeyid = 'prime.manage_your_onekeyid',
prime_monthly = 'prime.monthly',
prime_new_email_code = 'prime.new_email_code',
prime_new_password = 'prime.new_password',
prime_new_password_description = 'prime.new_password_description',
prime_onekeyid_continue = 'prime.onekeyid_continue',
prime_onekeyid_continue_description = 'prime.onekeyid_continue_description',
prime_onekeyid_email_error = 'prime.onekeyid_email_error',
prime_onekeyid_log_out = 'prime.onekeyid_log_out',
prime_onekeyid_log_out_decription = 'prime.onekeyid_log_out_decription',
prime_onekeyid_signup = 'prime.onekeyid_signup',
prime_onekeyid_signup_description = 'prime.onekeyid_signup_description',
prime_password = 'prime.password',
prime_password_characters = 'prime.password_characters',
prime_password_letter = 'prime.password_letter',
prime_password_number = 'prime.password_number',
prime_password_placeholder = 'prime.password_placeholder',
prime_password_special_characters = 'prime.password_special_characters',
prime_payment_cancelled = 'prime.payment_cancelled',
prime_payment_successful = 'prime.payment_successful',
prime_payment_successful_description = 'prime.payment_successful_description',
prime_per_month = 'prime.per_month',
prime_save_discount = 'prime.save_discount',
prime_send_code = 'prime.send_code',
prime_sent_to = 'prime.sent_to',
prime_signup_login = 'prime.signup_login',
prime_status_free = 'prime.status_free',
prime_status_prime = 'prime.status_prime',
prime_subscribe = 'prime.subscribe',
prime_update_email_address = 'prime.update_email_address',
prime_update_email_address_description = 'prime.update_email_address_description',
prime_welcome_back = 'prime.welcome_back',
prime_yearly = 'prime.yearly',
provider_amount_received = 'provider.amount_received',
provider_amount_required = 'provider.amount_required',
provider_approval_require = 'provider.approval_require',
Expand Down
53 changes: 51 additions & 2 deletions packages/shared/src/locale/json/bn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,7 @@
"global.collect_to_device_canceled": "ডিভাইসে বাতিল করা হয়েছে",
"global.collect_to_device_failed": "সংগ্রহ করতে ব্যর্থ হয়েছে, দয়া করে আবার চেষ্টা করুন",
"global.community": "সম্প্রদায়",
"global.confirm": "নিশ্চিত করুন",
"global.confirm": "ঠিক",
"global.confirm_on_device": "ডিভাইসে নিশ্চিত করুন",
"global.confirmations": "নিশ্চিতকরণ",
"global.connect": "সংযোগ করুন",
Expand Down Expand Up @@ -1481,6 +1481,55 @@
"p2sh_p2wpkh_desc": "\"bc1q\" দিয়ে শুরু হয়। P2SH-P2WPKH (m/84'/0'/0')",
"p2tr_desc": "\"bc1p\" দিয়ে শুরু হয়। P2TR (m/86'/0'/0')",
"p2wpkh_desc": "\"3\" দিয়ে শুরু হয়। P2WPKH (m/49'/0'/0')",
"prime.agree_to_terms": "অবিরত থাকলে আপনি OneKey Prime Terms-এর সাথে সম্মত হচ্ছেন।",
"prime.change_email": "ইমেইল পরিবর্তন করুন",
"prime.change_password": "পাসওয়ার্ড পরিবর্তন করুন",
"prime.code_resend": "পুনরায় পাঠান",
"prime.confirm_password": "পাসওয়ার্ড নিশ্চিত করুন",
"prime.confirm_password_description": "পাসওয়ার্ড পরিবর্তন করার আগে। আমাদের OneKey ID এর বর্তমান পাসওয়ার্ড যাচাই করতে হবে।",
"prime.currently_email": "বর্তমানে: {currentlyemail}",
"prime.description": "উন্নত বৈশিষ্ট্যগুলি আনলক করুন আপনার ক্রিপ্টো সম্পদ ব্যবস্থাপনা অভিজ্ঞতা উন্নত করতে।",
"prime.email_changed": "ইমেইল পরিবর্তিত হয়েছে",
"prime.end_date": "শেষ হবে {data}",
"prime.enter_verification_code": "যাচাইকরণ কোড প্রবেশ করুন",
"prime.forget_password": "পাসওয়ার্ড ভুলে গেছেন?",
"prime.incorrect_password": "ভুল পাসওয়ার্ড",
"prime.invalid_verification_code": "অবৈধ যাচাইকরণ কোড",
"prime.log_out": "লগ আউট",
"prime.manage_subscription": "সাবস্ক্রিপশন পরিচালনা করুন",
"prime.manage_your_onekeyid": "আপনার OneKey আইডি পরিচালনা করুন।",
"prime.monthly": "মাসিক",
"prime.new_email_code": "আপনার নতুন ইমেইল ঠিকানা লিখুন, আমরা এটি যাচাই করার জন্য একটি যাচাইকরণ কোড পাঠাব।",
"prime.new_password": "নতুন পাসওয়ার্ড",
"prime.new_password_description": "আপনি নতুন পাসওয়ার্ড রিসেট করছেন: {email}",
"prime.onekeyid_continue": "OneKey আইডি দিয়ে চালিয়ে যান",
"prime.onekeyid_continue_description": "OneKey আইডি হল আপনার প্রাইম সুবিধাগুলি অ্যাক্সেস করার জন্য যা প্রয়োজন।",
"prime.onekeyid_email_error": "ভুল ইমেল ঠিকানা",
"prime.onekeyid_log_out": "OneKey আইডি লগ আউট",
"prime.onekeyid_log_out_decription": "OneKey আইডি পাসওয়ার্ড পরিবর্তনের কারণে, এই ডিভাইসটি লগ আউট করা হয়েছে। আবার লগ ইন করুন.",
"prime.onekeyid_signup": "OneKey আইডি তৈরি করুন",
"prime.onekeyid_signup_description": "{email} এখনও নিবন্ধিত হয়নি, আমরা আপনার জন্য একটি নতুন অ্যাকাউন্ট তৈরি করব।",
"prime.password": "পাসওয়ার্ড",
"prime.password_characters": "অন্তত ৮ অক্ষর",
"prime.password_letter": "অন্তত ১টি অক্ষর",
"prime.password_number": "অন্তত ১ সংখ্যা",
"prime.password_placeholder": "পাসওয়ার্ড",
"prime.password_special_characters": "অন্তত ১টি বিশেষ অক্ষর",
"prime.payment_cancelled": "পেমেন্ট বাতিল করা হয়েছে",
"prime.payment_successful": "পেমেন্ট সফল হয়েছে",
"prime.payment_successful_description": "আপনার কেনাকাটার জন্য ধন্যবাদ, আশা করি OneKey Prime আপনাকে একটি নিরাপদ এবং আরও প্রিমিয়াম অভিজ্ঞতা অর্জনে সহায়তা করবে।",
"prime.per_month": "প্রতি মাসে",
"prime.save_discount": "{discount%} সঞ্চয় করুন",
"prime.send_code": "কোড পাঠান",
"prime.sent_to": "{email} এ পাঠানো হয়েছে",
"prime.signup_login": "সাইন আপ/লগইন করুন",
"prime.status_free": "মুক্ত",
"prime.status_prime": "Prime",
"prime.subscribe": "সাবস্ক্রাইব করুন",
"prime.update_email_address": "ইমেল ঠিকানা আপডেট করুন",
"prime.update_email_address_description": "ইমেইল পরিবর্তন করার আগে। আমাদের OneKey ID এর পাসওয়ার্ড যাচাই করতে হবে।",
"prime.welcome_back": "আবার স্বাগতম",
"prime.yearly": "বার্ষিক",
"provider.amount_received": "{amount} {token}",
"provider.amount_required": "অপর্যাপ্ত ইনপুট পরিমাণ",
"provider.approval_require": "স্বপ করার আগে টোকেন অনুমোদন করা প্রয়োজন",
Expand Down Expand Up @@ -1865,7 +1914,7 @@
"swap_page.create_to_enable_network": "নেটওয়ার্ক সক্রিয় করতে তৈরি করুন",
"swap_page.from": "থেকে",
"swap_page.limit": "সীমা",
"swap_page.limit_dialog_button": "নিশ্চিত করুন",
"swap_page.limit_dialog_button": "ঠিক",
"swap_page.limit_dialog_content": "সীমিত অর্ডার শীঘ্রই উপলব্ধ হবে। আপনার যদি OneKey V4 এ পুরানো অর্ডার থাকে, তবে আপনি আপনার অর্ডারগুলি দেখতে বা পরিচালনা করতে Matcha (https://matcha.xyz) ভিজিট করতে পারেন।",
"swap_page.limit_dialog_title": "সীমাবদ্ধ অর্ডার",
"swap_page.max": "ম্যাক্স",
Expand Down
49 changes: 49 additions & 0 deletions packages/shared/src/locale/json/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1481,6 +1481,55 @@
"p2sh_p2wpkh_desc": "Beginnt mit \"bc1q\". P2SH-P2WPKH (m/84'/0'/0')",
"p2tr_desc": "Beginnt mit \"bc1p\". P2TR (m/86'/0'/0')",
"p2wpkh_desc": "Beginnt mit \"3\". P2WPKH (m/49'/0'/0')",
"prime.agree_to_terms": "Mit dem Fortfahren stimmen Sie den OneKey Prime-Bedingungen zu.",
"prime.change_email": "E-Mail ändern",
"prime.change_password": "Passwort ändern",
"prime.code_resend": "Erneut senden",
"prime.confirm_password": "Passwort bestätigen",
"prime.confirm_password_description": "Bevor Sie das Passwort ändern, müssen wir das aktuelle Passwort der OneKey ID überprüfen.",
"prime.currently_email": "Derzeit: {currentlyemail}",
"prime.description": "Schalten Sie erweiterte Funktionen frei, um Ihr Erlebnis im Krypto-Asset-Management zu verbessern.",
"prime.email_changed": "E-Mail geändert",
"prime.end_date": "Endet am {data}",
"prime.enter_verification_code": "Geben Sie den Bestätigungscode ein",
"prime.forget_password": "Passwort vergessen?",
"prime.incorrect_password": "Falsches Passwort",
"prime.invalid_verification_code": "Ungültiger Bestätigungscode",
"prime.log_out": "Abmelden",
"prime.manage_subscription": "Abonnement verwalten",
"prime.manage_your_onekeyid": "Verwalten Sie Ihre OneKey ID.",
"prime.monthly": "Monatlich",
"prime.new_email_code": "Geben Sie Ihre neue E-Mail-Adresse ein, wir senden Ihnen einen Bestätigungscode, um sie zu verifizieren.",
"prime.new_password": "Neues Passwort",
"prime.new_password_description": "Sie setzen das neue Passwort für: {email} zurück",
"prime.onekeyid_continue": "Fortfahren mit OneKey ID",
"prime.onekeyid_continue_description": "OneKey ID ist alles, was Sie benötigen, um alle Prime-Vorteile zu nutzen.",
"prime.onekeyid_email_error": "Falsche E-Mail-Adresse",
"prime.onekeyid_log_out": "OneKey ID abmelden",
"prime.onekeyid_log_out_decription": "Aufgrund einer Änderung des OneKey ID-Passworts wurde dieses Gerät abgemeldet. Bitte melden Sie sich erneut an.",
"prime.onekeyid_signup": "Registrieren Sie sich für OneKey ID",
"prime.onekeyid_signup_description": "{email} ist noch nicht registriert, wir werden ein neues Konto für Sie erstellen.",
"prime.password": "Passwort",
"prime.password_characters": "Mindestens 8 Zeichen",
"prime.password_letter": "Mindestens 1 Buchstabe",
"prime.password_number": "Mindestens 1 Zahl",
"prime.password_placeholder": "Passwort",
"prime.password_special_characters": "Mindestens 1 Sonderzeichen",
"prime.payment_cancelled": "Zahlung storniert",
"prime.payment_successful": "Zahlung erfolgreich",
"prime.payment_successful_description": "Vielen Dank für Ihren Kauf. Möge OneKey Prime Ihnen helfen, ein sichereres und hochwertigeres Erlebnis zu erreichen.",
"prime.per_month": "Pro Monat",
"prime.save_discount": "Sparen Sie {discount%}",
"prime.send_code": "Code senden",
"prime.sent_to": "Gesendet an {email}",
"prime.signup_login": "Registrieren / Einloggen",
"prime.status_free": "Kostenlos",
"prime.status_prime": "Prime",
"prime.subscribe": "Abonnieren",
"prime.update_email_address": "E-Mail-Adresse aktualisieren",
"prime.update_email_address_description": "Bevor Sie die E-Mail ändern, müssen wir das Passwort der OneKey ID überprüfen.",
"prime.welcome_back": "Willkommen zurück",
"prime.yearly": "Jährlich",
"provider.amount_received": "{amount} {token}",
"provider.amount_required": "Unzureichende Eingabemenge",
"provider.approval_require": "Muss Token vor dem Tausch genehmigen",
Expand Down
49 changes: 49 additions & 0 deletions packages/shared/src/locale/json/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1481,6 +1481,55 @@
"p2sh_p2wpkh_desc": "Starts with \"bc1q\". P2SH-P2WPKH (m/84'/0'/0')",
"p2tr_desc": "Starts with \"bc1p\". P2TR (m/86'/0'/0')",
"p2wpkh_desc": "Starts with \"3\". P2WPKH (m/49'/0'/0')",
"prime.agree_to_terms": "By continuing, you accept the OneKey Prime Terms.",
"prime.change_email": "Change email",
"prime.change_password": "Change password",
"prime.code_resend": "Resend",
"prime.confirm_password": "Confirm password",
"prime.confirm_password_description": "Before you change your password, we need to verify the current password of your OneKey ID.",
"prime.currently_email": "Currently: {currentlyemail}",
"prime.description": "Unlock advanced features to enhance your crypto asset management experience.",
"prime.email_changed": "Email changed",
"prime.end_date": "Ends on {data}",
"prime.enter_verification_code": "Enter the verification code",
"prime.forget_password": "Forgot your password?",
"prime.incorrect_password": "Incorrect password",
"prime.invalid_verification_code": "Invalid verification code",
"prime.log_out": "Log out",
"prime.manage_subscription": "Manage subscription",
"prime.manage_your_onekeyid": "Manage your OneKey ID.",
"prime.monthly": "Monthly",
"prime.new_email_code": "Enter your new email address, and we will send a verification code to confirm it.",
"prime.new_password": "New Password",
"prime.new_password_description": "You are resetting new password for: {email}",
"prime.onekeyid_continue": "Continue with OneKey ID",
"prime.onekeyid_continue_description": "OneKey ID is all you need to access all Prime benefits.",
"prime.onekeyid_email_error": "Incorrect email address",
"prime.onekeyid_log_out": "OneKey ID log out",
"prime.onekeyid_log_out_decription": "Due to OneKey ID password change, this device has been logged out. Please log in again.",
"prime.onekeyid_signup": "Sign up for OneKey ID",
"prime.onekeyid_signup_description": "{email} is not registered yet, so we will create a new account for you.",
"prime.password": "Password",
"prime.password_characters": "At least 8 characters",
"prime.password_letter": "At least one letter",
"prime.password_number": "At least one number",
"prime.password_placeholder": "Password",
"prime.password_special_characters": "At least one special character",
"prime.payment_cancelled": "Payment has been cancelled",
"prime.payment_successful": "Payment successful",
"prime.payment_successful_description": "Thank you for your purchase. May OneKey Prime help you achieve a safer and more premium experience.",
"prime.per_month": "Per Month",
"prime.save_discount": "Save {discount%}",
"prime.send_code": "Send code",
"prime.sent_to": "Sent to {email}",
"prime.signup_login": "Sign up / Login",
"prime.status_free": "Free",
"prime.status_prime": "Prime",
"prime.subscribe": "Subscribe",
"prime.update_email_address": "Update email address",
"prime.update_email_address_description": "Before you change your email, we need to verify the password for your OneKey ID.",
"prime.welcome_back": "Welcome back",
"prime.yearly": "Yearly",
"provider.amount_received": "{amount} {token}",
"provider.amount_required": "Insufficient input amount",
"provider.approval_require": "Need to approve token before swap",
Expand Down
Loading
Loading