Release/2.2.2 (#1249)

* Release 2.2.1 version

* Remove unused `vaultResetedSaga` and streamline `resetTrustedWasmState` logic.

* Fix nullable checks for `origin` in trusted wasm approval logic.

* Include `.env` in build artifacts and fallback to timestamp for missing commit hash.

* Release 2.2.2 version

Author: Comp0te

package.json

@@ -1,7 +1,7 @@
 {
   "name": "Casper Wallet",
   "description": "Securely manage your CSPR tokens and interact with dapps with the self-custody wallet for the Casper blockchain.",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "author": "MAKE LLC",
   "scripts": {
     "devtools:redux": "redux-devtools --hostname=localhost",

scripts/build_src.sh

@@ -1,3 +1,3 @@
 HASH=$(git rev-parse --short HEAD)
 
-zip -r casper-wallet-src#$HASH.zip src scripts utils *.* && mv casper-wallet-src#$HASH.zip build/
+zip -r casper-wallet-src#$HASH.zip src scripts utils *.* .env && mv casper-wallet-src#$HASH.zip build/

src/apps/signature-request/pages/sign-transaction/index.tsx

@@ -298,9 +298,11 @@ export function SignTransactionPage() {
   }, [maybeRequireApproval]);
 
   const toggleWasmApproval = useCallback(() => {
+    const origin = originRef.current[requestId].activeOrigin ?? null;
+
     if (
       !(
-        activeOrigin &&
+        origin &&
         signatureRequest &&
         (isTxSignatureRequestWasmAction(signatureRequest.action) ||
           isTxSignatureRequestWasmProxyAction(signatureRequest.action))
@@ -313,20 +315,20 @@ export function SignTransactionPage() {
       setWasmApproved(false);
       dispatchToMainStore(
         removeWasmFromTrusted({
-          origin: activeOrigin,
+          origin,
           wasmHash: signatureRequest.action.washHash
         })
       );
     } else {
       setWasmApproved(true);
       dispatchToMainStore(
         addWasmToTrusted({
-          origin: activeOrigin,
+          origin,
           wasmHash: signatureRequest.action.washHash
         })
       );
     }
-  }, [activeOrigin, signatureRequest, wasmApproved]);
+  }, [requestId, signatureRequest, wasmApproved]);
 
   const renderFooter = () => {
     if (signingPageState === SigningPageState.LedgerConfirmation) {

src/background/redux/sagas/onboarding-sagas.ts

@@ -10,6 +10,7 @@ import { contactsReseted } from '@background/redux/contacts/actions';
 import { resetRateApp } from '@background/redux/rate-app/actions';
 import { recipientPublicKeyReseted } from '@background/redux/recent-recipient-public-keys/actions';
 import { vaultSettingsReseted } from '@background/redux/settings/actions';
+import { resetTrustedWasmState } from '@background/redux/trusted-wasm/actions';
 
 import { deriveKeyPair, validateSecretPhrase } from '@libs/crypto';
 import {
@@ -57,6 +58,7 @@ function* resetVaultSaga() {
     yield put(loginRetryCountReseted());
     yield put(recipientPublicKeyReseted());
     yield put(contactsReseted());
+    yield put(resetTrustedWasmState());
     yield put(vaultSettingsReseted());
     yield put(resetRateApp());
     yield put(resetAppEventsDismission());

src/background/redux/sagas/trusted-wasm-saga.ts

@@ -1,27 +1,15 @@
 import { put, select, takeLatest } from 'redux-saga/effects';
 import { getType } from 'typesafe-actions';
 
-import {
-  removeAllWasmFromTrustedOrigin,
-  resetTrustedWasmState
-} from '../trusted-wasm/actions';
-import {
-  accountDisconnected,
-  siteDisconnected,
-  vaultReseted
-} from '../vault/actions';
+import { removeAllWasmFromTrustedOrigin } from '../trusted-wasm/actions';
+import { accountDisconnected, siteDisconnected } from '../vault/actions';
 import { selectCountOfConnectedAccountsWithActiveOrigin } from '../vault/selectors';
 
 export function* trustedWasmSaga() {
-  yield takeLatest(getType(vaultReseted), vaultResetedSaga);
   yield takeLatest(getType(accountDisconnected), accountDisconnectedSaga);
   yield takeLatest(getType(siteDisconnected), siteDisconnectedSaga);
 }
 
-function* vaultResetedSaga() {
-  yield put(resetTrustedWasmState());
-}
-
 function* accountDisconnectedSaga({
   payload: { siteOrigin }
 }: ReturnType<typeof accountDisconnected>) {

src/background/redux/trusted-wasm/selectors.ts

@@ -10,7 +10,7 @@ export const selectTrustedWasmForActiveOrigin = createSelector(
   selectActiveOrigin,
   selectTrustedWasmByOriginDict,
   (origin, hashesByOriginDict) =>
-    origin != null && (hashesByOriginDict[origin] || []).length > 0
+    origin != null && (hashesByOriginDict?.[origin] || []).length > 0
       ? hashesByOriginDict[origin]
       : []
 );

webpack.config.js

@@ -9,7 +9,9 @@ const webpack = require('webpack'),
   TsconfigPaths = require('tsconfig-paths-webpack-plugin'),
   Dotenv = require('dotenv-webpack');
 
-const commitHash = process.env.HASH || process.env.GITHUB_SHA;
+const commitHash =
+  process.env.HASH || process.env.GITHUB_SHA || Date.now().toFixed();
+
 if (!commitHash) {
   throw Error('No commit hash env!');
 }

xcode-project/Casper Wallet/Casper Wallet.xcodeproj/project.pbxproj

@@ -640,7 +640,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Casper Wallet/Casper Wallet.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 135;
+				CURRENT_PROJECT_VERSION = 136;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Casper Wallet/Info.plist";
@@ -654,7 +654,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 2.2.1;
+				MARKETING_VERSION = 2.2.2;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -677,7 +677,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Casper Wallet/Casper Wallet.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 135;
+				CURRENT_PROJECT_VERSION = 136;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Casper Wallet/Info.plist";
@@ -691,7 +691,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 2.2.1;
+				MARKETING_VERSION = 2.2.2;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,