Skip to content

Commit

Permalink
Merge branch 'gagdiez-dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
charleslavon committed Jul 1, 2024
2 parents 257ded3 + a535195 commit 3f7a99c
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ How to verify the signature: https://docs.near.org/build/web3-apps/backend/#3-ve

- Add get/set methods for `window.location.hash`. `Set` method only accepts an empty string as a value.

- Allow the wallet selector to connect to an extra contract besides `config.contractName`. To enable this feature, pass the allowExternalContract flag to the config parameter of initNear, e.g. `initNear({networkId, selector, config: { allowExternalContract: 'hello.near-examples.near' }} )`


## 2.6.1

- Add option to bypass the commit modal and skip transaction confirmation modal for all widgets (`features.commitModalBypass.bypassAll` and `features.bypassTransactionConfirmation`). This is intended to use by the gateways that expects external wallet to confirm all transactions.
Expand Down
2 changes: 1 addition & 1 deletion dist/index.js

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions dist/index.js.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,3 @@
* @author Feross Aboukhadijeh <https://feross.org>
* @license MIT
*/

/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
3 changes: 2 additions & 1 deletion src/lib/data/account.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ async function updateAccount(near, walletState) {
near.connectedContractId = walletState?.contract?.contractId;
if (
near.connectedContractId &&
near.connectedContractId !== near.config.contractName
near.connectedContractId !== near.config.contractName &&
near.connectedContractId !== near.config.allowExternalContract
) {
const selector = await near.selector;
const wallet = await selector.wallet();
Expand Down

0 comments on commit 3f7a99c

Please sign in to comment.