Skip to content

Commit

Permalink
Merge branch 'fix/manifest-description' into 'master'
Browse files Browse the repository at this point in the history
fix(manifest): description

See merge request papers/airgap/beacon-extension!15
  • Loading branch information
pascuin committed Jun 26, 2020
2 parents 2bbd3ea + 0ffd5ba commit dbb82f4
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 30 deletions.
46 changes: 29 additions & 17 deletions package-lock.json

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

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "beacon-extension",
"version": "1.1.0",
"version": "1.1.1",
"author": "AirGap",
"homepage": "https://airgap.it/",
"scripts": {
Expand All @@ -25,7 +25,7 @@
},
"private": true,
"dependencies": {
"@airgap/beacon-sdk": "1.0.5",
"@airgap/beacon-sdk": "1.1.0",
"@angular/common": "^9.1.0",
"@angular/core": "^9.1.0",
"@angular/forms": "^9.1.0",
Expand Down Expand Up @@ -60,7 +60,7 @@
"@angular/language-service": "^9.1.0",
"@ionic/angular-toolkit": "^2.1.2",
"@types/bip39": "^3.0.0",
"@types/chrome": "0.0.91",
"@types/chrome": "0.0.115",
"@types/jasmine": "~3.3.8",
"@types/jasminewd2": "~2.0.3",
"@types/node": "12.12.17",
Expand All @@ -83,8 +83,8 @@
"tslint-plugin-prettier": "^2.0.1",
"typescript": "~3.8.3"
},
"description": "Beacon connects Tezos decetralized applications with wallets.",
"description": "Beacon connects Tezos decentralized applications with wallets.",
"browser": {
"fs": false
}
}
}
2 changes: 1 addition & 1 deletion src/app/pages/beacon-request/beacon-request.page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ export class BeaconRequestPage implements OnInit {

return modal.present()
} else {
this.popupService.close(1500).catch(console.error)
this.popupService.close(0).catch(console.error)

await this.showSuccessAlert()
await this.dismiss()
Expand Down
3 changes: 3 additions & 0 deletions src/app/services/chrome-messaging.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ export class ChromeMessagingService {
chrome.runtime.sendMessage({ data: 'Handshake' }) // TODO: Remove and use Action.HANDSHAKE
this.sendChromeMessage(Action.HANDSHAKE, undefined).catch(console.error)
chrome.runtime.onMessage.addListener(async (message, _sender, _sendResponse) => {
if (message && message.target === 'toPage') {
return // Ignore messages that are sent to the website
}
this.popupService.cancelClose().catch(console.error)
if (typeof message.data === 'string') {
const loader: HTMLIonLoadingElement = await this.loader
Expand Down
6 changes: 2 additions & 4 deletions src/app/services/popup.service.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import { Injectable } from '@angular/core';
import { Injectable } from '@angular/core'

@Injectable({
providedIn: 'root'
})
export class PopupService {
closeTimeout: NodeJS.Timeout | undefined

constructor() { }
private closeTimeout: NodeJS.Timeout | undefined

public async close(time: number): Promise<void> {
this.closeTimeout = setTimeout(() => {
Expand Down
6 changes: 3 additions & 3 deletions src/manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Beacon",
"version": "1.1.0",
"description": "Beacon connects Tezos decetralized applications with wallets.",
"name": "Beacon Extension",
"version": "1.1.1",
"description": "Beacon connects Tezos decentralized applications with wallets.",
"icons": {
"16": "assets/icon/beacon_logo-16px.png",
"48": "assets/icon/beacon_logo-48px.png",
Expand Down

0 comments on commit dbb82f4

Please sign in to comment.