Skip to content

Commit

Permalink
Merge branch 'development' of https://github.com/madfish-solutions/te…
Browse files Browse the repository at this point in the history
…mplewallet-mobile into TW-1520-m-redirect-user-from-push-notification-into-notification-page
  • Loading branch information
keshan3262 committed Sep 26, 2024
2 parents cc4aa3e + 39b0b28 commit 21448db
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/testapp-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ jobs:
- name: Retain Android artifact
uses: actions/upload-artifact@v4
with:
name: android
path: android/app/build/outputs/apk/release/app-release.apk
if-no-files-found: warn
retention-days: 30
Expand Down Expand Up @@ -142,6 +143,7 @@ jobs:
- name: Retain iOS artifact
uses: actions/upload-artifact@v4
with:
name: ios
path: ios/build/TempleWallet.ipa
if-no-files-found: warn
retention-days: 30
Expand Down
13 changes: 13 additions & 0 deletions src/store/migrations.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { isEqual } from 'lodash-es';
import type { MigrationManifest, PersistedState } from 'redux-persist';

import { VisibilityEnum } from 'src/enums/visibility.enum';
Expand Down Expand Up @@ -153,5 +154,17 @@ export const MIGRATIONS: MigrationManifest = {
accountsStateRecord
}
};
},
'6': (untypedState: PersistedState): undefined | TypedPersistedRootState => {
if (!untypedState) {
return untypedState;
}
const state = untypedState as TypedPersistedRootState;
state.settings.rpcList = state.settings.rpcList.filter(({ name, url }) => !isEqual({ name, url }, MARIGOLD_RPC));
if (state.settings.selectedRpcUrl === MARIGOLD_RPC.url) {
state.settings.selectedRpcUrl = TEMPLE_RPC.url;
}

return state;
}
};
2 changes: 1 addition & 1 deletion src/store/root-state.reducers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const persistConfigBlacklist: (keyof RootState)[] = [

const persistConfig: PersistConfig<RootState> = {
key: 'root',
version: 5,
version: 6,
storage: SlicedAsyncStorage,
stateReconciler: autoMergeLevel2,
writeFailHandler: persistFailHandler,
Expand Down
1 change: 0 additions & 1 deletion src/utils/rpc/rpc-list.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ export const OLD_TEMPLE_RPC_URLS = ['https://mainnet-node.madfish.solutions', 'h

export const RpcList: RpcInterface[] = [
TEMPLE_RPC,
MARIGOLD_RPC,
{
name: 'SmartPy Mainnet',
url: 'https://mainnet.smartpy.io'
Expand Down

0 comments on commit 21448db

Please sign in to comment.