Fungible Tokens & Direct Tipping #842
Merged
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
davidyuk
force-pushed
the
feature/fungible-tokens-3
branch
2 times, most recently
from
d03f58c to
377c73c
Compare
consistently use amount_AE update contract replace local contract with github version replace local contract with github version fixup 1 TipTitle: Extract topicRegex
fix atoms to ae adjust tokenInfo route create or change allowance fix fix change allowance show all tokens for tip Fixup SendTip fixup unshift fixup utils/aeternity fixup config/constants fixup send comment type fixup AeAmount fixup AeAmountFiat
fixed token balances vuex usage fixup fixup show token balances fixed topics amount show tokens amount only without iframe wallet persist token information in state fixup token balances fixup RightSectionWallet
Fixup AeInputAmount fixup TipRecord fixup token selector
davidyuk
force-pushed
the
feature/fungible-tokens-3
branch
from
377c73c to
7721bb5
Compare
|
Well, the breaking of the author wasn't intentional, it is because of my git gui, I have fixed that.
All fixes, adjustments after code review/rebasing are not needed. If you need to fix something after rebasing it means that the rebasing was did wrong. Review remarks usually are quite obvious and don't need to be preserved. So long branch of commits is more difficult to rebase, I think squashing was needed to be done by Stan in the previous PR. The line when history becomes immutable is merging to develop, until that I think we can freely polish it. |
thepiwo
approved these changes
Oct 14, 2020
mradkov
approved these changes
Oct 15, 2020
Merged
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.
the rebased version of #810 with applied #832
I have squshed the overlapping changes, reducing the commit amount that have simplified rebasing. The diff is almost the same as in the base branch, except that I have extracted #836, you can compare branches by
git diff feature/Fungible-Tokens-Direct-Tipping-3 feature/fungible-token-featureflagged. I'm going to test this and check the iframe wallet state.