Skip to content

Commit

Permalink
Merge pull request #962 from madfish-solutions/TW-996-fix-epic-nft-up…
Browse files Browse the repository at this point in the history
…date

TW-996: Fix epic NFT update
  • Loading branch information
lourenc authored Nov 1, 2023
2 parents 1e27538 + 38bb050 commit f7f5d9d
Show file tree
Hide file tree
Showing 597 changed files with 8,575 additions and 2,340 deletions.
2 changes: 2 additions & 0 deletions .env.dist
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ TEZOS_METADATA_API_URL=https://metadata-api-mainnet.stage.madfish.xyz
TEZOS_DEXES_API_URL=wss://dexes-api-mainnet.stage.madfish.xyz

TEMPLE_WALLET_ROUTE3_AUTH_TOKEN=

DYNAMIC_LINKS_DOMAIN_URI_PREFIX=https://templenft.page.link
16 changes: 10 additions & 6 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"plugin:import/typescript",
"plugin:jest/recommended"
],
"plugins": ["@typescript-eslint", "import", "jest"],
"plugins": ["@typescript-eslint", "import", "no-type-assertion", "jest", "jsx-expressions"],
"settings": {
"import/resolver": {
"typescript": {}
Expand All @@ -24,7 +24,6 @@
"no-void": "off",
"no-shadow": "off",
"no-extra-boolean-cast": "off",
"react-hooks/exhaustive-deps": "warn",
"import/no-duplicates": "error",
"import/no-self-import": "error",
"import/no-cycle": "error",
Expand All @@ -38,19 +37,24 @@
"position": "before"
}
],
"groups": [["external", "builtin"], "internal", ["parent", "sibling", "index"]],
"groups": [["external", "builtin"], "internal", "parent", "sibling", "index"],
"alphabetize": {
"order": "asc",
"caseInsensitive": true
},
"newlines-between": "always"
}
],
"no-type-assertion/no-type-assertion": "warn",
"@typescript-eslint/no-shadow": "off",
"@typescript-eslint/strict-boolean-expressions": "warn",
"@typescript-eslint/no-unused-vars": "error",
"@typescript-eslint/explicit-module-boundary-types": "off",
"@typescript-eslint/no-unnecessary-type-constraint": "off",
"@typescript-eslint/ban-ts-comment": "off",
"@typescript-eslint/no-unnecessary-type-constraint": "warn",
"@typescript-eslint/ban-ts-comment": "warn",
"react-hooks/exhaustive-deps": ["warn", {
"additionalHooks": "(useMemoWithCompare|useDidUpdate)"
}],
"jsx-expressions/strict-logical-expressions": "warn",
"jest/no-done-callback": "off",
"jest/no-alias-methods": "off"
},
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ name: Code quality

on:
pull_request:
branches:
- master
- development

jobs:
code-quality:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/fastlane-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ jobs:
TEZOS_DEXES_API_URL: ${{ vars.TEZOS_DEXES_API_URL }}
FIREBASE_GOOGLE_SERVICE_ANDROID: ${{ secrets.FIREBASE_GOOGLE_SERVICE_ANDROID }}
FIREBASE_GOOGLE_SERVICE_IOS: ${{ secrets.FIREBASE_GOOGLE_SERVICE_IOS }}
DYNAMIC_LINKS_DOMAIN_URI_PREFIX: ${{ secrets.DYNAMIC_LINKS_DOMAIN_URI_PREFIX }}
APPSTORE_AUTHKEY: ${{ secrets.APPSTORE_AUTHKEY }}
GOOGLE_PLAY_AUTHKEY: ${{ secrets.GOOGLE_PLAY_AUTHKEY }}
KEYSTORE_KEY: ${{ secrets.KEYSTORE_KEY }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/secrets-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ runs:
TEMPLE_WALLET_ROUTE3_AUTH_TOKEN=${{ inputs.TEMPLE_WALLET_ROUTE3_AUTH_TOKEN }}
DYNAMIC_LINKS_DOMAIN_URI_PREFIX=${{ inputs.DYNAMIC_LINKS_DOMAIN_URI_PREFIX }}
APK_BUILD_ID=${{ inputs.APK_BUILD_ID }}
EOF
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/testapp-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ jobs:
TEZOS_DEXES_API_URL: ${{ vars.TEZOS_DEXES_API_URL }}
FIREBASE_GOOGLE_SERVICE_ANDROID: ${{ secrets.FIREBASE_GOOGLE_SERVICE_ANDROID }}
FIREBASE_GOOGLE_SERVICE_IOS: ${{ secrets.FIREBASE_GOOGLE_SERVICE_IOS }}
DYNAMIC_LINKS_DOMAIN_URI_PREFIX: ${{ secrets.DYNAMIC_LINKS_DOMAIN_URI_PREFIX }}
APPSTORE_AUTHKEY: ${{ secrets.APPSTORE_AUTHKEY }}
GOOGLE_PLAY_AUTHKEY: ${{ secrets.GOOGLE_PLAY_AUTHKEY }}
KEYSTORE_KEY: ${{ secrets.KEYSTORE_KEY }}
Expand Down
3 changes: 3 additions & 0 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,9 @@ dependencies {
See: https://stackoverflow.com/a/60492942/9371122
*/
implementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'

// Animated WEBP support. See: https://github.com/DylanVann/react-native-fast-image/issues/92#issuecomment-1680704556
implementation "com.github.zjupure:webpdecoder:2.6.${rootProject.ext.glideVersion}"
}

apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
Expand Down
14 changes: 14 additions & 0 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,20 @@
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="@string/temple_url_scheme" />
</intent-filter>
<intent-filter android:autoVerify="true">
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
<data android:scheme="https" android:host="templenft.page.link"/>
<data android:scheme="http" android:host="templenft.page.link"/>
</intent-filter>
<intent-filter android:autoVerify="true">
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
<data android:scheme="https" android:host="link.templewallet.com"/>
<data android:scheme="http" android:host="link.templewallet.com"/>
</intent-filter>
</activity>

<!-- Change the value to true to enable pop-up for in foreground on receiving remote notifications (for prevent duplicating while showing local notifications set this to false) -->
Expand Down
1 change: 1 addition & 0 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ buildscript {
Themis_targetSdkVersion = 33

kotlinVersion = "1.9.10"
glideVersion = "4.16.0"

// We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
ndkVersion = "23.1.7779620"
Expand Down
6 changes: 5 additions & 1 deletion ios/GoogleService-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<string>14863818751-1seoo2foi73kbog7okgo6joffpacrp8q.apps.googleusercontent.com</string>
<key>REVERSED_CLIENT_ID</key>
<string>com.googleusercontent.apps.14863818751-1seoo2foi73kbog7okgo6joffpacrp8q</string>
<key>ANDROID_CLIENT_ID</key>
<string>14863818751-2jgd929v7brjsjc2kp0ce3752jjhghi6.apps.googleusercontent.com</string>
<key>API_KEY</key>
<string>AIzaSyCBhlMbcrSbnS9NR8WSCnnUh0XZT-rtbyQ</string>
<key>GCM_SENDER_ID</key>
Expand All @@ -30,5 +32,7 @@
<true></true>
<key>GOOGLE_APP_ID</key>
<string>1:14863818751:ios:77311aaef75709509f51ca</string>
<key>DATABASE_URL</key>
<string>https://templewallet-default-rtdb.europe-west1.firebasedatabase.app</string>
</dict>
</plist>
</plist>
6 changes: 5 additions & 1 deletion ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ pod 'Firebase', :modular_headers => true
pod 'FirebaseCore', :modular_headers => true
pod 'GoogleUtilities', :modular_headers => true

pod 'Firebase', :modular_headers => true
pod 'FirebaseCore', :modular_headers => true
pod 'GoogleUtilities', :modular_headers => true

platform :ios, '12.4'
prepare_react_native_project!

Expand Down Expand Up @@ -38,7 +42,7 @@ target 'TempleWallet' do
use_react_native!(
:path => config[:reactNativePath],
# Hermes is now enabled by default. Disable by setting this flag to false.
:hermes_enabled => flags[:hermes_enabled],
:hermes_enabled => false, # flags[:hermes_enabled],
:fabric_enabled => flags[:fabric_enabled],
# Enables Flipper.
#
Expand Down
Loading

0 comments on commit f7f5d9d

Please sign in to comment.