Skip to content

Commit

Permalink
Merge pull request #4 from zed-io/@matt/activity-detail
Browse files Browse the repository at this point in the history
(feat): View Details of Kolektivo Partner Events & Activities
  • Loading branch information
shottah authored May 26, 2024
2 parents 609c32e + f032c61 commit 2fde4c5
Show file tree
Hide file tree
Showing 28 changed files with 359 additions and 129 deletions.
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode appVersionCode
versionName "1.84.0"
versionName "1.84.1"
multiDexEnabled true
testBuildType System.getProperty('testBuildType', 'debug')
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down
2 changes: 1 addition & 1 deletion android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ CELO_RELEASE_KEY_ALIAS=celo-key-alias

# Setting this manually based on version number until we have this deploying via Cloud Build
# Example: v1.5.1 deployment number 1 = 1005001001 (1 005 001 001)
VERSION_CODE=1021071668
VERSION_CODE=1021071669
# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app's APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
Expand Down
8 changes: 4 additions & 4 deletions ios/celo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1205,7 +1205,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 149;
CURRENT_PROJECT_VERSION = 150;
ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
Expand All @@ -1225,7 +1225,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MARKETING_VERSION = 1.84.0;
MARKETING_VERSION = 1.84.1;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
Expand Down Expand Up @@ -1258,7 +1258,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 149;
CURRENT_PROJECT_VERSION = 150;
ENABLE_BITCODE = NO;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand All @@ -1275,7 +1275,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MARKETING_VERSION = 1.84.0;
MARKETING_VERSION = 1.84.1;
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_LDFLAGS = (
"$(inherited)",
Expand Down
18 changes: 9 additions & 9 deletions locales/base/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"title": "Set Up Wallet Backup",
"description": "You'll use the following to set up your email & phone number backup",
"useRecoveryPhrase": "Use a recovery phrase instead",
"reminder": "<0>Remember</0>, this information is the only way to access your wallet if your device is lost or stolen. Valora does not store your email or phone number. Keep it safe!"
"reminder": "<0>Remember</0>, this information is the only way to access your wallet if your device is lost or stolen. Kolektivo does not store your email or phone number. Keep it safe!"
},
"restore": {
"description": "Make sure you have the following available to restore your wallet.",
Expand Down Expand Up @@ -716,9 +716,9 @@
"privacy1": "We gather usage data which helps us improve the app and security. The type of information we collect, how we use it and your rights related to that information can all be seen in our <0>Privacy Policy</0>.",
"privacy2": "If you decide to link your phone number, we will store an encrypted copy of it.",
"privacy3": "If you decide to connect your contacts, we use their names, numbers, and profile pictures to make it easier to find them.",
"walletHeading": "Your Digital Wallet with Valora:",
"wallet1": "You’re about to create a digital wallet. Only you have the key to your wallet. We cannot recover your key or your assets if you lose your key. We also cannot reverse actions taken through Valora on blockchains.",
"wallet2": "Digital assets, the assets with which you will interact with Valora, come with unique risks. By using Valora, you accept these risks and take responsibility for them. Please consider your finances and risk tolerance before making choices.",
"walletHeading": "Your Digital Wallet with Kolektivo:",
"wallet1": "You’re about to create a digital wallet. Only you have the key to your wallet. We cannot recover your key or your assets if you lose your key. We also cannot reverse actions taken through Kolektivo on blockchains.",
"wallet2": "Digital assets, the assets with which you will interact with Kolektivo, come with unique risks. By using Kolektivo, you accept these risks and take responsibility for them. Please consider your finances and risk tolerance before making choices.",
"fullTerms": "Read our full <0>Terms & Conditions</0>"
},
"termsColloquial": {
Expand All @@ -727,9 +727,9 @@
"privacy1": "We gather usage data which helps us improve the app and security. The type of information we collect, how we use it and your rights related to that information can all be seen in our <0>Privacy Policy</0>.",
"privacy2": "If you decide to link your phone number, we will store an encrypted copy of it.",
"privacy3": "If you decide to connect your contacts, we use their names, numbers, and profile pictures to make it easier to find them.",
"walletHeading": "Your Digital Wallet with Valora:",
"wallet1": "You’re about to create a digital wallet. Only you have the key to your wallet. We cannot recover your key or your assets if you lose your key. We also cannot reverse actions taken through Valora on blockchains.",
"wallet2": "Digital assets, the assets with which you will interact with Valora, come with unique risks. By using Valora, you accept these risks and take responsibility for them. Please consider your finances and risk tolerance before making choices.",
"walletHeading": "Your Digital Wallet with Kolektivo:",
"wallet1": "You’re about to create a digital wallet. Only you have the key to your wallet. We cannot recover your key or your assets if you lose your key. We also cannot reverse actions taken through Kolektivo on blockchains.",
"wallet2": "Digital assets, the assets with which you will interact with Kolektivo, come with unique risks. By using Kolektivo, you accept these risks and take responsibility for them. Please consider your finances and risk tolerance before making choices.",
"fullTerms": "Read our full <0>Terms & Conditions</0>"
},
"fullNameOrPsuedonym": "Full name or pseudonym",
Expand Down Expand Up @@ -949,7 +949,7 @@
},
"recoveryPhrase": {
"title": "From recovery phrase",
"description": "Enter your 12 word recovery phrase to regain access to Valora"
"description": "Enter your 12 word recovery phrase to regain access to Kolektivo"
}
},
"verificationInput": {
Expand Down Expand Up @@ -2279,7 +2279,7 @@
"allNetworks": "All Networks"
},
"points": {
"title": "Valora Points",
"title": "Kolektivo Points",
"activity": "Activity",
"history": {
"cards": {
Expand Down
18 changes: 9 additions & 9 deletions locales/de/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"title": "Wallet-Back-up einrichten",
"description": "Folgendes wird zum Einrichten der Sicherung verwendet",
"useRecoveryPhrase": "Verwende stattdessen eine Wiederherstellungsphrase",
"reminder": "<0>Denke daran</0>, diese Information ist die einzige Möglichkeit, auf deine Wallet zuzugreifen, wenn dein Gerät verloren geht oder gestohlen wird. Valora speichert weder deine E-Mail-Adresse, noch deine Telefonnummer. Passe gut darauf auf!"
"reminder": "<0>Denke daran</0>, diese Information ist die einzige Möglichkeit, auf deine Wallet zuzugreifen, wenn dein Gerät verloren geht oder gestohlen wird. Kolektivo speichert weder deine E-Mail-Adresse, noch deine Telefonnummer. Passe gut darauf auf!"
},
"restore": {
"description": "Vergewissere dich, dass du Folgendes zur Verfügung hast, um deine Wallet wiederherzustellen.",
Expand Down Expand Up @@ -715,9 +715,9 @@
"privacy1": "Wir sammeln Nutzungsdaten, die uns helfen, die App und die Sicherheit zu verbessern. Welche Art von Daten wir sammeln, wie wir sie verwenden und welche Rechte du in Bezug auf diese Daten hast, kannst du in unserer <0>Datenschutzerklärung</0> nachlesen.",
"privacy2": "Wenn du dich entscheidest, deine Telefonnummer zu verknüpfen, speichern wir eine verschlüsselte Kopie davon.",
"privacy3": "Wenn du dich entscheidest, deine Kontakte zu verbinden, verwenden wir ihre Namen, Nummern und Profilbilder, um sie leichter zu finden.",
"walletHeading": "Dein digitales Portemonnaie mit Valora:",
"wallet1": "Du bist dabei, eine digitale Brieftasche zu erstellen. Nur du hast den Schlüssel für deine Brieftasche. Wir können deinen Schlüssel oder dein Vermögen nicht wiederherstellen, wenn du ihn verlierst. Wir können auch keine Aktionen rückgängig machen, die über Valora auf Blockchains durchgeführt wurden.",
"wallet2": "Digitale Vermögenswerte, die Vermögenswerte, mit denen du bei Valora interagierst, sind mit einzigartigen Risiken verbunden. Wenn du Valora nutzt, akzeptierst du diese Risiken und übernimmst die Verantwortung dafür. Bitte bedenke deine Finanzen und deine Risikobereitschaft, bevor du Entscheidungen triffst.",
"walletHeading": "Dein digitales Portemonnaie mit Kolektivo:",
"wallet1": "Du bist dabei, eine digitale Brieftasche zu erstellen. Nur du hast den Schlüssel für deine Brieftasche. Wir können deinen Schlüssel oder dein Vermögen nicht wiederherstellen, wenn du ihn verlierst. Wir können auch keine Aktionen rückgängig machen, die über Kolektivo auf Blockchains durchgeführt wurden.",
"wallet2": "Digitale Vermögenswerte, die Vermögenswerte, mit denen du bei Kolektivo interagierst, sind mit einzigartigen Risiken verbunden. Wenn du Kolektivo nutzt, akzeptierst du diese Risiken und übernimmst die Verantwortung dafür. Bitte bedenke deine Finanzen und deine Risikobereitschaft, bevor du Entscheidungen triffst.",
"fullTerms": "Lies unsere vollständigen <0>Geschäftsbedingungen</0>"
},
"termsColloquial": {
Expand All @@ -726,9 +726,9 @@
"privacy1": "Wir sammeln Nutzungsdaten, die uns helfen, die App und die Sicherheit zu verbessern. Welche Art von Daten wir sammeln, wie wir sie verwenden und welche Rechte du in Bezug auf diese Daten hast, kannst du in unserer <0>Datenschutzerklärung</0> nachlesen.",
"privacy2": "Wenn du dich entscheidest, deine Telefonnummer zu verknüpfen, speichern wir eine verschlüsselte Kopie davon.",
"privacy3": "Wenn du dich entscheidest, deine Kontakte zu verbinden, verwenden wir ihre Namen, Nummern und Profilbilder, um sie leichter zu finden.",
"walletHeading": "Dein digitales Portemonnaie mit Valora:",
"wallet1": "Du bist dabei, eine digitale Brieftasche zu erstellen. Nur du hast den Schlüssel für deine Brieftasche. Wir können deinen Schlüssel oder dein Vermögen nicht wiederherstellen, wenn du ihn verlierst. Wir können auch keine Aktionen rückgängig machen, die über Valora auf Blockchains durchgeführt wurden.",
"wallet2": "Digitale Vermögenswerte, die Vermögenswerte, mit denen du bei Valora interagierst, sind mit einzigartigen Risiken verbunden. Wenn du Valora nutzt, akzeptierst du diese Risiken und übernimmst die Verantwortung dafür. Bitte bedenke deine Finanzen und deine Risikobereitschaft, bevor du Entscheidungen triffst.",
"walletHeading": "Dein digitales Portemonnaie mit Kolektivo:",
"wallet1": "Du bist dabei, eine digitale Brieftasche zu erstellen. Nur du hast den Schlüssel für deine Brieftasche. Wir können deinen Schlüssel oder dein Vermögen nicht wiederherstellen, wenn du ihn verlierst. Wir können auch keine Aktionen rückgängig machen, die über Kolektivo auf Blockchains durchgeführt wurden.",
"wallet2": "Digitale Vermögenswerte, die Vermögenswerte, mit denen du bei Kolektivo interagierst, sind mit einzigartigen Risiken verbunden. Wenn du Kolektivo nutzt, akzeptierst du diese Risiken und übernimmst die Verantwortung dafür. Bitte bedenke deine Finanzen und deine Risikobereitschaft, bevor du Entscheidungen triffst.",
"fullTerms": "Lies unsere vollständigen <0>Geschäftsbedingungen</0>"
},
"fullNameOrPsuedonym": "Vollständiger Name oder Alias",
Expand Down Expand Up @@ -948,7 +948,7 @@
},
"recoveryPhrase": {
"title": "Von Wiederherstellungsphrase",
"description": "Gib deine Wiederherstellungsphrase mit 12 Wörtern ein, um wieder Zugang zu Valora zu erhalten"
"description": "Gib deine Wiederherstellungsphrase mit 12 Wörtern ein, um wieder Zugang zu Kolektivo zu erhalten"
}
},
"verificationInput": {
Expand Down Expand Up @@ -2267,7 +2267,7 @@
"allNetworks": "Alle Netzwerke"
},
"points": {
"title": "Valora Punkte",
"title": "Kolektivo Punkte",
"activity": "Aktivität",
"history": {
"cards": {
Expand Down
18 changes: 9 additions & 9 deletions locales/en-US/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"title": "Set Up Wallet Backup",
"description": "You'll use the following to set up your email & phone number backup",
"useRecoveryPhrase": "Use a recovery phrase instead",
"reminder": "<0>Remember</0>, this information is the only way to access your wallet if your device is lost or stolen. Valora does not store your email or phone number. Keep it safe!"
"reminder": "<0>Remember</0>, this information is the only way to access your wallet if your device is lost or stolen. Kolektivo does not store your email or phone number. Keep it safe!"
},
"restore": {
"description": "Make sure you have the following available to restore your wallet.",
Expand Down Expand Up @@ -716,9 +716,9 @@
"privacy1": "We gather usage data which helps us improve the app and security. The type of information we collect, how we use it and your rights related to that information can all be seen in our <0>Privacy Policy</0>.",
"privacy2": "If you decide to link your phone number, we will store an encrypted copy of it.",
"privacy3": "If you decide to connect your contacts, we use their names, numbers, and profile pictures to make it easier to find them.",
"walletHeading": "Your Digital Wallet with Valora:",
"wallet1": "You’re about to create a digital wallet. Only you have the key to your wallet. We cannot recover your key or your assets if you lose your key. We also cannot reverse actions taken through Valora on blockchains.",
"wallet2": "Digital assets, the assets with which you will interact with Valora, come with unique risks. By using Valora, you accept these risks and take responsibility for them. Please consider your finances and risk tolerance before making choices.",
"walletHeading": "Your Digital Wallet with Kolektivo:",
"wallet1": "You’re about to create a digital wallet. Only you have the key to your wallet. We cannot recover your key or your assets if you lose your key. We also cannot reverse actions taken through Kolektivo on blockchains.",
"wallet2": "Digital assets, the assets with which you will interact with Kolektivo, come with unique risks. By using Kolektivo, you accept these risks and take responsibility for them. Please consider your finances and risk tolerance before making choices.",
"fullTerms": "Read our full <0>Terms & Conditions</0>"
},
"termsColloquial": {
Expand All @@ -727,9 +727,9 @@
"privacy1": "We gather usage data which helps us improve the app and security. The type of information we collect, how we use it and your rights related to that information can all be seen in our <0>Privacy Policy</0>.",
"privacy2": "If you decide to link your phone number, we will store an encrypted copy of it.",
"privacy3": "If you decide to connect your contacts, we use their names, numbers, and profile pictures to make it easier to find them.",
"walletHeading": "Your Digital Wallet with Valora:",
"wallet1": "You’re about to create a digital wallet. Only you have the key to your wallet. We cannot recover your key or your assets if you lose your key. We also cannot reverse actions taken through Valora on blockchains.",
"wallet2": "Digital assets, the assets with which you will interact with Valora, come with unique risks. By using Valora, you accept these risks and take responsibility for them. Please consider your finances and risk tolerance before making choices.",
"walletHeading": "Your Digital Wallet with Kolektivo:",
"wallet1": "You’re about to create a digital wallet. Only you have the key to your wallet. We cannot recover your key or your assets if you lose your key. We also cannot reverse actions taken through Kolektivo on blockchains.",
"wallet2": "Digital assets, the assets with which you will interact with Kolektivo, come with unique risks. By using Kolektivo, you accept these risks and take responsibility for them. Please consider your finances and risk tolerance before making choices.",
"fullTerms": "Read our full <0>Terms & Conditions</0>"
},
"fullNameOrPsuedonym": "Full name or pseudonym",
Expand Down Expand Up @@ -949,7 +949,7 @@
},
"recoveryPhrase": {
"title": "From recovery phrase",
"description": "Enter your 12 word recovery phrase to regain access to Valora"
"description": "Enter your 12 word recovery phrase to regain access to Kolektivo"
}
},
"verificationInput": {
Expand Down Expand Up @@ -2268,7 +2268,7 @@
"allNetworks": "All Networks"
},
"points": {
"title": "Valora Points",
"title": "Kolektivo Points",
"activity": "Activity",
"history": {
"cards": {
Expand Down
Loading

0 comments on commit 2fde4c5

Please sign in to comment.