Merge pull request #3509 from poanetwork/vb-fix-qr-tooltip-appearance

Fix QR code tooltip appearance in mobile view
pull/3482/merge
Victor Baranov 4 years ago committed by GitHub
commit 3f9f0e825b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      CHANGELOG.md
  2. 2
      apps/block_scout_web/assets/js/lib/loading_element.js
  3. 5
      apps/block_scout_web/assets/js/lib/modals.js
  4. 7
      apps/block_scout_web/assets/js/pages/address.js
  5. 7
      apps/block_scout_web/assets/js/pages/token_counters.js
  6. 4
      apps/block_scout_web/assets/js/pages/verification_form.js

@ -6,6 +6,7 @@
- [#3462](https://github.com/poanetwork/blockscout/pull/3462) - Display price for bridged tokens - [#3462](https://github.com/poanetwork/blockscout/pull/3462) - Display price for bridged tokens
### Fixes ### Fixes
- [#3509](https://github.com/poanetwork/blockscout/pull/3509) - Fix QR code tooltip appearance in mobile view
- [#3507](https://github.com/poanetwork/blockscout/pull/3507) - Fix left margin of balance card in mobile view - [#3507](https://github.com/poanetwork/blockscout/pull/3507) - Fix left margin of balance card in mobile view
- [#3506](https://github.com/poanetwork/blockscout/pull/3506) - Fix token trasfer's tile styles: prevent overlapping of long names - [#3506](https://github.com/poanetwork/blockscout/pull/3506) - Fix token trasfer's tile styles: prevent overlapping of long names
- [#3505](https://github.com/poanetwork/blockscout/pull/3505) - Fix Staking DApp first loading - [#3505](https://github.com/poanetwork/blockscout/pull/3505) - Fix Staking DApp first loading

@ -1,5 +1,5 @@
import $ from 'jquery' import $ from 'jquery'
$('button[data-loading="animation"]').click(event => { $('button[data-loading="animation"]').click(_event => {
$('#loading').removeClass('d-none') $('#loading').removeClass('d-none')
}) })

@ -189,3 +189,8 @@ export function openQuestionModal (title, text, acceptCallback = null, exceptCal
openModal($modal) openModal($modal)
} }
export function openQrModal () {
const $modal = $('#qrModal')
openModal($modal)
}

@ -10,6 +10,9 @@ import { loadTokenBalanceDropdown } from '../lib/token_balance_dropdown'
import '../lib/token_balance_dropdown_search' import '../lib/token_balance_dropdown_search'
import '../lib/async_listing_load' import '../lib/async_listing_load'
import '../app' import '../app'
import {
openQrModal
} from '../lib/modals'
export const initialState = { export const initialState = {
channelDisconnected: false, channelDisconnected: false,
@ -215,4 +218,8 @@ if ($addressDetailsPage.length) {
})) }))
loadCounters(store) loadCounters(store)
$('.btn-qr-icon').click(_event => {
openQrModal()
})
} }

@ -4,6 +4,9 @@ import humps from 'humps'
import { createStore, connectElements } from '../lib/redux_helpers.js' import { createStore, connectElements } from '../lib/redux_helpers.js'
import '../lib/async_listing_load' import '../lib/async_listing_load'
import '../app' import '../app'
import {
openQrModal
} from '../lib/modals'
export const initialState = { export const initialState = {
channelDisconnected: false, channelDisconnected: false,
@ -87,3 +90,7 @@ if ($tokenPage.length) {
connectElements({ store, elements }) connectElements({ store, elements })
loadCounters(store) loadCounters(store)
} }
$('.btn-qr-icon').click(_event => {
openQrModal()
})

@ -49,7 +49,7 @@ const elements = {
render ($el, state) { render ($el, state) {
if (state.newForm) { if (state.newForm) {
$el.replaceWith(state.newForm) $el.replaceWith(state.newForm)
$('button[data-button-loading="animation"]').click(event => { $('button[data-button-loading="animation"]').click(_event => {
$('#loading').removeClass('d-none') $('#loading').removeClass('d-none')
}) })
@ -131,7 +131,7 @@ if ($contractVerificationPage.length) {
msg: humps.camelizeKeys(msg) msg: humps.camelizeKeys(msg)
})) }))
$('button[data-button-loading="animation"]').click(event => { $('button[data-button-loading="animation"]').click(_event => {
$('#loading').removeClass('d-none') $('#loading').removeClass('d-none')
}) })

Loading…
Cancel
Save