Skip to content

Commit

Permalink
Merge pull request #132 from syscoin/fix/wc-explorer-bug
Browse files Browse the repository at this point in the history
fix: solves wallet connect redirect bug and rollux explorer
  • Loading branch information
ThalesBMC committed Feb 29, 2024
2 parents a4f72fb + 3905d63 commit a4161f5
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions app/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ android {
applicationId "io.paliwallet"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 30
versionName "1.1.4"
versionCode 31
versionName "1.1.5"
multiDexEnabled true
missingDimensionStrategy "minReactNative", "minReactNative46"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down
2 changes: 1 addition & 1 deletion app/app/components/Views/BrowserTab/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,7 @@ const BrowserTab = props => {
try {
if (url.startsWith('wc:') || url.startsWith('paliwallet://wc')) {
SharedDeeplinkManager.parse(url, {
origin: AppConstants.DEEPLINKS.ORIGIN_DEEPLINK
origin: undefined
});
return false;
}
Expand Down
8 changes: 4 additions & 4 deletions app/ios/PaliWallet.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@
CODE_SIGN_ENTITLEMENTS = PaliWallet/PaliWalletDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 21;
CURRENT_PROJECT_VERSION = 22;
DEAD_CODE_STRIPPING = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 6YCW295639;
Expand Down Expand Up @@ -665,7 +665,7 @@
"\"$(SRCROOT)/PaliWallet/System/Library/Frameworks\"",
);
LLVM_LTO = YES;
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.1.5;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"$(inherited)",
Expand Down Expand Up @@ -697,7 +697,7 @@
CODE_SIGN_ENTITLEMENTS = PaliWallet/PaliWallet.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 21;
CURRENT_PROJECT_VERSION = 22;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 6YCW295639;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -732,7 +732,7 @@
"\"$(SRCROOT)/PaliWallet/System/Library/Frameworks\"",
);
LLVM_LTO = YES;
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.1.5;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = (
"$(inherited)",
Expand Down
2 changes: 1 addition & 1 deletion app/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@
"no_ownership_takeback_desc": "Contracts with ownership takeback mechanism, after its owner grants the ownership to others he can still take it back. We regard this as a security issue. If the contract has the ability please consult the project team its usage.",
"unpausable_trading_desc": "Pausable trading may cause trading of this token ceased. If the contract has the ability please consult the project team its usage.",
"anti_whale_desc": "Tokens with anti-whale logic can limit large amount trading to prevent massive volatility. This item is just for reference only, which doesn't mean whether the contract is secure or not if there is or no anti-whale feature.",
"holders": "Hoders",
"holders": "Holders",
"lp": "LPs",
"dexs": "DEXs",
"sell_tax": "Sell Tax",
Expand Down
4 changes: 2 additions & 2 deletions core/src/Config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -354,8 +354,8 @@ export const NetworkConfig: { [type: number]: any } = {
ticker: 'SYS',
nickname: 'Rollux',
},
ExplorerUrl: 'https://explorer.rollux.com/',
ExplorerApiUrl: 'https://explorer.rollux.com/',
ExplorerUrl: 'https://explorer.rollux.com',
ExplorerApiUrl: 'https://explorer.rollux.com',
},
'Rollux Testnet': {
provider: {
Expand Down

0 comments on commit a4161f5

Please sign in to comment.