Skip to content

Commit

Permalink
Merge pull request #635 from HathorNetwork/release-candidate
Browse files Browse the repository at this point in the history
Release v0.30.1
  • Loading branch information
andreabadesso authored Nov 14, 2024
2 parents 8232f98 + 3b80ff6 commit 5975b98
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 12 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ android {
applicationId "network.hathor.wallet"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 84
versionName "0.30.0"
versionCode 85
versionName "0.30.1-rc.1"
missingDimensionStrategy "react-native-camera", "general"
}
signingConfigs {
Expand Down
8 changes: 4 additions & 4 deletions ios/HathorMobile.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = HathorMobile/HathorMobile.entitlements;
CURRENT_PROJECT_VERSION = 1.0.0;
CURRENT_PROJECT_VERSION = 0.1.0;
DEVELOPMENT_TEAM = 55SHY647CG;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = HathorMobile/Info.plist;
Expand All @@ -485,7 +485,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.30.0;
MARKETING_VERSION = 0.30.1;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -506,15 +506,15 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = HathorMobile/HathorMobile.entitlements;
CURRENT_PROJECT_VERSION = 1.0.0;
CURRENT_PROJECT_VERSION = 0.1.0;
DEVELOPMENT_TEAM = 55SHY647CG;
INFOPLIST_FILE = HathorMobile/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.30.0;
MARKETING_VERSION = 0.30.1;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down
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": "HathorMobile",
"version": "0.30.0",
"version": "0.30.1-rc.1",
"engines": {
"node": ">=18.0.0",
"npm": ">=9.0.0"
Expand Down
1 change: 1 addition & 0 deletions pre_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ set -v # Verbose mode for better debugging
git log -n1

rm -rf node_modules/
rm -rf ios/Pods/

rm -f ./android/app/google-services.json
rm -f ./android/app/GoogleService-Info.plist
Expand Down
4 changes: 2 additions & 2 deletions src/sagas/reown.js
Original file line number Diff line number Diff line change
Expand Up @@ -455,8 +455,8 @@ export function* processRequest(action) {

const retry = yield call(
retryHandler,
types.REOWN_CREATE_TOKEN_RETRY,
types.REOWN_CREATE_TOKEN_RETRY_DISMISS,
types.REOWN_NEW_NANOCONTRACT_RETRY,
types.REOWN_NEW_NANOCONTRACT_RETRY_DISMISS,
);

if (retry) {
Expand Down
5 changes: 5 additions & 0 deletions src/sagas/ses.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,11 @@ export function* isSESEnabled() {
* the react-native bundle if the feature was enabled and is now disabled.
*/
export function* featureToggleUpdateListener() {
if (Platform.OS === 'android') {
log.debug('Platform is android, skipping SES');
return;
}

while (true) {
const oldSesEnabled = yield call(isSESEnabled);
yield take('FEATURE_TOGGLE_UPDATED');
Expand Down
3 changes: 2 additions & 1 deletion src/sagas/wallet.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ import {
firstAddressSuccess,
setUseSafeBiometryMode,
lockScreen,
firstAddressRequest,
} from '../actions';
import { fetchTokenData } from './tokens';
import {
Expand Down Expand Up @@ -313,7 +314,7 @@ export function* startWallet(action) {
}

yield put(walletRefreshSharedAddress());

yield put(firstAddressRequest());
yield put(startWalletSuccess());

// The way the redux-saga fork model works is that if a saga has `forked`
Expand Down

0 comments on commit 5975b98

Please sign in to comment.