Skip to content

Commit

Permalink
Merge pull request #203 from airgap-it/develop
Browse files Browse the repository at this point in the history
v2.2.6
  • Loading branch information
AndreasGassmann authored Apr 29, 2021
2 parents c30848b + 0b1eabd commit 8d0dde3
Show file tree
Hide file tree
Showing 21 changed files with 53 additions and 344 deletions.
1 change: 1 addition & 0 deletions assets/alert/alert.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
:host {
--animation-duration: 300ms;
all: initial;
}

@keyframes fadeIn {
Expand Down
9 changes: 9 additions & 0 deletions assets/toast/toast.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
:host {
--animation-duration: 300ms;
all: initial;
}

@keyframes fadeIn {
Expand Down Expand Up @@ -176,9 +177,17 @@ hr {
.beacon-toast__more {
width: 14px;
transition: transform 0.5s;
}

a,
.beacon-toast__more {
cursor: pointer;
}

a:hover {
opacity: 0.64;
}

.theme__dark .beacon-toast__more {
color: #7c99d6;
}
Expand Down
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.5",
"version": "2.2.6",
"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
5 changes: 3 additions & 2 deletions src/clients/dapp-client/DAppClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ import { ExtendedPeerInfo } from '../../types/PeerInfo'
import { ColorMode } from '../../types/ColorMode'
import { getColorMode, setColorMode } from '../../colorMode'
import { desktopList, extensionList, iOSList, webList } from '../../ui/alert/wallet-lists'
import { Optional } from '../../utils/utils'
import { DAppClientOptions } from './DAppClientOptions'

const logger = new Logger('DAppClient')
Expand Down Expand Up @@ -997,7 +998,7 @@ export class DAppClient extends Client {
* @param account The account that the message will be sent to
*/
private async makeRequest<T extends BeaconRequestInputMessage, U extends BeaconMessage>(
requestInput: Omit<T, IgnoredRequestInputProperties>
requestInput: Optional<T, IgnoredRequestInputProperties>
): Promise<{
message: U
connectionInfo: ConnectionContext
Expand Down Expand Up @@ -1027,7 +1028,7 @@ export class DAppClient extends Client {
throw await this.sendInternalError('BeaconID not defined')
}

const request: Omit<T, IgnoredRequestInputProperties> &
const request: Optional<T, IgnoredRequestInputProperties> &
Pick<U, IgnoredRequestInputProperties> = {
id: messageId,
version: BEACON_VERSION,
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.5'
export const SDK_VERSION: string = '2.2.6'
export const BEACON_VERSION: string = '2'
14 changes: 0 additions & 14 deletions src/examples/broadcast-request.ts

This file was deleted.

42 changes: 0 additions & 42 deletions src/examples/custom-block-explorer.ts

This file was deleted.

37 changes: 0 additions & 37 deletions src/examples/disable-all-ui.ts

This file was deleted.

19 changes: 0 additions & 19 deletions src/examples/operation-request.ts

This file was deleted.

50 changes: 0 additions & 50 deletions src/examples/override-default-events.ts

This file was deleted.

10 changes: 0 additions & 10 deletions src/examples/permission-request.ts

This file was deleted.

12 changes: 0 additions & 12 deletions src/examples/sign-payload-request.ts

This file was deleted.

53 changes: 0 additions & 53 deletions src/examples/standalone.html

This file was deleted.

53 changes: 0 additions & 53 deletions src/examples/using-custom-network.ts

This file was deleted.

Loading

0 comments on commit 8d0dde3

Please sign in to comment.