Open
Conversation
Contributor
|
конфликты |
Contributor
Author
|
@voloshinskii решено |
voloshinskii
previously approved these changes
May 5, 2025
* wip * wip * fix: set loading state on switch * Display fee in charges * Fixes after review * Cleanup --------- Co-authored-by: Grigory Serebryanyy <grishamsc@gmail.com>
* USDT Tron — 1 (#137) * USDT-TRON - add tron-swift - add TonTronKit - remove TKCryptoSwift - use forked CryptoSwift instead TKCryptoSwift * USDT-TRON - switcher in dev menu * USDT-TRON * USDT Tron — 2 (#138) * USDT-TRON - add tron-swift - add TonTronKit - remove TKCryptoSwift - use forked CryptoSwift instead TKCryptoSwift * USDT-TRON - switcher in dev menu * USDT-TRON * USDT-TRON - usdt tron toggle in settings - usdt tron in wallet * USDT Tron — 3 (#139) * USDT-TRON - add tron-swift - add TonTronKit - remove TKCryptoSwift - use forked CryptoSwift instead TKCryptoSwift * USDT-TRON - switcher in dev menu * USDT-TRON * USDT-TRON - usdt tron toggle in settings - usdt tron in wallet * USDT-TRON * USDT Tron — 4 (#140) * USDT-TRON - add tron-swift - add TonTronKit - remove TKCryptoSwift - use forked CryptoSwift instead TKCryptoSwift * USDT-TRON - switcher in dev menu * USDT-TRON * USDT-TRON - usdt tron toggle in settings - usdt tron in wallet * USDT-TRON * USDT-TRON * USDT-TRON * USDT Tron — 5 (#141) * USDT-TRON - add tron-swift - add TonTronKit - remove TKCryptoSwift - use forked CryptoSwift instead TKCryptoSwift * USDT-TRON - switcher in dev menu * USDT-TRON * USDT-TRON - usdt tron toggle in settings - usdt tron in wallet * USDT-TRON * USDT-TRON * USDT-TRON * USDT-TRON * USDT-TRON * USDT Tron — 6 (#142) * USDT-TRON - add tron-swift - add TonTronKit - remove TKCryptoSwift - use forked CryptoSwift instead TKCryptoSwift * USDT-TRON - switcher in dev menu * USDT-TRON * USDT-TRON - usdt tron toggle in settings - usdt tron in wallet * USDT-TRON * USDT-TRON * USDT-TRON * USDT-TRON * USDT-TRON * USDT-TRON * USDT Tron — 7 (#143) * USDT-TRON * USDT-TRON * USDT-TRON * USDT-TRON * USDT-TRON * USDT-TRON * Fix recId (#144) * USDT-TRON - fix sending * USDT-TRON - after rebase fix --------- Co-authored-by: Max Voloshinskii <me@voloshinskii.ru> * USDT Tron - 8 (#154) * USDT-TRON * USDT-TRON * USDT-TRON * USDT-TRON * USDT-TRON * USDT-TRON * Fix recId (#144) * USDT-TRON - fix sending * USDT-TRON - after rebase fix * USDT-TRON - use hash for forked dependencies * USDT-TRON - rename Token to TonToken * TRON-USDT - fix * USDT-TRON - update usdt tron icons * USDT-TRON - update receive * USDT-TRON - update --------- Co-authored-by: Max Voloshinskii <me@voloshinskii.ru> * USDT Tron — 9 (#157) * USDT-TRON * USDT-TRON * USDT-TRON * USDT-TRON * USDT-TRON * USDT-TRON * Fix recId (#144) * USDT-TRON - fix sending * USDT-TRON - after rebase fix * USDT-TRON - use hash for forked dependencies * USDT-TRON - rename Token to TonToken * TRON-USDT - fix * USDT-TRON - update usdt tron icons * USDT-TRON - update receive * USDT-TRON - update * USDT-TRON --------- Co-authored-by: Max Voloshinskii <me@voloshinskii.ru> * USDT Tron — 10 (#162) * USDT-TRON * USDT-TRON * USDT-TRON * USDT-TRON * USDT-TRON * USDT-TRON * Fix recId (#144) * USDT-TRON - fix sending * USDT-TRON - after rebase fix * USDT-TRON - use hash for forked dependencies * USDT-TRON - rename Token to TonToken * TRON-USDT - fix * USDT-TRON - update usdt tron icons * USDT-TRON - update receive * USDT-TRON - update * USDT-TRON * USDT-TRON --------- Co-authored-by: Max Voloshinskii <me@voloshinskii.ru> * USDT Tron — 11 (#163) * USDT-TRON * USDT-TRON * USDT-TRON * USDT-TRON * USDT-TRON * USDT-TRON * Fix recId (#144) * USDT-TRON - fix sending * USDT-TRON - after rebase fix * USDT-TRON - use hash for forked dependencies * USDT-TRON - rename Token to TonToken * TRON-USDT - fix * USDT-TRON - update usdt tron icons * USDT-TRON - update receive * USDT-TRON - update * USDT-TRON * USDT-TRON * USDT-TRON * USDT-TRON --------- Co-authored-by: Max Voloshinskii <me@voloshinskii.ru> * iOS-335 | USDT Tron fixes to USDT Tron (#191) * iOS-323 (#152) * iOS-324 (#153) * iOS-328 (#160) * iOS-326 (#156) * iOS-326 * iOS-326 - small fix * Cleanup ¯\_(ツ)_/¯ --------- Co-authored-by: Grigory Serebryanyy <grishamsc@gmail.com> * iOS-327 (#159) * Add injection * iOS-327 --------- Co-authored-by: Max Voloshinskii <me@voloshinskii.com> * iOS-330 (#164) * iOS-330 * iOS-330 * access -> use (#165) * Fix TONConnect connection rewrite issue (#158) * Fix TONConnect connection rewrite issue * Review fixes * Review fixes * Update domain for internal ton_proof (#167) * release/5.1.2 to dev (#174) * Fix domain for sign data and fix text for cell content (#166) * iOS-327-fixes (#168) * Small fixes (#173) - show spam button if blacklisted items exists - update memo required localization --------- Co-authored-by: Max Voloshinskii <me@voloshinskii.ru> * Tonkeeper - Bump version to 5.1.3 (#169) * iOS-336: Fix content color (#175) * iOS-273: Selectable fee payment type (#171) * wip * wip * fix: set loading state on switch * Display fee in charges * Fixes after review * Cleanup --------- Co-authored-by: Grigory Serebryanyy <grishamsc@gmail.com> * iOS-347 * iOS-355 (#177) * iOS-347-fix (#178) * Transaction hash copy on long press (#179) * iOS-273-fix (#180) * feature: inject theme in webview (#181) * TransactionConfirmation fee update (#183) * Tonkeeper - Bump version to 5.2.0 (#182) * 335|P1| iOS-348, iOS-354, iOS-337, iOS-341, iOS-351 (#184) * iOS-337|iOS-341|iOS-351 * iOS-354 * iOS-348 * 335|P2| iOS-353, iOS-340 (#185) * iOS-337|iOS-341|iOS-351 * iOS-354 * iOS-348 * iOS-340 * iOS-353 * 335|P1| iOS-338 (#186) * iOS-337|iOS-341|iOS-351 * iOS-354 * iOS-348 * iOS-340 * iOS-353 * iOS-338 * iOS-338 * iOS-338 * iOS-338 * iOS-338 * 335|P4| iOS-343, iOS-345 (#187) * iOS-337|iOS-341|iOS-351 * iOS-354 * iOS-348 * iOS-340 * iOS-353 * iOS-338 * iOS-338 * iOS-338 * iOS-338 * iOS-338 * iOS-343 * iOS-345 * 335|P5| iOS-346, iOS-352, iOS-350 (#188) * iOS-323 (#152) * iOS-324 (#153) * iOS-328 (#160) * iOS-326 (#156) * iOS-326 * iOS-326 - small fix * Cleanup ¯\_(ツ)_/¯ --------- Co-authored-by: Grigory Serebryanyy <grishamsc@gmail.com> * iOS-327 (#159) * Add injection * iOS-327 --------- Co-authored-by: Max Voloshinskii <me@voloshinskii.com> * iOS-330 (#164) * iOS-330 * iOS-330 * access -> use (#165) * Fix TONConnect connection rewrite issue (#158) * Fix TONConnect connection rewrite issue * Review fixes * Review fixes * Update domain for internal ton_proof (#167) * release/5.1.2 to dev (#174) * Fix domain for sign data and fix text for cell content (#166) * iOS-327-fixes (#168) * Small fixes (#173) - show spam button if blacklisted items exists - update memo required localization --------- Co-authored-by: Max Voloshinskii <me@voloshinskii.ru> * Tonkeeper - Bump version to 5.1.3 (#169) * iOS-336: Fix content color (#175) * iOS-273: Selectable fee payment type (#171) * wip * wip * fix: set loading state on switch * Display fee in charges * Fixes after review * Cleanup --------- Co-authored-by: Grigory Serebryanyy <grishamsc@gmail.com> * iOS-347 * iOS-355 (#177) * iOS-337|iOS-341|iOS-351 * iOS-354 * iOS-347-fix (#178) * Transaction hash copy on long press (#179) * iOS-273-fix (#180) * iOS-348 * iOS-340 * iOS-353 * iOS-338 * feature: inject theme in webview (#181) * iOS-338 * iOS-338 * iOS-338 * iOS-338 * iOS-343 * iOS-345 * TransactionConfirmation fee update (#183) * iOS-346 * iOS-352 * iOS-350 --------- Co-authored-by: Max Voloshinskii <me@voloshinskii.ru> Co-authored-by: Max Voloshinskii <me@voloshinskii.com> Co-authored-by: Alexander Meshcheryakov <Self-Perfection@users.noreply.github.com> * 335|P6 iOS-342|iOS-349|iOS-344 (#189) * iOS-323 (#152) * iOS-324 (#153) * iOS-328 (#160) * iOS-326 (#156) * iOS-326 * iOS-326 - small fix * Cleanup ¯\_(ツ)_/¯ --------- Co-authored-by: Grigory Serebryanyy <grishamsc@gmail.com> * iOS-327 (#159) * Add injection * iOS-327 --------- Co-authored-by: Max Voloshinskii <me@voloshinskii.com> * iOS-330 (#164) * iOS-330 * iOS-330 * access -> use (#165) * Fix TONConnect connection rewrite issue (#158) * Fix TONConnect connection rewrite issue * Review fixes * Review fixes * Update domain for internal ton_proof (#167) * release/5.1.2 to dev (#174) * Fix domain for sign data and fix text for cell content (#166) * iOS-327-fixes (#168) * Small fixes (#173) - show spam button if blacklisted items exists - update memo required localization --------- Co-authored-by: Max Voloshinskii <me@voloshinskii.ru> * Tonkeeper - Bump version to 5.1.3 (#169) * iOS-336: Fix content color (#175) * iOS-273: Selectable fee payment type (#171) * wip * wip * fix: set loading state on switch * Display fee in charges * Fixes after review * Cleanup --------- Co-authored-by: Grigory Serebryanyy <grishamsc@gmail.com> * iOS-347 * iOS-355 (#177) * iOS-337|iOS-341|iOS-351 * iOS-354 * iOS-347-fix (#178) * Transaction hash copy on long press (#179) * iOS-273-fix (#180) * iOS-348 * iOS-340 * iOS-353 * iOS-338 * feature: inject theme in webview (#181) * iOS-338 * iOS-338 * iOS-338 * iOS-338 * iOS-343 * iOS-345 * TransactionConfirmation fee update (#183) * iOS-346 * iOS-352 * iOS-350 * iOS-342 * iOS-342 * iOS-342 * iOS-349 * iOS-344 * Tonkeeper - Bump version to 5.2.0 (#182) --------- Co-authored-by: Max Voloshinskii <me@voloshinskii.ru> Co-authored-by: Max Voloshinskii <me@voloshinskii.com> Co-authored-by: Alexander Meshcheryakov <Self-Perfection@users.noreply.github.com> * 335|P7 (#190) * iOS-323 (#152) * iOS-324 (#153) * iOS-328 (#160) * iOS-326 (#156) * iOS-326 * iOS-326 - small fix * Cleanup ¯\_(ツ)_/¯ --------- Co-authored-by: Grigory Serebryanyy <grishamsc@gmail.com> * iOS-327 (#159) * Add injection * iOS-327 --------- Co-authored-by: Max Voloshinskii <me@voloshinskii.com> * iOS-330 (#164) * iOS-330 * iOS-330 * access -> use (#165) * Fix TONConnect connection rewrite issue (#158) * Fix TONConnect connection rewrite issue * Review fixes * Review fixes * Update domain for internal ton_proof (#167) * release/5.1.2 to dev (#174) * Fix domain for sign data and fix text for cell content (#166) * iOS-327-fixes (#168) * Small fixes (#173) - show spam button if blacklisted items exists - update memo required localization --------- Co-authored-by: Max Voloshinskii <me@voloshinskii.ru> * Tonkeeper - Bump version to 5.1.3 (#169) * iOS-336: Fix content color (#175) * iOS-273: Selectable fee payment type (#171) * wip * wip * fix: set loading state on switch * Display fee in charges * Fixes after review * Cleanup --------- Co-authored-by: Grigory Serebryanyy <grishamsc@gmail.com> * iOS-347 * iOS-355 (#177) * iOS-337|iOS-341|iOS-351 * iOS-354 * iOS-347-fix (#178) * Transaction hash copy on long press (#179) * iOS-273-fix (#180) * iOS-348 * iOS-340 * iOS-353 * iOS-338 * feature: inject theme in webview (#181) * iOS-338 * iOS-338 * iOS-338 * iOS-338 * iOS-343 * iOS-345 * TransactionConfirmation fee update (#183) * iOS-346 * iOS-352 * iOS-350 * iOS-342 * iOS-342 * iOS-342 * iOS-349 * iOS-344 * Tonkeeper - Bump version to 5.2.0 (#182) * iOS-359 * iOS-358 * iOS-342 * iOS-350 * iOS-335 --------- Co-authored-by: Max Voloshinskii <me@voloshinskii.ru> Co-authored-by: Max Voloshinskii <me@voloshinskii.com> Co-authored-by: Alexander Meshcheryakov <Self-Perfection@users.noreply.github.com> --------- Co-authored-by: Max Voloshinskii <me@voloshinskii.ru> Co-authored-by: Max Voloshinskii <me@voloshinskii.com> Co-authored-by: Alexander Meshcheryakov <Self-Perfection@users.noreply.github.com> * Merge issue fix * USDT TRON under remote feature flag (#193) --------- Co-authored-by: Max Voloshinskii <me@voloshinskii.ru> Co-authored-by: Max Voloshinskii <me@voloshinskii.com> Co-authored-by: Alexander Meshcheryakov <Self-Perfection@users.noreply.github.com>
* iOS-358 * iOS-352
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.