From 0afce2e5a14e7dfc95620b2d9a4328c88353a880 Mon Sep 17 00:00:00 2001 From: impelcrypto <92044428+impelcrypto@users.noreply.github.com> Date: Wed, 17 May 2023 09:35:01 -0700 Subject: [PATCH] fix: fixed conflicts in release-hotfix branch (#800) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fixed claim tooltip text (#747) * Create s3-staging.yml * Create s3-production.yml * Create s3-hotfix.yml * Update s3-hotfix.yml * Update s3-hotfix.yml * Update s3-hotfix.yml * Release hotfix merge to master (#746) * add workflow for release-hotfix * add on push specific branch * remove automatic push process * set inputs on workflow * add specific branch on dispatch * Discord link update (#745) * Create s3-hotfix.yml * Update s3-hotfix.yml * Update s3-hotfix.yml --------- Co-authored-by: Will Co-authored-by: Ehsan * add nft menu on sidebar (#749) * add nft menu on sidebar * add customized balloon * clean up * Fix total dApps count (#751) * feat: updated theme color (#741) * feat: updated theme color on Assets page * feat: updated theme color on Dashboard page * feat: updated theme color on dApp staking page * feat: updated sidebar * fix: tests * update css * update css * update detail css * feat: updated header background * fix: updated hero position on dApp staking page * update css on feedback * update detail css * updates on addItemcard * update color on tags * update colors * feat: updated dark theme * update uilib & colors * styles: changed astar-blue-dark to astar-blue * styles: updated Ecosystem icon * fix: conflicts * fix: updated styles * fix: updated header * fix: updated modals * fix: updated play icon * fix: updated styles on transfer assets page * fix: updated ui liv --------- Co-authored-by: Will * Fix: Use XcmV2WeightLimit in InterlayXcmRepository.ts (#756) * feat: updated connect wallet drawer (#750) * feat: updated theme color on Assets page * feat: updated theme color on Dashboard page * feat: updated theme color on dApp staking page * feat: updated sidebar * fix: tests * update css * update css * update detail css * feat: updated astar-ui * feat: updated astar-ui (2) * feat: updated network modal * feat: updated 'ip-input' class * update css on feedback * update detail css * updates on addItemcard * update color on tags * feat: updated AccountModal logic * feat: updated account drawer * feat: updated disconnect button * feat: updated tests * fix: test * fix: conflicts (2) * fix: store selected address data * feat: updated drawer * feat: updated wallet logic * refactor: clean up * fix: changed 'disconnect' button position * feat: store selected theme to local storage * feat: updated modal drawer * feat: updated modal drawer --------- Co-authored-by: Will * Added github action for broken links (#761) * Added github action for broken links * build and check * e2e tests with Zombienet (#752) * Transfer tokens test * CI integration * Use env variable po pass BASE_URL to test script * yaml fix * Actions script fix * Another action script fix * yet another try * hardcoded versions * collator version fix * Links fix * Github action fix * It may run now on CI * Fixed test runner script * Add asset to a node * Moved Zombienet tests and configuration to separate folder. * Stake test * Increase Playwright test timeout * Tests and node setup fixes * Minor fixes * All tests run stable * Updated staking test with input validation test * release hotfix to main (#760) * add workflow for release-hotfix * add on push specific branch * remove automatic push process * set inputs on workflow * add specific branch on dispatch * Discord link update (#745) * Create s3-hotfix.yml * Update s3-hotfix.yml * Update s3-hotfix.yml * hotfix: added Injective assets (ATOM and INJ) on EVM assets page (#759) * feat: added ATOM and INJ on EVM assets page * fix: fetch token data from cbridge API --------- Co-authored-by: Will Co-authored-by: Bobo Co-authored-by: Ehsan * fix: send non-native tokens with max amount (#768) * feat: updated XCM logic to V3 for Shiden, Statemine and Kusama (#758) * wip: KSM xcm V3 * feat: update sdk-core * feat: updated XCM logic for Kusama to V3 * feat: updated XCM V3 logic for Shiden * fix: removed console.log * fix: updated logic for statemine * fix: updated subscan link for ctust * feat: updated Bitfrost version to V3 * feat: updated XCM logic for Phala * refactor: clean up * fix: enabled XCM deposit/withdrawal on Shiden (#774) * fix: enabled XCM deposit/withdrawal on Shiden * test * test: lint * fix: clean up * Update broken-links.yml (#777) * removed quasar from broken link report (#767) * dAapp staking e2e tests (#769) * Unbond test * Re-stake on/off test * Claim rewards test, playwright config updates * On chain check if claim executed * Added Metamask extension * Metamask wallet creation * Trying to fix heap out of memory * One more try * One more try to fix CI out of memory * On more try to fix out of memory error * Heap size fix * command fix * What to say? * Metamask removed * Update pull-request-preview.yml * Pushing commit to rerun ci * setting up yarn * Added Metamask back * Test run on ubuntu-latest * tsconfig exclude pattern fix * Linter fixes --------- Co-authored-by: Ehsan Co-authored-by: Nikhil Ranjan * feat: added 'help' button on header (#772) * fix: display EVM withdraw when users have balance in withdrawal * fix: added help button on header * fix: removed release note on the template.md * fix: test * fix: test (2) * fix: display ModalConectionTrouble when app is loading * fix: reset the staking tab after changing accounts (#779) * Change warning on EVM local transfer (#783) * update warning message * update css & only visible on EVM input * show prev warning * only visible isH160 * update warning message * fix: modified header styling for mobile devices (#782) * fix: updated connect button * fix: added separator at the top of assets page for mobile devices * fix: updated header background for mobile devices * fix: updated margin size inheader * Automatically create PR on regular and hotfix release (#781) * Fix for tests who are failing from time to time (#785) * Return Dwellir endpoint to the portal (#788) * feat: updated claim logic for ledger accounts (#765) * feat: updated claim logic for ledger account * refactor: clean up * debug: log transport * debug: log 2 * feat: test log * feat: test log 2 * feat: test log 3 * feat: test log 4 * feat: test log 5 * feat: test log 6 * refactor: removed console logs * refactor: clean up * fix: remove HID popup * fix: remove HID popup (2) * refactor: clean up * test: see console * refacotr: clean up * Deployment scripts fix (#790) * Update index.template.html (#792) --------- Co-authored-by: Bobo Co-authored-by: Ehsan Co-authored-by: Will Co-authored-by: Brendon Votteler Co-authored-by: Nikhil Ranjan Co-authored-by: Josip Š <106158728+josip-simunovic88@users.noreply.github.com> --- src/index.template.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/index.template.html b/src/index.template.html index 983db04a8..7a3087ec5 100644 --- a/src/index.template.html +++ b/src/index.template.html @@ -85,8 +85,7 @@ (s.queue = []), (u = t.createElement(n)), (u.async = !0), - (u.src = - '//static.ads-twitter.com/uwt.js](https://stakesg.slack.com//static.ads-twitter.com/uwt.js)'), + (u.src = 'https://static.ads-twitter.com/uwt.js'), (a = t.getElementsByTagName(n)[0]), a.parentNode.insertBefore(u, a)); })(window, document, 'script');