Skip to content

Commit

Permalink
Merge pull request #174 from airgap-it/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
AndreasGassmann authored Mar 3, 2021
2 parents 551ec84 + 222272a commit 9d610e0
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 10 deletions.
Binary file added assets/logos/extension-temple.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/logos/extension-thanos.png
Binary file not shown.
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@airgap/beacon-sdk",
"version": "2.2.1",
"version": "2.2.2",
"description": "The beacon-sdk allows you to easily connect DApps with Wallets through P2P communication or a chrome extension.",
"main": "dist/cjs/index.js",
"module": "dist/esm/index.js",
Expand Down
11 changes: 6 additions & 5 deletions scripts/generate-wallet-list.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import { ExtensionApp, WebApp, App, AppBase, DesktopApp } from '../src/ui/alert/
export const extensionList: ExtensionApp[] = [
{
id: 'ookjlbkiijinhpmnjffcofjonbfbgaoc',
name: 'Thanos Wallet',
shortName: 'Thanos',
name: 'Temple Wallet',
shortName: 'Temple',
color: '',
logo: 'extension-thanos.png',
link: 'https://thanoswallet.com/'
logo: 'extension-temple.png',
link: 'https://templewallet.com/'
},
{
id: 'gpfndedineagiepkpinficbcbbgjoenn',
Expand All @@ -30,7 +30,8 @@ export const webList: WebApp[] = [
logo: 'web-kukai.png',
links: {
[NetworkType.MAINNET]: 'https://wallet.kukai.app',
[NetworkType.DELPHINET]: 'https://testnet.kukai.app'
[NetworkType.DELPHINET]: 'https://testnet.kukai.app',
[NetworkType.EDONET]: 'https://edonet.kukai.app'
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion src/constants.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export const SDK_VERSION: string = '2.2.1'
export const SDK_VERSION: string = '2.2.2'
export const BEACON_VERSION: string = '2'
6 changes: 5 additions & 1 deletion src/ui/alert/Alert.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,11 @@ const closeAlert = (id: string): Promise<void> =>

elm.className = elm.className.replace('fadeIn', 'fadeOut')
window.setTimeout(() => {
document.body.removeChild(wrapper)
const parent = wrapper.parentNode
if (parent) {
parent.removeChild(wrapper)
}

if (lastFocusedElement) {
;(lastFocusedElement as any).focus() // set focus back to last focussed element
}
Expand Down
5 changes: 4 additions & 1 deletion src/ui/toast/Toast.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,10 @@ const closeToast = (): Promise<void> =>

elm.className = elm.className.replace('fadeIn', 'fadeOut')
window.setTimeout(() => {
document.body.removeChild(wrapper)
const parent = wrapper.parentNode
if (parent) {
parent.removeChild(wrapper)
}
resolve()
}, animationDuration)
} else {
Expand Down

0 comments on commit 9d610e0

Please sign in to comment.