Skip to content

Commit

Permalink
Merge pull request #249 from airgap-it/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
AndreasGassmann authored Jul 21, 2021
2 parents f836f33 + 19d5496 commit a406616
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 7 deletions.
4 changes: 2 additions & 2 deletions 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.3.0",
"version": "2.3.1",
"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
17 changes: 17 additions & 0 deletions server.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
var StaticServer = require('static-server')
var server1 = new StaticServer({
rootPath: './examples/', // required, the root of the server file tree
port: 8080, // required, the port to listen
name: 'beacon' // optional, will set "X-Powered-by" HTTP header
})
var server2 = new StaticServer({
rootPath: './examples/', // required, the root of the server file tree
port: 8081, // required, the port to listen
name: 'beacon' // optional, will set "X-Powered-by" HTTP header
})
server1.start(function () {
console.log('Server1 listening to', server1.port)
server2.start(function () {
console.log('Server2 listening to', server2.port)
})
})
2 changes: 1 addition & 1 deletion src/clients/dapp-client/DAppClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ export class DAppClient extends Client {

private readonly appMetadataManager: AppMetadataManager

private readonly disclaimerText: string | undefined
private readonly disclaimerText?: string

constructor(config: DAppClientOptions) {
super({
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.3.0'
export const SDK_VERSION: string = '2.3.1'
export const BEACON_VERSION: string = '2'
2 changes: 1 addition & 1 deletion src/events.ts
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ export interface BeaconEventType {
postmessagePeerInfo: () => Promise<PostMessagePairingRequest>
preferredNetwork: NetworkType
abortedHandler?(): void
disclaimerText: string | undefined
disclaimerText?: string
}
[BeaconEvent.PAIR_SUCCESS]: ExtendedPostMessagePairingResponse | ExtendedP2PPairingResponse
[BeaconEvent.CHANNEL_CLOSED]: string
Expand Down
2 changes: 1 addition & 1 deletion src/ui/alert/PairingAlert.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export const preparePairingAlert = async (

wallet.clickHandler()
const modalEl: HTMLElement | null = shadowRoot.getElementById('beacon-modal__content')
if (modalEl && list.type !== WalletType.EXTENSION) {
if (modalEl && list.type !== WalletType.EXTENSION && list.type !== WalletType.IOS) {
modalEl.innerHTML = `${
wallet.logo
? `<p class="beacon-alert__title">Establishing Connection..</p>
Expand Down

0 comments on commit a406616

Please sign in to comment.