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

Hathor Play #539

Open
wants to merge 186 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
186 commits
Select commit Hold shift + click to select a range
f9d5596
feat: implement Nano Contract integration with Wallet Connect
alexruzenhack Jun 20, 2024
66f94a9
feat: adapt new nc tx to initialize, set result and withdrawal
alexruzenhack Jul 10, 2024
44da5e7
feat: make ncAddress react to firstAddress the right way
alexruzenhack Jul 11, 2024
09a658e
feat: add name to method arguments
alexruzenhack Jul 16, 2024
43c15b0
i18n: udpate files
alexruzenhack Jul 17, 2024
045511c
i18n: update translations and fix some typos
alexruzenhack Jul 17, 2024
d24554a
review: apply suggestions and do some fixes
alexruzenhack Aug 8, 2024
8b57915
refactor: load of token details not refistered but used in actions
alexruzenhack Aug 9, 2024
cbdae1d
lint: comply with rules
alexruzenhack Aug 9, 2024
299bc2e
chore: remove unused action
alexruzenhack Aug 14, 2024
9573d5f
chore: add undeclared style
alexruzenhack Aug 14, 2024
2764f7e
refactor: walletConnect.tokens to unregisteredTokens
alexruzenhack Aug 14, 2024
43de255
chore: remove unused actions, reducer and saga effect
alexruzenhack Aug 14, 2024
c91aad8
chore: improving feedback message
alexruzenhack Aug 14, 2024
ff789cf
refactor: move requestTokens from walletConnect saga to tokens saga
alexruzenhack Aug 14, 2024
af8a9c3
refactor: rename effect requestTokens to requestUnregisteredTokens
alexruzenhack Aug 14, 2024
0b62655
feat: fire sentry error notification for method info not found
alexruzenhack Aug 14, 2024
ae98424
feat: improve title of Arguments component
alexruzenhack Aug 14, 2024
f8858d5
chore: remove blueprint info action and reducer
alexruzenhack Aug 14, 2024
562c4e2
feat: retrieve fallback arg entries when blueprint is loading
alexruzenhack Aug 14, 2024
e1563b1
feat: add nft check to action token on Actions component
alexruzenhack Aug 14, 2024
a48a2e4
chore: apply suggestions and improve documentation on new nc tx request
alexruzenhack Aug 14, 2024
533653e
lint: comply with rules
alexruzenhack Aug 14, 2024
81b4cfa
fix: check if blueprintInfo is not null
alexruzenhack Aug 14, 2024
57e61ff
refactor: reanem style value to field
alexruzenhack Aug 14, 2024
33ee31e
type: recursar
alexruzenhack Aug 14, 2024
8316ba8
i18n: update translation files
alexruzenhack Aug 14, 2024
b6ba639
feat: add blueprint download to the tx loading flag and a redundancy
alexruzenhack Aug 15, 2024
2752d81
fix: FeedbackContent margin style
alexruzenhack Aug 15, 2024
5403440
lint: comply with rules
alexruzenhack Aug 15, 2024
f5fe1a3
fix: typo
alexruzenhack Aug 16, 2024
eec0b40
chore: added dependencies and shims needed by walletconnect
andreabadesso Apr 11, 2024
b2c2f52
refactor: using object destructuring in shims
andreabadesso Apr 24, 2024
873766b
chore: rebase me
andreabadesso Jul 1, 2024
dc10aa0
refactor: rootSaga now restarts failed sagas and sends errors to sentry
andreabadesso Jul 3, 2024
621443c
feat: added actions and reducers
andreabadesso Jul 3, 2024
771acdb
refactor: NewNanoContract modal handling in wallet connect global modal
andreabadesso Jul 3, 2024
dbdb9fb
feat: handling send nano contract tx triggers
andreabadesso Jul 3, 2024
7f65f7f
refactor: removed unused import
andreabadesso Jul 3, 2024
029cefe
refactor: typo
andreabadesso Jul 3, 2024
308bfe0
refactor: unused log
andreabadesso Jul 3, 2024
1a740f8
refactor: refactored SignMessageRequest to use new modal format
andreabadesso Jul 3, 2024
40b30a4
chore: rebase me, adding mocks to dashboard
andreabadesso Jul 4, 2024
6744781
refactor: removed function from redux
andreabadesso Jul 7, 2024
ac566b2
refactor: convert PinScreen to a function component
andreabadesso Jul 7, 2024
d160bbc
refactor: pin screen now dispatches an action (as a param)
andreabadesso Jul 7, 2024
5af9719
fix: invalid feedback modal on pin screen
andreabadesso Jul 11, 2024
970c979
Revert "fix: invalid feedback modal on pin screen"
andreabadesso Jul 11, 2024
550d865
Revert "refactor: pin screen now dispatches an action (as a param)"
andreabadesso Jul 11, 2024
5089ce2
Revert "fix: invalid feedback modal on pin screen"
andreabadesso Jul 11, 2024
82262f3
Revert "refactor: convert PinScreen to a function component"
andreabadesso Jul 11, 2024
04ee8e1
refactor: removed mocks from dashboard
andreabadesso Jul 11, 2024
0fa1982
chore: removed useless log
andreabadesso Jul 12, 2024
84295b3
fix: added onDismiss as a dependency to useCallback as it might change
andreabadesso Jul 12, 2024
03fb3a1
refactor: re-enable wallet-service, stop initializing wallet-connect …
andreabadesso Jul 12, 2024
9241af8
docs: added docstring to promptHandler
andreabadesso Jul 12, 2024
156f089
docs: added docstring to requests
andreabadesso Jul 12, 2024
2963bb9
refactor: removed unused imports on Dashboard
andreabadesso Jul 12, 2024
ad2808f
chore: update locale
andreabadesso Jul 12, 2024
e9ef38e
chore: fix broken rebase
andreabadesso Jul 12, 2024
f72cacd
refactor: removed navigation from useEffect deps
andreabadesso Jul 31, 2024
59c4a11
docs: added hathor header and comment explaining createStore deprecation
andreabadesso Jul 31, 2024
0532acf
feat: added log when wallet-service is enabled and wallet-connect tri…
andreabadesso Jul 31, 2024
960bd40
refactor: added retry strategy
andreabadesso Jul 31, 2024
37ef1b1
refactor: wallet-connect will always fork the init, so it restarts su…
andreabadesso Aug 2, 2024
d56a201
refactor: nano contract saga is critical
andreabadesso Aug 2, 2024
13d03db
feat: added log for sagas crash and max retries
andreabadesso Aug 2, 2024
b219fdf
fix: log being called incorrectly
andreabadesso Aug 2, 2024
5fd89fe
feat: logging when wallet-connect is initialzed
andreabadesso Aug 2, 2024
f5043d3
fix: added missing import
andreabadesso Aug 16, 2024
0c0a9e9
fix: broken rebase fixes
andreabadesso Aug 20, 2024
dd242ac
chore: updated translations
andreabadesso Aug 20, 2024
25c32a4
refactor: removed fuzzy translations
andreabadesso Aug 20, 2024
2a8130d
refactor: removed unused import on NanoContactTransactionHeader
andreabadesso Aug 20, 2024
2de2950
feat: logging error on root saga
andreabadesso Aug 20, 2024
3112dfb
chore: removed walletconnect libraries from package
andreabadesso Aug 20, 2024
a3e8f3a
feat: added hathor-rpc-handler from the deployed lib
andreabadesso Aug 20, 2024
6cfccf5
chore: changed CI version to 18x and 20x
andreabadesso Aug 20, 2024
25f2de8
chore: updated enable walletconnect script
andreabadesso Aug 20, 2024
0fde00c
refactor: removed error logging on NanoContractMethodArgs
andreabadesso Aug 20, 2024
a3b1e23
chore: removed local library from package-lock.json
andreabadesso Aug 20, 2024
d116326
refactor: removed unused option on PinScreen
andreabadesso Aug 21, 2024
e083f61
fix: added missing import
andreabadesso Aug 21, 2024
fede251
chore: removed comment on pt-br texts
andreabadesso Aug 21, 2024
26f761a
chore: updated enable-walletconnect.patch
andreabadesso Aug 29, 2024
4b4486a
refactor: added missing attribute from metadata
andreabadesso Aug 29, 2024
0c0eb69
chore: updated package-lock with wallet-lib version
andreabadesso Aug 29, 2024
2bd638e
chore: updated locale
andreabadesso Aug 29, 2024
7b17750
chore: restored package-lock.json
andreabadesso Aug 29, 2024
c426b6f
refactor: NanoContact -> NanoContract
andreabadesso Aug 29, 2024
468c5d5
refactor: removed baseStyles prop from WalletConnectModal
andreabadesso Aug 29, 2024
cf96b79
refactor: removed package.json changes in walletconnect diff
andreabadesso Aug 29, 2024
d497129
refactor: reseting nano contract state on unmount
andreabadesso Aug 29, 2024
6023375
refactor: acceptedNc -> acceptedReq
andreabadesso Aug 29, 2024
74c60a4
refactor: onReadMore is now on warn component
andreabadesso Aug 29, 2024
d6e0e10
refactor: .. -> .
andreabadesso Aug 29, 2024
c9b4495
refactor: removed unused styles from NewNanoContractTransctionModal
andreabadesso Aug 29, 2024
8feae30
chore: fix inconsistent return
andreabadesso Aug 29, 2024
3a50028
refactor: added missing translations
andreabadesso Aug 29, 2024
790f87c
chore: removed .mo
andreabadesso Aug 29, 2024
2a6ebf7
refactor: updated patch to remove duplicated shim and podfile.lock
andreabadesso Aug 31, 2024
e1b2e77
chore: add undeclared style
alexruzenhack Aug 14, 2024
24f8d19
refactor: rename effect requestTokens to requestUnregisteredTokens
alexruzenhack Aug 14, 2024
172f430
feat: fire sentry error notification for method info not found
alexruzenhack Aug 14, 2024
362751b
feat: improve title of Arguments component
alexruzenhack Aug 14, 2024
aae78c2
refactor: reanem style value to field
alexruzenhack Aug 14, 2024
994d664
fix: FeedbackContent margin style
alexruzenhack Aug 15, 2024
3975c9c
lint: comply with rules
alexruzenhack Aug 15, 2024
f29af96
fix: typo
alexruzenhack Aug 16, 2024
90512c9
chore: added dependencies and shims needed by walletconnect
andreabadesso Apr 11, 2024
54cfd57
refactor: using object destructuring in shims
andreabadesso Apr 24, 2024
7c86a50
refactor: typo
andreabadesso Jul 3, 2024
4e33fdd
refactor: removed unused import on NanoContactTransactionHeader
andreabadesso Aug 20, 2024
717b844
chore: removed walletconnect libraries from package
andreabadesso Aug 20, 2024
8907604
feat: added hathor-rpc-handler from the deployed lib
andreabadesso Aug 20, 2024
5f7d5e9
feat: implement Nano Contract integration with Wallet Connect
alexruzenhack Jun 20, 2024
507a8e2
chore: add undeclared style
alexruzenhack Aug 14, 2024
aae4954
refactor: rename effect requestTokens to requestUnregisteredTokens
alexruzenhack Aug 14, 2024
69dddb8
feat: fire sentry error notification for method info not found
alexruzenhack Aug 14, 2024
7d90eed
feat: improve title of Arguments component
alexruzenhack Aug 14, 2024
95a32d0
refactor: reanem style value to field
alexruzenhack Aug 14, 2024
79540d6
fix: FeedbackContent margin style
alexruzenhack Aug 15, 2024
3687479
lint: comply with rules
alexruzenhack Aug 15, 2024
4b44a65
fix: typo
alexruzenhack Aug 16, 2024
04ab0ae
chore: added dependencies and shims needed by walletconnect
andreabadesso Apr 11, 2024
40bc5a2
refactor: using object destructuring in shims
andreabadesso Apr 24, 2024
a37f5fc
refactor: typo
andreabadesso Jul 3, 2024
9e60331
refactor: removed unused import on NanoContactTransactionHeader
andreabadesso Aug 20, 2024
ad23419
chore: removed walletconnect libraries from package
andreabadesso Aug 20, 2024
ced5635
feat: added hathor-rpc-handler from the deployed lib
andreabadesso Aug 20, 2024
22fd592
chore: changed CI version to 18x and 20x
andreabadesso Aug 20, 2024
5a2fde8
chore: added app images
andreabadesso Jul 18, 2024
13e5a4b
chore: updated app name and bundle
andreabadesso Jul 18, 2024
02cd52d
refactor: changed android icon and several files to make it build
andreabadesso Jul 18, 2024
0ba242b
chore: updated large icon to remove alpha channel
andreabadesso Jul 19, 2024
d329f76
chore: updated android package name to com.hathordemo
andreabadesso Jul 19, 2024
53975ba
chore: updated hathor demo to hathor play and updated images in ios
andreabadesso Jul 22, 2024
8a7b0b7
chore: updated app name in android to Hathor Play
andreabadesso Jul 22, 2024
f0275e8
chore: using the hathorplay icons
andreabadesso Aug 22, 2024
038668e
refactor: sending hardcoded HathorDemo userId so we can control what …
andreabadesso Aug 28, 2024
0b3ff99
refactor: enable walletconnect by default (#541)
andreabadesso Aug 29, 2024
a429e3e
feat: sign oracle data (#509)
andreabadesso Aug 31, 2024
5f4c0a6
feat: create token RPC (#528)
andreabadesso Sep 9, 2024
5933fc0
fix: register new nano contract from request screen (#556)
alexruzenhack Sep 9, 2024
2765158
feat: add success feedback screen (#554)
alexruzenhack Sep 9, 2024
baa425a
fix: unify unmount as only one is called per component (#555)
alexruzenhack Sep 9, 2024
d9bd0fd
refactor: sort nano contracts by last registered first (#563)
alexruzenhack Sep 12, 2024
69f35d0
fix: wrong success navigation by forcing ready state on navigation (#…
alexruzenhack Sep 12, 2024
cb08926
chore: updated icons and added rpc lib
andreabadesso Sep 10, 2024
437570f
chore: updated icons
andreabadesso Sep 10, 2024
b57d5b7
chore: updated icons
andreabadesso Sep 10, 2024
5048147
fix: stop crashing when session is rejected
andreabadesso Sep 10, 2024
01d39f8
fix: several reliability improvements for walletconnect
andreabadesso Sep 10, 2024
23ad5e9
chore: updated icons
andreabadesso Sep 10, 2024
d890c11
fix: passing id on manual cancel session
andreabadesso Sep 10, 2024
05d260b
refactor: reacting to app state changes
andreabadesso Sep 11, 2024
d74a3ac
chore: bumped to v0.28.0
andreabadesso Sep 10, 2024
3164e86
fix: removed hardcoded nodejs path in XCode
andreabadesso Sep 10, 2024
55b9838
chore: bumped to v0.28.1
andreabadesso Sep 10, 2024
d552238
feat: bumps Android target sdk version (#562)
tuliomir Sep 11, 2024
cd8694a
chore: bumped to v0.28.2
andreabadesso Sep 11, 2024
9fbbf7a
fix: added createToken to available methods
andreabadesso Sep 12, 2024
ea14b1e
fix: added createToken to available methods
andreabadesso Sep 12, 2024
6d54797
fix: fixed invalid nc error
andreabadesso Sep 12, 2024
dfdfbf1
chore: bumped to v0.28.3
andreabadesso Sep 12, 2024
ddd899f
refactor: added a queue to process messages in series (#566)
andreabadesso Sep 13, 2024
25aec11
chore: bumped to v0.28.4
andreabadesso Sep 13, 2024
9d527c2
fix: empty caller after define first address (#568)
alexruzenhack Sep 17, 2024
d8031d0
chore: bumped to v0.28.5
andreabadesso Sep 17, 2024
dbac39d
chore: updated sentry to be used in the latest macOS
andreabadesso Sep 27, 2024
58b465d
chore: added missing shims and changed walletconnect packages to wall…
andreabadesso Sep 27, 2024
c2f972c
chore: update to 1.1.0
andreabadesso Oct 1, 2024
8f059cb
chore: updated wallet-connect related libraries
andreabadesso Oct 1, 2024
221e34f
chore: removed now unused walletconnect
andreabadesso Oct 1, 2024
4cb6fc0
refactor: renamed walletconnect to reown
andreabadesso Oct 1, 2024
e85ab10
refactor: renamed walletconnect to reown
andreabadesso Oct 1, 2024
7786474
chore: updated locale files
andreabadesso Oct 1, 2024
be15826
chore: updated translations
andreabadesso Oct 4, 2024
8344267
refactor: removed version from reown
andreabadesso Oct 4, 2024
e538950
chore: removed hathor-rpc-handler-test
andreabadesso Oct 7, 2024
6b06901
chore: removed fuzzy translation
andreabadesso Oct 7, 2024
1ee523f
refactor: renamed missing variables from walletconnect to reown
andreabadesso Oct 7, 2024
f90fb47
refactor: changed feature toggle to reown.rollout and renamed missing…
andreabadesso Oct 8, 2024
ea89c5b
chore: eslint
andreabadesso Oct 8, 2024
28d1d4a
Merge pull request #575 from HathorNetwork/refactor/reown
andreabadesso Oct 8, 2024
053d232
Merge branch 'master' into hathorplay-base
andreabadesso Nov 6, 2024
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
8 changes: 4 additions & 4 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@ android {

compileSdkVersion rootProject.ext.compileSdkVersion

namespace "network.hathor.wallet"
namespace "com.hathordemo"
defaultConfig {
applicationId "network.hathor.wallet"
applicationId "com.hathordemo"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 74
versionName "0.28.0-rc.2"
versionCode 78
versionName "0.28.5"
missingDimensionStrategy "react-native-camera", "general"
}
signingConfigs {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* <p>This source code is licensed under the MIT license found in the LICENSE file in the root
* directory of this source tree.
*/
package network.hathor.wallet;
package com.hathordemo;

import android.content.Context;
import com.facebook.flipper.android.AndroidFlipperClient;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package network.hathor.wallet;
package com.hathordemo;

import com.facebook.react.ReactActivity;
import com.facebook.react.ReactActivityDelegate;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package network.hathor.wallet;
package com.hathordemo;

import android.app.Application;
import com.facebook.react.PackageList;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package network.hathor.wallet;
package com.hathordemo;

import com.facebook.react.ReactInstanceManager;

Expand Down
Binary file modified android/app/src/main/res/mipmap-hdpi/ic_launcher.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified android/app/src/main/res/mipmap-mdpi/ic_launcher.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion android/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<resources>
<string name="app_name">Hathor Wallet</string>
<string name="app_name">Hathor Play</string>
</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* <p>This source code is licensed under the MIT license found in the LICENSE file in the root
* directory of this source tree.
*/
package network.hathor.wallet;
package com.hathordemo;

import android.content.Context;
import com.facebook.react.ReactInstanceManager;
Expand Down
22 changes: 21 additions & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@ buildscript {
kotlin_version = "1.7.20"
minSdkVersion = 23
compileSdkVersion = 33
targetSdkVersion = 33
targetSdkVersion = 34

// We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
ndkVersion = "23.1.7779620"
}
repositories {
google()
mavenCentral()

}
dependencies {
classpath("com.android.tools.build:gradle")
Expand All @@ -24,4 +25,23 @@ buildscript {
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
subprojects {
ext {
compileSdk = rootProject.ext.compileSdkVersion
minSdk = rootProject.ext.minSdkVersion
targetSdk = rootProject.ext.targetSdkVersion
}
afterEvaluate { subproject ->
if((subproject.plugins.hasPlugin('android') || subproject.plugins.hasPlugin('android-library'))) {
android {
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion
defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
}
}
}
}
}
}
Binary file modified android/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Thu Jul 18 20:21:31 BRT 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
10 changes: 5 additions & 5 deletions android/gradlew
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

#
# Copyright © 2015-2021 the original authors.
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -32,10 +32,10 @@
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
Expand Down
4 changes: 2 additions & 2 deletions android/gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

@if "%DEBUG%" == "" @echo off
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
Expand All @@ -25,7 +25,7 @@
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
Expand Down
26 changes: 20 additions & 6 deletions ios/HathorMobile.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -516,18 +516,19 @@
DEVELOPMENT_TEAM = 55SHY647CG;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = HathorMobile/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "Hathor Play";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.28.0;
MARKETING_VERSION = 0.28.5;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
"-lc++",
);
PRODUCT_BUNDLE_IDENTIFIER = network.hathor.wallet;
PRODUCT_BUNDLE_IDENTIFIER = network.hathor.nanodemo;
PRODUCT_NAME = HathorMobile;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
Expand All @@ -545,18 +546,19 @@
CURRENT_PROJECT_VERSION = 0.2.0;
DEVELOPMENT_TEAM = 55SHY647CG;
INFOPLIST_FILE = HathorMobile/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "Hathor Play";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.28.0;
MARKETING_VERSION = 0.28.5;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
"-lc++",
);
PRODUCT_BUNDLE_IDENTIFIER = network.hathor.wallet;
PRODUCT_BUNDLE_IDENTIFIER = network.hathor.nanodemo;
PRODUCT_NAME = HathorMobile;
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
Expand Down Expand Up @@ -638,7 +640,13 @@
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
"$(inherited)",
" ",
"-Wl",
"-ld_classic",
"-Wl",
"-ld_classic",
"-Wl",
"-ld_classic",
"-Wl -ld_classic ",
);
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
Expand Down Expand Up @@ -716,7 +724,13 @@
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
"$(inherited)",
" ",
"-Wl",
"-ld_classic",
"-Wl",
"-ld_classic",
"-Wl",
"-ld_classic",
"-Wl -ld_classic ",
);
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
Expand Down
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Diff not rendered.
Diff not rendered.
66 changes: 33 additions & 33 deletions ios/HathorMobile/Images.xcassets/AppIcon.appiconset/Contents.json
Original file line number Diff line number Diff line change
@@ -1,68 +1,68 @@
{
"images" : [
{
"size" : "20x20",
"filename" : "40x40.png",
"idiom" : "iphone",
"filename" : "40.png",
"scale" : "2x"
"scale" : "2x",
"size" : "20x20"
},
{
"size" : "20x20",
"filename" : "60x60.png",
"idiom" : "iphone",
"filename" : "60.png",
"scale" : "3x"
"scale" : "3x",
"size" : "20x20"
},
{
"size" : "29x29",
"filename" : "29x29.png",
"idiom" : "iphone",
"filename" : "29.png",
"scale" : "1x"
"scale" : "1x",
"size" : "29x29"
},
{
"size" : "29x29",
"filename" : "58x58.png",
"idiom" : "iphone",
"filename" : "58.png",
"scale" : "2x"
"scale" : "2x",
"size" : "29x29"
},
{
"size" : "29x29",
"filename" : "87x87.png",
"idiom" : "iphone",
"filename" : "87.png",
"scale" : "3x"
"scale" : "3x",
"size" : "29x29"
},
{
"size" : "40x40",
"filename" : "80x80.png",
"idiom" : "iphone",
"filename" : "80.png",
"scale" : "2x"
"scale" : "2x",
"size" : "40x40"
},
{
"size" : "40x40",
"filename" : "120x120.png",
"idiom" : "iphone",
"filename" : "120.png",
"scale" : "3x"
"scale" : "3x",
"size" : "40x40"
},
{
"size" : "60x60",
"filename" : "120x120 1.png",
"idiom" : "iphone",
"filename" : "120-1.png",
"scale" : "2x"
"scale" : "2x",
"size" : "60x60"
},
{
"size" : "60x60",
"filename" : "180x180.png",
"idiom" : "iphone",
"filename" : "180.png",
"scale" : "3x"
"scale" : "3x",
"size" : "60x60"
},
{
"size" : "1024x1024",
"filename" : "1024x1024.png",
"idiom" : "ios-marketing",
"filename" : "1024.png",
"scale" : "1x"
"scale" : "1x",
"size" : "1024x1024"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}
6 changes: 3 additions & 3 deletions ios/HathorMobile/Images.xcassets/Contents.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"images" : [
{
"filename" : "logo.png",
"idiom" : "universal",
"filename" : "hathor-logo.png",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}
Diff not rendered.
Diff not rendered.
Diff not rendered.
10 changes: 5 additions & 5 deletions ios/HathorMobile/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>BGTaskSchedulerPermittedIdentifiers</key>
<array>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
</array>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>Hathor Wallet</string>
<string>Hathor Play</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
Expand Down Expand Up @@ -75,9 +79,5 @@
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
<key>BGTaskSchedulerPermittedIdentifiers</key>
<array>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
</array>
</dict>
</plist>
Loading
Loading