Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v2.32.1 #1166

Merged
merged 5 commits into from
Apr 25, 2024
Merged

v2.32.1 #1166

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [[v2.32.1]](https://github.com/multiversx/mx-sdk-dapp/pull/1166)] - 2024-04-25
- [ExperimentalWebviewProvider: Fix incoming messages from android webview](https://github.com/multiversx/mx-sdk-dapp/pull/1165)
- [Added FF Windows to browser constants](https://github.com/multiversx/mx-sdk-dapp/pull/1164)

## [[v2.32.0]](https://github.com/multiversx/mx-sdk-dapp/pull/1161)] - 2024-04-23
- [ExperimentalWebviewProvider: fix android communication](https://github.com/multiversx/mx-sdk-dapp/pull/1163)
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@multiversx/sdk-dapp",
"version": "2.32.0",
"version": "2.32.1",
"description": "A library to hold the main logic for a dapp on the MultiversX blockchain",
"author": "MultiversX",
"license": "GPL-3.0-or-later",
Expand Down Expand Up @@ -167,7 +167,7 @@
"@multiversx/sdk-wallet-connect-provider": "4.1.2",
"@multiversx/sdk-web-wallet-cross-window-provider": "0.1.1",
"@multiversx/sdk-web-wallet-provider": "3.2.1",
"@multiversx/sdk-webview-provider": "0.0.9",
"@multiversx/sdk-webview-provider": "0.0.10",
"@reduxjs/toolkit": "1.8.2",
"bignumber.js": "9.x",
"linkify-react": "4.0.2",
Expand Down
10 changes: 10 additions & 0 deletions src/constants/browser.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { safeWindow } from 'lib/sdkDappUtils';

const userAgent = String(safeWindow?.navigator?.userAgent);

export const isSafari = /^((?!chrome|android).)*safari/i.test(userAgent);

const isFirefoxOnWindows =
/firefox/i.test(userAgent) && /windows/i.test(userAgent);

export const isBrowserWithPopupConfirmation = isSafari || isFirefoxOnWindows;
1 change: 1 addition & 0 deletions src/constants/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export * from './mnemonicWords';
export * from './network';
export * from './transactionStatus';
export * from './web-wallet.constants';
export * from './browser';

export const GAS_PRICE_MODIFIER = 0.01;
export const GAS_PER_DATA_BYTE = 1_500;
Expand Down
8 changes: 2 additions & 6 deletions src/hooks/login/useCrossWindowLogin.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useState } from 'react';
import { processModifiedAccount } from 'components/ProviderInitializer/helpers/processModifiedAccount';
import { isBrowserWithPopupConfirmation } from 'constants/browser';
import { SECOND_LOGIN_ATTEMPT_ERROR } from 'constants/errorsMessages';
import { safeWindow } from 'lib/sdkDappUtils';
import { CrossWindowProvider } from 'lib/sdkWebWalletCrossWindowProvider';
import { setAccountProvider } from 'providers/accountProvider';
import { loginAction } from 'reduxStore/commonActions';
Expand All @@ -25,10 +25,6 @@ export type UseCrossWindowLoginReturnType = [
LoginHookGenericStateType
];

const isSafari = /^((?!chrome|android).)*safari/i.test(
safeWindow?.navigator?.userAgent ?? ''
);

export const useCrossWindowLogin = ({
callbackRoute,
token: tokenToSign,
Expand Down Expand Up @@ -91,7 +87,7 @@ export const useCrossWindowLogin = ({
...(token && { token })
};

const needsConsent = isSafari && hasNativeAuth;
const needsConsent = isBrowserWithPopupConfirmation && hasNativeAuth;

if (needsConsent || hasConsentPopup) {
provider.setShouldShowConsentPopup(true);
Expand Down
Loading
Loading