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

TW-996: Fix epic NFT update #962

Merged
merged 146 commits into from
Nov 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
146 commits
Select commit Hold shift + click to select a range
dba8b1a
add new header for nft page
Boltman92 Apr 4, 2023
2ec8446
fix conflicts with dev
Boltman92 Apr 4, 2023
381d469
fix test errors
Boltman92 Apr 4, 2023
c4895c7
refactoring after review
Boltman92 Apr 4, 2023
5fbc240
fix icons color and disabled social links
Boltman92 Apr 5, 2023
9d8bbb6
refactoring way how to save collection info
Boltman92 Apr 6, 2023
3cd6bdd
add collection logo fallback
Boltman92 Apr 6, 2023
f914baa
refactoring variables naming
Boltman92 Apr 6, 2023
af09232
add icon for broken images in collections
Boltman92 Apr 11, 2023
efc23a0
merge with dev
Boltman92 Apr 11, 2023
e1b6a13
add styling for broken collections
Boltman92 Apr 11, 2023
b872ef6
fix error handling for images in collections
Boltman92 Apr 12, 2023
527caae
fix mock file
Boltman92 Apr 12, 2023
51d7316
fix test errors
Boltman92 Apr 12, 2023
772662b
fix after review
Boltman92 Apr 13, 2023
09d9ae3
fix conflicts
Boltman92 Apr 13, 2023
2a8518f
revert cocoapods version
Boltman92 Apr 13, 2023
f8b0a34
Tw 579/nft-section (#788)
Boltman92 Apr 18, 2023
64d2dd7
merge with dev
Boltman92 Apr 18, 2023
fa545de
empty commit for fix
Boltman92 Apr 18, 2023
0dcfb1d
fix conflicts
Boltman92 Apr 19, 2023
812e618
fix conflicts
Boltman92 Apr 19, 2023
5e52d15
fix comments
Boltman92 Apr 19, 2023
0834ea7
fix styles bugs
Boltman92 Apr 21, 2023
9a6da42
resolve merge conflicts
Boltman92 Apr 21, 2023
a166c0f
revert file structure
Boltman92 Apr 23, 2023
311a354
integrate tz profiles (#789)
Boltman92 Apr 24, 2023
3a9bb99
fix styles, cache and other
Boltman92 Apr 26, 2023
7baac5a
fix merge conflicts
Boltman92 Apr 26, 2023
ca18a28
delete useless react fragment
Boltman92 Apr 26, 2023
7062e4b
Tw 611 nft details personal alien main info (#791)
svjatoslavtt Apr 28, 2023
e5a5b73
Tw 612 nft details personal alien properties and attributes (#795)
svjatoslavtt May 22, 2023
2ae0bb4
android
lendihop May 22, 2023
7918b27
Merge branch 'development' into TW-650-share-nft-feature
lendihop May 22, 2023
5f35614
ios
lendihop May 22, 2023
da38276
refactor, env added, nft preview size increased
lendihop May 23, 2023
55463fa
tests fix
lendihop May 23, 2023
dd6e2ac
fn rename
lendihop May 24, 2023
c2a5fca
minor fixes
lendihop May 24, 2023
ff6f68e
profile update
lendihop May 25, 2023
b881376
Revert "profile update"
lendihop May 25, 2023
e1aefe9
deep link for sharing temple
lendihop May 28, 2023
e4a7fdc
analytics
lendihop Jun 1, 2023
732aa50
error toast for debug
lendihop Jun 1, 2023
c872099
ios custom domain added to plist
lendihop Jun 2, 2023
6e2ff89
Merge branch 'development' into TW-650-share-nft-feature
lendihop Jun 5, 2023
e010cb5
Merge remote-tracking branch 'origin/TW-650-share-nft-feature' into t…
Jun 7, 2023
15dd895
Merge branch 'development' into tw-578/nft-header
lendihop Jun 7, 2023
2f3f2fe
merge conflicts fix
lendihop Jun 7, 2023
52eb881
share description, share button
lendihop Jun 7, 2023
68faee0
TW-689: Add adult overlay to collectibles (#826)
svjatoslavtt Jun 9, 2023
e308fc7
TW-691 Handling different NFT formats + loader (#831)
lendihop Jun 13, 2023
293f2c0
TW-615 NFT details, Alien, button Buy for x.xx XTZ (#819)
svjatoslavtt Jun 16, 2023
6f4f7c4
Tw 618/list nft (#837)
Boltman92 Jun 22, 2023
28d5f02
Merge remote-tracking branch 'origin/development' into tw-578/nft-header
Jun 24, 2023
74748d4
TW-578: Remove unused code
Jun 24, 2023
0c85f6a
TW-578: Fix formatImgUri
Jun 26, 2023
5cfd331
TW-578: Remove unused code
Jun 27, 2023
404485c
TW-621: add ability to buy nft from collectibles section for alien (#…
Boltman92 Jun 29, 2023
6806da8
TW-708/preloader+collections (#850)
Boltman92 Jul 3, 2023
2cfa0e1
NFT navtab is focused when open modal and collection
Jul 24, 2023
756a5f5
Merge pull request #893 from madfish-solutions/TW-900-nft-tab-is-not-…
lourenc Jul 25, 2023
e1b1d42
TW-750: Remove the NFT menu & Enable Show Info & A lot of refactor (#…
svjatoslavtt Jul 25, 2023
57b6134
Tw 857 nft details page error message is displayed on nft created on …
herkoss Jul 31, 2023
30e002f
TW-749 Stub for NFTs that don't load (#895)
lendihop Aug 1, 2023
4ae9a77
TW-496: Add resizeMode 'contain' to NFT (#894)
svjatoslavtt Aug 1, 2023
5aa83c8
TW-902- fix animation (#900)
Boltman92 Aug 2, 2023
bdc9619
add serch nft functionality (#856)
Boltman92 Aug 7, 2023
629d4d9
TW-1009: Hide offers segment on detailed page (#903)
svjatoslavtt Aug 9, 2023
b5dea7f
TW-871: Fix audio placeholder (#899)
svjatoslavtt Aug 9, 2023
ff73ef6
TW-1021: Fix typescript errors for 'display_uri' (#914)
svjatoslavtt Aug 10, 2023
44807d5
TW-1007-delete "manage" icon and "see all" button (#911)
Boltman92 Aug 10, 2023
fafd10d
Update code-quality.yml to run on every PR (#915)
lourenc Aug 11, 2023
c74f9b5
TW-1006 - manage nft button (#912)
Boltman92 Aug 14, 2023
b08e9c1
TW-941: Fix images on the details page (#901)
svjatoslavtt Sep 4, 2023
0d88499
TW-942- fix rarity (#910)
Boltman92 Sep 11, 2023
d18e23e
Merge branch 'development' into TW-626-epic-nft-update
alex-tsx Sep 27, 2023
0a54325
TW-626: [epic] NFT update. Refactor
alex-tsx Sep 27, 2023
caad5be
fix bugs with error handling for text fxhash nft
Boltman92 Sep 29, 2023
2c570df
fix error with large id from objkt
Boltman92 Sep 29, 2023
ac31cc8
add share button for collections
Boltman92 Sep 29, 2023
7a1d24d
fix royalties format
Boltman92 Sep 29, 2023
a176660
fix align for attributes
Boltman92 Sep 29, 2023
0855275
Merge branch 'development' into TW-626-epic-nft-update
alex-tsx Oct 4, 2023
99a7f7e
Merge branch 'TW-626-epic-nft-update' into TW-996-fix-epic-nft-update
alex-tsx Oct 4, 2023
5cf5507
TW-996: Fix epic NFT update
alex-tsx Oct 4, 2023
278b602
TW-996: Fix epic NFT update. Refactor
alex-tsx Oct 5, 2023
734d085
TW-996: Fix epic NFT update. Refactor
alex-tsx Oct 5, 2023
0e14793
Merge branch 'development' into TW-626-epic-nft-update
alex-tsx Oct 6, 2023
b332262
Merge branch 'TW-626-epic-nft-update' into TW-996-fix-epic-nft-update
alex-tsx Oct 6, 2023
9b2ee2b
TW-626: [epic] NFT update. Refactor
alex-tsx Oct 6, 2023
b33a01b
Merge branch 'TW-626-epic-nft-update' into TW-996-fix-epic-nft-update
alex-tsx Oct 6, 2023
8fba650
TW-996: Fix epic NFT update. + useAccountCollectibles() hook
alex-tsx Oct 6, 2023
5fe8a9f
TW-996: Fix epic NFT update. Refactor
alex-tsx Oct 9, 2023
d89630a
TW-996: Fix epic NFT update. + NFT details might be null
alex-tsx Oct 9, 2023
967bda6
TW-996: Fix epic NFT update. + ReduxState.collectibles.adultFlags
alex-tsx Oct 9, 2023
5536d69
TW-996: Fix epic NFT update. Fix non-blured adult content glitch in grid
alex-tsx Oct 10, 2023
77f11b3
TW-996: Fix epic NFT update. Fix primary button in modal
alex-tsx Oct 10, 2023
963b145
TW-996: Fix epic NFT update. Fix List/Buy button on collection item page
alex-tsx Oct 11, 2023
5b84859
TW-996: Fix epic NFT update. Fix Offer/Sell button on collection item…
alex-tsx Oct 11, 2023
7eb975f
TW-996: Fix epic NFT update. Fix build
alex-tsx Oct 11, 2023
f85f084
TW-996: Fix epic NFT update. Refactor
alex-tsx Oct 12, 2023
2d3174b
TW-996: Fix epic NFT update. Updated deps + Disabled HERMES
alex-tsx Oct 12, 2023
4a82a9b
TW-996: Fix epic NFT update. Some images fixes
alex-tsx Oct 15, 2023
9375d3b
TW-996: Fix epic NFT update. Fix TouchableOpacity
alex-tsx Oct 16, 2023
7cae389
TW-996: Fix epic NFT update. Fix Snap Points
alex-tsx Oct 16, 2023
e44276a
TW-996: Fix epic NFT update. Fix TouchableWithAnalytics
alex-tsx Oct 16, 2023
6fabec3
TW-996: Fix epic NFT update. Refactor. + useAccountTokens() hook
alex-tsx Oct 16, 2023
a8d6cca
TW-996: Fix epic NFT update. Refactor. -- useAssetsListSelector()
alex-tsx Oct 16, 2023
697a554
TW-996: Fix epic NFT update. Refactor
alex-tsx Oct 17, 2023
815b58c
TW-996: Fix epic NFT update. Refactor
alex-tsx Oct 17, 2023
d9fea37
TW-996: Fix epic NFT update. Refactor grid layout calc
alex-tsx Oct 17, 2023
e42f390
TW-996: Fix epic NFT update. Fix animated WEBP
alex-tsx Oct 17, 2023
fe4c9d1
TW-996: Fix epic NFT update. + thumbnailUri src
alex-tsx Oct 17, 2023
fa69a11
TW-996: Fix epic NFT update. + AnimatedSVG to grid icons
alex-tsx Oct 17, 2023
c4bc92a
TW-996: Fix epic NFT update. + AnimatedSVG to modal
alex-tsx Oct 17, 2023
91da0e4
TW-996: Fix epic NFT update. + Loader in grid
alex-tsx Oct 18, 2023
56e5ea8
Merge branch 'development' into TW-626-epic-nft-update
alex-tsx Oct 18, 2023
1c3783c
Merge branch 'TW-626-epic-nft-update' into TW-996-fix-epic-nft-update
alex-tsx Oct 18, 2023
b7fb40d
TW-996: Fix epic NFT update. Fix Unit tests
alex-tsx Oct 18, 2023
5c45396
TW-996: Fix epic NFT update. Refactor
alex-tsx Oct 18, 2023
f6d4d19
TW-996: Fix epic NFT update. Refactor
alex-tsx Oct 18, 2023
c877f11
TW-996: Fix epic NFT update. ++ buildCollectibleImagesStack()
alex-tsx Oct 19, 2023
2099659
TW-996: Fix epic NFT update. Refactor
alex-tsx Oct 19, 2023
5d640e3
TW-996: Fix epic NFT update. Fix WebP vulnarability
alex-tsx Oct 19, 2023
bb819ca
TW-996: Fix epic NFT update. Refactor
alex-tsx Oct 20, 2023
5b4fb40
TW-996: Fix epic NFT update. Refactor
alex-tsx Oct 20, 2023
cb3d525
TW-996: Fix epic NFT update. QA fixes
alex-tsx Oct 24, 2023
718cca0
TW-996: Fix epic NFT update. QA Fixes
alex-tsx Oct 24, 2023
1004988
TW-996: Fix epic NFT update. Fix 11. State of NFT modal change on sha…
alex-tsx Oct 24, 2023
36c66fa
TW-996: Fix epic NFT update. Fix 9. Total collection size value
alex-tsx Oct 24, 2023
21ec19f
TW-996: Fix epic NFT update. Refactor
alex-tsx Oct 25, 2023
3a4d2d3
TW-996: Fix epic NFT update. Fixes
alex-tsx Oct 25, 2023
3669658
TW-996: Fix epic NFT update. Fix 2. Glitches is collection screen
alex-tsx Oct 26, 2023
86b4940
TW-996: Fix epic NFT update. Memo for styles
alex-tsx Oct 26, 2023
296ca4a
Merge branch 'development' into TW-626-epic-nft-update
alex-tsx Oct 26, 2023
2e423c2
Merge branch 'TW-626-epic-nft-update' into TW-996-fix-epic-nft-update
alex-tsx Oct 26, 2023
d84681c
TW-626: [epic] NFT update. ESLint ++
alex-tsx Oct 26, 2023
13b320a
Merge branch 'TW-626-epic-nft-update' into TW-996-fix-epic-nft-update
alex-tsx Oct 26, 2023
67d6f65
TW-996: Fix epic NFT update. Refactor
alex-tsx Oct 26, 2023
d57c6df
TW-996: Fix epic NFT update. Fix Plenty NFT images on iOS
alex-tsx Oct 30, 2023
cf0f3cc
TW-996: Fix epic NFT update. Fix toknes fiat values
alex-tsx Oct 30, 2023
1dfc777
TW-996: Fix epic NFT update. Refactor
alex-tsx Oct 30, 2023
67c029b
TW-996: Fix epic NFT update. Fix NFT staying in grid after send
alex-tsx Oct 30, 2023
e195091
TW-996: Fix epic NFT update. Refactor
alex-tsx Oct 31, 2023
38bb050
TW-996: Fix epic NFT update. + Total Floor Price
alex-tsx Oct 31, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
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
Loading