Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Merge 5.19 dev #434

Merged
merged 4 commits into from
Dec 24, 2024
Merged

Merge 5.19 dev #434

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
7e98dec
AND-9390 change sdk texts
kozarezvlad Dec 6, 2024
81ba28b
Merge branch 'release-app_5.19' into merge_5.18_5.19
kozarezvlad Dec 9, 2024
89a3829
Merge pull request #432 from tangem/merge_5.18_5.19
kozarezvlad Dec 9, 2024
7e4ddaa
Merge branch 'develop' into merge_5.19_dev
kozarezvlad Dec 24, 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
9 changes: 9 additions & 0 deletions tangem-sdk-android/src/main/res/layout/pin_code_request_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,15 @@

</FrameLayout>

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/tangem_never_pregenerate_code_alert"
android:layout_marginTop="12dp"
android:layout_marginHorizontal="16dp"
android:textColor="@color/dark_gray"
/>

<View
android:layout_width="match_parent"
android:layout_height="0dp"
Expand Down
1 change: 1 addition & 0 deletions tangem-sdk-android/src/main/res/values-ru/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
<string name="reset_codes_scan_to_reset">Отсканируйте карту или кольцо для сброса кода</string>
<string name="reset_codes_success_message">Код успешно сброшен</string>
<string name="sign_multiple_chunks_part">Подпись части %1$d из %2$d</string>
<string name="tangem_never_pregenerate_code_alert">Tangem никогда не продает кошельки вместе с кодом доступа</string>
<string name="view_delegate_delay">Операция в процессе</string>
<string name="view_delegate_header_card">Карта</string>
<string name="view_delegate_scan">Готово к сканированию</string>
Expand Down
1 change: 1 addition & 0 deletions tangem-sdk-android/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
<string name="reset_codes_scan_to_reset">Scan card or ring to reset user codes</string>
<string name="reset_codes_success_message">Code was reset successfully</string>
<string name="sign_multiple_chunks_part">Signing part %1$d of %2$d</string>
<string name="tangem_never_pregenerate_code_alert">Tangem never sells wallets along with the pre-generated access code</string>
<string name="view_delegate_delay">Operation is in progress</string>
<string name="view_delegate_header_card">Card</string>
<string name="view_delegate_scan">Ready to scan</string>
Expand Down
Loading