This repository was archived by the owner on Jan 25, 2021. It is now read-only.
Fixes AssetCell + Refactors Currency Settings and fixes Title#31
Open
tiagoalmeida wants to merge 8 commits intoO3Labs:masterfrom
Open
Fixes AssetCell + Refactors Currency Settings and fixes Title#31tiagoalmeida wants to merge 8 commits intoO3Labs:masterfrom
tiagoalmeida wants to merge 8 commits intoO3Labs:masterfrom
Conversation
* update neo-scan and tx history * git status * finish tx history and ccurrency touch ups
* finish featured content * Update FeatureFeed.swift * refine, inapp-browser with share * disable user interaction button * schemes for testing * update neo-scan and tx history * git status * finish tx history and ccurrency touch ups * add analytics * need debug flag * conditionally compile crashlytics * update community forum, swift 4.1, ask for reviews * fix sign tx history * touch up passcode glow * revert * Formatting number (CityOfZion#19) * format number * Localization (CityOfZion#21) * linter * finish localize onboarding * localize portfolio * finish account * finish news feed so easy lol * localize settings * only token sales left * factor our tokensale struct * factor out account strings * finish onboarding * finish settings localization * finish updating all the strings * all strings setup * minor update * fix localization linker errors * finalizing * updates
…o fix/currency_title # Conflicts: # .swiftlint.yml # Cartfile.resolved # O3.xcodeproj/project.pbxproj # O3/Account/Account.storyboard # O3/Account/AccountAssetTableViewController.swift # O3/Account/ContactsTableViewController.swift # O3/Account/TokenSelection/Nep5SelectionCollectionViewController.swift # O3/Account/TokenSelection/NftTokenViewController.swift # O3/Account/TokenSelection/TokenSelection.storyboard # O3/Account/TokenSelection/TokenSelectionStrings.swift # O3/Account/TransactionCell.swift # O3/Account/TransactionHistoryTableViewController.swift # O3/Base.lproj/Localizable.strings # O3/Info.plist # O3/Main.storyboard # O3/Onboarding/LoginTableViewController.swift # O3/Onboarding/LoginToCurrentWalletViewController.swift # O3/Onboarding/Onboarding.storyboard # O3/Send/Send.storyboard # O3/Send/SendTableViewController.swift # O3/SettingsMenu/AddressEntryTableViewController.swift # O3/SettingsMenu/Currency/CurrencyTableViewController.swift # O3/SettingsMenu/SettingsMenuTableViewController.swift # O3/SettingsMenu/SettingsStrings.swift # O3/TokenSale/ContributionTableViewCell.swift # O3/TokenSale/TokenSale.storyboard # O3/TokenSale/TokenSaleStrings.swift # O3/TokenSale/TokenSaleSubmitViewController.swift # O3/TokenSale/TokenSaleTableViewController.swift # O3/TokenSale/TokenSalesListTableViewController.swift # O3/UIControls/AssetInputToolbar.swift # O3/UIControls/OzoneAlert.swift # O3/UserDefaultsManager.swift # O3/WalletHome/API/O3Client.swift # O3/WalletHome/HomeViewModel.swift # O3/ja.lproj/Localizable.strings # O3/zh-Hans.lproj/Localizable.strings
saltyskip
reviewed
May 13, 2018
saltyskip
left a comment
saltyskip
left a comment
There was a problem hiding this comment.
Hi this is a very welcome change, thank you for tifying it up. I believe the localized String fix is up to date in the latest version. Can you merge in master?
Afterwards this will be good to go
…o fix/currency_title # Conflicts: # O3/Account/TokenSelection/NEP5TokenSelectorTableViewCell.swift
Author
|
Hi @saltyskip, thanks for the reply. I have updated from the master. Indeed this was fixed in master, but my solution improves a bit. In master every time you wanted to use this localised string you would need to append the current currency. This behaviour is hard to guarantee its consistency along the code. I have added a closure that basically ensures that every time this string is used it must come with an extra string. |
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
I was exploring the code on the wallet and noticed this:
Therefore, I tried to fix that issue.
While I was doing this, and exploring the code I have also had trouble compiling and running, and added those fixes as well. The only thing that I wasn't able to fix was the Info.plist. Xcode says that Info.plist is in the wrong format in the current master branch. I added one of my own so I was able to work.
Since I was fixing the issue I made a small refactor in CurrencyTableViewController.
Improvements
As a side note I believe that selecting + going back is an unnecessary step, it would be more simple for the user to simply select and go back automatically (he would see that he selected correctly since it appears in the settings)