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

IOS-8425: KRC20 tokens app integration #4236

Merged
merged 81 commits into from
Dec 2, 2024
Merged

IOS-8425: KRC20 tokens app integration #4236

merged 81 commits into from
Dec 2, 2024

Conversation

m3g0byt3
Copy link
Contributor

@m3g0byt3 m3g0byt3 commented Nov 18, 2024 •
edited
Loading

siblockchaina and others added 21 commits October 31, 2024 17:04
@siblockchaina
IOS-8249 KRC20 added
1833753
@siblockchaina
IOS-8249 merge develop
52e0d06
@siblockchaina
IOS-8249 fix blockchain list
79e8832
@siblockchaina
IOS-8249 fix lost TangemModule
863bf69
@siblockchaina
IOS-8249 remove mock blockchain for KRC20
3391132
@siblockchaina
IOS-8249 enable canHandleTokens
062735c
Merge branch 'develop' into feature/IOS-8425_krc20_app_integration
407efbb 
Signed-off-by: Andrey Fedorov <[email protected]>
IOS-8425: Fix address validation and token naming
911657a 
Signed-off-by: Andrey Fedorov <[email protected]>
@siblockchaina
IOS-8249 fix, clean, update transaction mass constant
c9673a8
@siblockchaina
IOS-8249 update, removed commission recalculation for repeated reveal…
77da14a 
… transactions
Merge branch 'IOS-8249_BSDK_KRC20' into feature/IOS-8425_krc20_app_in…
9df87a4 
…tegration

Signed-off-by: Andrey Fedorov <[email protected]>
Merge branch 'develop' into feature/IOS-8425_krc20_app_integration
ead8c78 
Signed-off-by: Andrey Fedorov <[email protected]>
@github-actions @tangem-service
[Localise] Sync translations for en,fr,de,ja,ru,es,uk_UA,zh-Hant,it…
92b8866 
… languages (11899643889) (#4235)

Co-authored-by: Tangem Service <[email protected]>
IOS-8425: Add required UI stuff
51ba441 
Signed-off-by: Andrey Fedorov <[email protected]>
IOS-8425: Add blockchain to AssetRequirementsCondition
cd941ff 
Signed-off-by: Andrey Fedorov <[email protected]>
IOS-8425: Improve Kaspa wallet manager creation
62b20ed 
Signed-off-by: Andrey Fedorov <[email protected]>
IOS-8425: Fix typos and linting issues
e3ef0ca 
Signed-off-by: Andrey Fedorov <[email protected]>
IOS-8425: Improve KaspaIncompleteTokenTransactionStorageID type
cb3e40c 
Signed-off-by: Andrey Fedorov <[email protected]>
IOS-8425: AssetRequirementsManager implementation (WIP)
93623e4 
Signed-off-by: Andrey Fedorov <[email protected]>
Merge branch 'develop' into IOS-8249_BSDK_KRC20
b7bb755 
Signed-off-by: Andrey Fedorov <[email protected]>
Merge branch 'IOS-8249_BSDK_KRC20' into feature/IOS-8425_krc20_app_in…
f5d5f75 
…tegration

Signed-off-by: Andrey Fedorov <[email protected]>
@m3g0byt3 m3g0byt3 added the WIP Work in progress label Nov 18, 2024
Andrey Fedorov added 3 commits November 27, 2024 17:10
IOS-8425: Update app config
d890d4c 
Signed-off-by: Andrey Fedorov <[email protected]>
IOS-8425: Revert "IOS-8425: Update app config"
bc2f23f 
This reverts commit d890d4c.

Signed-off-by: Andrey Fedorov <[email protected]>
IOS-8425: Revert "IOS-8425: Resolve KRC20 API using local/remote API …
b347b9a 
…list"

This reverts commit 2018fad.

Signed-off-by: Andrey Fedorov <[email protected]>
Base automatically changed from IOS-8249_BSDK_KRC20 to develop November 28, 2024 11:58
@m3g0byt3 m3g0byt3 dismissed stale reviews from ba1ashov, tureck1y, and skibinalexander November 28, 2024 11:58

The base branch was changed.

Andrey Fedorov and others added 4 commits November 28, 2024 14:40
Merge branch 'develop' into feature/IOS-8425_krc20_app_integration
1756d49 
Signed-off-by: Andrey Fedorov <[email protected]>

# Conflicts:
#	BlockchainSdk/Blockchains/Kaspa/KaspaKRC20/KaspaKRC20.swift
#	BlockchainSdk/Blockchains/Kaspa/KaspaTransactionBuilder.swift
#	BlockchainSdk/Blockchains/Kaspa/KaspaWalletAssembly.swift
#	BlockchainSdk/Blockchains/Kaspa/KaspaWalletManager.swift
IOS-8425: Fix some comments from the previous PR
94a1f74 
Signed-off-by: Andrey Fedorov <[email protected]>
IOS-8425: Fix merge issues
06cd642 
Signed-off-by: Andrey Fedorov <[email protected]>
@github-actions @tangem-service
[Localise] Sync translations for en,fr,de,ja,ru,es,uk_UA,zh-Hant,it…
babe1e1 
… languages (12070486809) (#4306)

Co-authored-by: Tangem Service <[email protected]>
ba1ashov
ba1ashov previously approved these changes Nov 28, 2024
View reviewed changes
@m3g0byt3 m3g0byt3 dismissed stale reviews from skibinalexander and ba1ashov via 895a512 November 28, 2024 14:34
@tureck1y tureck1y merged commit 85e422a into develop Dec 2, 2024
5 checks passed
@tureck1y tureck1y deleted the feature/IOS-8425_krc20_app_integration branch December 2, 2024 17:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tureck1y tureck1y tureck1y approved these changes

@skibinalexander skibinalexander skibinalexander approved these changes

@ba1ashov ba1ashov ba1ashov approved these changes

@dbaturin dbaturin Awaiting requested review from dbaturin

@siblockchaina siblockchaina Awaiting requested review from siblockchaina

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@m3g0byt3 @tureck1y @skibinalexander @ba1ashov @siblockchaina