forked from blockscout/blockscout
-
Notifications
You must be signed in to change notification settings - Fork 21
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.
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
W37 upstream merge #396
Merged
Merged
W37 upstream merge #396
Changes from all commits
Commits
Show all changes
64 commits
Select commit
Hold shift + click to select a range
a8df0a5
Fix NaN input in write contract
nikitosing 1b08186
Merge pull request #4582 from blockscout/np-fix-nan-error-write-cntrct
vbaranov 16a9249
Search results page: navbar menu fix
vbaranov 801de6c
Merge pull request #4587 from blockscout/vb-search-navbar-menu-fix
vbaranov 7deabed
Resize inputs; improve multiplier selector; add tooltip for tx value;…
nikitosing 14e0033
Fix floating tooltips on token transfer block
nikitosing bec33a2
Merge pull request #4586 from blockscout/np-fix-floating-tooltips
vbaranov d73f310
Merge pull request #4579 from blockscout/np-fix-input-fields-write-co…
vbaranov 541febb
Fix solid outputs on contract read page
nikitosing 1eb7af4
Add step and min value for txValue input
nikitosing f9f35ba
Add status to Position pane
nikitosing a127155
Merge pull request #4591 from blockscout/np-add-step-and-min-args
vbaranov d8caa6d
Merge branch 'master' into np-fix-solid-contract-outputs
vbaranov 84b57aa
Merge pull request #4589 from blockscout/np-fix-solid-contract-outputs
vbaranov 928c3fc
Merge pull request #4593 from blockscout/np-add-status-for-pending-txs
vbaranov a1bc250
Add support EIP-1559
nikitosing e50f66b
Merge pull request #4520 from blockscout/1559-support
vbaranov a84de99
Update CHANGELOG.md
nikitosing 3e7e113
Merge pull request #4598 from blockscout/nikitosing-patch-1
vbaranov 5afb2b6
Change key to update cache GA
nikitosing 7282a77
Merge pull request #4599 from blockscout/np-pr-for-pass-tests-1
vbaranov 882830f
Change key back to update cache GA
nikitosing e961eee
Merge pull request #4600 from blockscout/np-pr-for-pass-tests-2
vbaranov 24a5b1a
Fix endless Fetching tokens message on emty addresses
vbaranov 2023b2b
Merge pull request #4601 from blockscout/vb-fix-endless-fetching-tokens
vbaranov 0e2e1e1
Change keys of cache for update GA
nikitosing 110e6f7
Merge pull request #4602 from blockscout/np-upd-keys-ga
vbaranov 8ff386a
Add tooltips and names for fallback and receive functions
nikitosing fded776
Merge pull request #4592 from blockscout/np-fix-empty-function-names
vbaranov e9e7fa4
Ability to hide miner
vbaranov b230b4b
Merge pull request #4611 from blockscout/vb-hide-miner
vbaranov 0a5377b
Improved style of transactions button
nikitosing ef321e5
Add token_tile_view_more.css to the main-page.css
nikitosing 09acd33
Merge pull request #4608 from blockscout/np-change-txs-button
vbaranov ad67d53
Merge pull request #4615 from blockscout/np-fix-css-main-page
vbaranov 82a8e26
Display token icons for tokens from TrustWallet repo
vbaranov bb29bda
token icon for bridged tokens in search results page fix
vbaranov 553efba
Merge pull request #4596 from blockscout/vb-token-icon-bridged-with-m…
vbaranov 8eac719
Hide error selector in the contract's functions list
nikitosing 321729d
Merge pull request #4612 from blockscout/np-remove-error-selector
vbaranov c57e1d3
Change alpha of transactions button's background
nikitosing 5d96530
Merge pull request #4622 from blockscout/np-change-alpha-for-txs-btn
vbaranov 00dc48e
Support HTML tags in alert message
vbaranov 619296b
Merge pull request #4624 from blockscout/vb-support-html-in-alert
vbaranov 7acbf1a
Add implementation link to the overview of proxy contracts
nikitosing 65456e0
Merge pull request #4625 from blockscout/np-add-implementation-link
vbaranov 40e14d6
W37 upstream merge
6a8390f
Fixed formatting
2403764
Merge branch 'master' into carterqw2/w37-upstream-merge
691c3a7
Merge branch 'master' into carterqw2/w37-upstream-merge
3e834c9
Merge branch 'master' into carterqw2/w37-upstream-merge
7a84ca7
Merge branch 'master' into carterqw2/w37-upstream-merge
39f8782
Remove unused npm packages
19b64a8
Increased build timeout
2316ce0
Increased build timeout
51efd98
More testing
33ae80e
More testing
bcca37d
Fixed PR comments
0732c5f
Replaced more ETH
b6865e9
Merge branch 'master' into carterqw2/w37-upstream-merge
d899c10
Merge branch 'master' into carterqw2/w37-upstream-merge
53d890e
Merge branch 'master' into carterqw2/w37-upstream-merge
d88d257
Fix gettext
49436ab
CSP fix: allow only trustwallet assets repo from Github
vbaranov File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
function getTokenIconUrl (chainID, addressHash) { | ||
var chainName = null | ||
switch (chainID) { | ||
case '1': | ||
chainName = 'ethereum' | ||
break | ||
case '99': | ||
chainName = 'poa' | ||
break | ||
case '100': | ||
chainName = 'xdai' | ||
break | ||
default: | ||
chainName = null | ||
break | ||
} | ||
if (chainName) { | ||
return `https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/${chainName}/assets/${addressHash}/logo.png` | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It feels weird to host assets on github |
||
} else { | ||
return null | ||
} | ||
} | ||
|
||
function appendTokenIcon ($tokenIconContainer, chainID, addressHash, foreignChainID, foreignAddressHash, displayTokenIcons, size) { | ||
const iconSize = size || 20 | ||
var tokenIconURL = null | ||
if (foreignChainID) { | ||
tokenIconURL = getTokenIconUrl(foreignChainID.toString(), foreignAddressHash) | ||
} else if (chainID) { | ||
tokenIconURL = getTokenIconUrl(chainID.toString(), addressHash) | ||
} | ||
if (displayTokenIcons) { | ||
checkLink(tokenIconURL) | ||
.then(checkTokenIconLink => { | ||
if (checkTokenIconLink) { | ||
if ($tokenIconContainer) { | ||
var img = new Image(iconSize, iconSize) | ||
img.src = tokenIconURL | ||
$tokenIconContainer.append(img) | ||
} | ||
} | ||
}) | ||
} | ||
} | ||
|
||
async function checkLink (url) { | ||
if (url) { | ||
try { | ||
const res = await fetch(url) | ||
return res.ok | ||
} catch (_error) { | ||
return false | ||
} | ||
} else { | ||
return false | ||
} | ||
} | ||
|
||
export { appendTokenIcon, checkLink, getTokenIconUrl } |
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
import $ from 'jquery' | ||
import { appendTokenIcon } from '../../lib/token_icon' | ||
|
||
if ($('[data-page="token-details"]').length) { | ||
const $tokenIconContainer = $('#token-icon') | ||
const chainID = $tokenIconContainer.data('chain-id') | ||
const addressHash = $tokenIconContainer.data('address-hash') | ||
const foreignChainID = $tokenIconContainer.data('foreign-chain-id') | ||
const foreignAddressHash = $tokenIconContainer.data('foreign-address-hash') | ||
const displayTokenIcons = $tokenIconContainer.data('display-token-icons') | ||
|
||
appendTokenIcon($tokenIconContainer, chainID, addressHash, foreignChainID, foreignAddressHash, displayTokenIcons) | ||
} |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
weird change to the hash key but ok