Develop to main #56
Open
Develop to main #56
Conversation
This file contains 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
…rProject-Public-4 into garipov/Satistics # Conflicts: # FakeNFT.xcodeproj/project.pbxproj # FakeNFT/Presentation/StatisticsFlow/StatisticViewController.swift
add localized strings
…rProject-Public-4 into garipov/Satistics
added custom NFTCell, CartViewModel for mock
Add view models on tab bar & fixing
…T-StarterProject-Public-4 into CartFlow"" This reverts commit 77cab257b11ab8a3fdf3977c19540ec2c83edfd0. # Conflicts: # FakeNFT.xcodeproj/project.xcworkspace/xcuserdata/vitalyanpilov.xcuserdatad/UserInterfaceState.xcuserstate
…rProject-Public-4 into garipov/Satistics # Conflicts: # FakeNFT.xcodeproj/project.pbxproj # FakeNFT/Extensions/UIImage+extension.swift # FakeNFT/Presentation/StatisticsFlow/StatisticViewController.swift
# Conflicts: # FakeNFT.xcodeproj/project.pbxproj # FakeNFT/Presentation/CartFlow/Cart/CartViewController.swift # FakeNFT/Presentation/CartFlow/Cart/CartViewModel.swift # FakeNFT/Presentation/TabBarController.swift
minor updates
UI vc alert extension
…rProject-Public-4 into garipov/Satistics
add redUniversal color
…rProject-Public-4 into garipov/Satistics
Garipov/satistics
# Conflicts: # FakeNFT.xcodeproj/project.pbxproj
merge from profile branch
# Conflicts: # FakeNFT.xcodeproj/project.pbxproj
Dev merge cart
fix view bug
delete swifntLint
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Финальный ПР с работающим приложением.
Ссылка на скринкаст эпика "Статистика"
Ссылка на скринкаст эпика "Профиль"
Ссылка на скринкаст эпика "Корзина"