Skip to content
GitLab
    • Explore Projects Groups Snippets
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • Flutter App for Memri Flutter App for Memri
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 211
    • Issues 211
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 5
    • Merge requests 5
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Container Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • MemriMemri
  • Flutter App for MemriFlutter App for Memri
  • Merge requests
  • !30

Update wallet integration

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Bijun Li requested to merge update-wallet-integration into dev 4 years ago
  • Overview 0
  • Commits 4
  • Pipelines 1
  • Changes 5

Improved schema and CVUs

Compare
  • dev (base)

and
  • latest version
    a0739de1
    4 commits, 4 years ago

5 files
+ 34
- 58

    Preferences

    File browser
    Compare changes
ass‎ets‎
default‎CVU/type‎
CryptoTran‎saction.cvu‎ +3 -3
Currency‎Owner.cvu‎ +7 -7
demoA‎ssets‎ +1 -1
demo_data‎base.json‎ +19 -39
schem‎a.json‎ +4 -8
assets/defaultCVU/type/CryptoTransaction.cvu
+ 3
- 3
  • View file @ a0739de1

  • Edit in single-file editor

  • Open in Web IDE


CryptoTransaction > list {
VStack {
HStack {
show: {{.relateTo.username = .ofOwner.username}}
show: {{.relateTo.displayName = .ofOwner.displayName}}
Text {
text: {{.inCurrency.topic}}
@@ -18,10 +18,10 @@ CryptoTransaction > list {
}
HStack {
show: {{.relateTo.username != .ofOwner.username}}
show: {{.relateTo.displayName != .ofOwner.displayName}}
Text {
text: {{.outward = true ? "Sent to @" + .relateTo.username : "Received from @" + .relateTo.username}}
text: {{.outward = true ? "Sent to @" + .relateTo.displayName : "Received from @" + .relateTo.displayName}}
font: 20 regular
color: primary
}
assets/defaultCVU/type/CurrencyOwner.cvu
+ 7
- 7
  • View file @ a0739de1

  • Edit in single-file editor

  • Open in Web IDE


@@ -22,7 +22,7 @@ CurrencyOwner > list {
}
VStack {
Image {
image: {{.profilePicture}}
image: {{.owner.profilePicture}}
sizingMode: fill
minHeight: 80
maxHeight: 80
@@ -31,7 +31,7 @@ CurrencyOwner > list {
cornerRadius: 30
}
Text {
text: {{"@" + .username or ""}}
text: {{"@" + .displayName or ""}}
lineLimit: 1
font: 24 bold
color: primary
@@ -71,7 +71,7 @@ CurrencyOwner > list {
VStack {
show: {{.isOwner != true}}
Image {
image: {{.profilePicture}}
image: {{.owner.profilePicture}}
sizingMode: fill
minHeight: 50
maxHeight: 50
@@ -81,7 +81,7 @@ CurrencyOwner > list {
}
Text {
text: {{"@"+.username}}
text: {{"@"+.displayName}}
lineLimit: 1
font: 20 regular
color: primary
@@ -94,7 +94,7 @@ CurrencyOwner > list {
CurrencyOwner > grid {
VStack {
Image {
image: {{.profilePicture}}
image: {{.owner.profilePicture}}
sizingMode: fill
minHeight: 50
maxHeight: 50
@@ -104,7 +104,7 @@ CurrencyOwner > grid {
}
Text {
text: {{"@"+.username}}
text: {{"@"+.displayName}}
lineLimit: 1
font: 20 regular
color: primary
@@ -142,7 +142,7 @@ CurrencyOwner > grid {
query: "CurrencyOwner"
filter: {
edgeTargets: {
trustOwner: {{receiverUID}}
trust: {{receiverUID}}
}
}
sortProperty: "dateCreated"
assets/demoAssets @ cfb92abb
Compare 5a43d141...cfb92abb
Subproject commit 5a43d14136bf7bf652a17c71fff4da767ae734bf
Subproject commit cfb92abb271c41e2a3a683a46498d0e585c3b434
assets/demo_database.json
+ 19
- 39
  • View file @ a0739de1

  • Edit in single-file editor

  • Open in Web IDE


@@ -4429,16 +4429,11 @@
{
"_type": "CurrencyOwner",
"uid": 22001124924997,
"username": "alice",
"displayName": "alice",
"isOwner": true,
"allEdges": [
{
"_type": "profilePicture",
"targetType": "Photo",
"uid": 10501
},
{
"_type": "belongsTo",
"_type": "owner",
"targetType": "Person",
"uid": 1
},
@@ -4448,32 +4443,32 @@
"uid": 22001124924996
},
{
"_type": "trustOwner",
"_type": "trust",
"targetType": "CurrencyOwner",
"uid": 22001124924998
},
{
"_type": "trustOwner",
"_type": "trust",
"targetType": "CurrencyOwner",
"uid": 22001124924999
},
{
"_type": "hasTransfer",
"_type": "hasTransaction",
"targetType": "CryptoTransaction",
"uid": 22001124925000
},
{
"_type": "hasTransfer",
"_type": "hasTransaction",
"targetType": "CryptoTransaction",
"uid": 22001124925001
},
{
"_type": "hasTransfer",
"_type": "hasTransaction",
"targetType": "CryptoTransaction",
"uid": 22001124925002
},
{
"_type": "hasTransfer",
"_type": "hasTransaction",
"targetType": "CryptoTransaction",
"uid": 22001124925004
}
@@ -4482,15 +4477,10 @@
{
"_type": "CurrencyOwner",
"uid": 22001124924998,
"username": "eve",
"displayName": "eve",
"allEdges": [
{
"_type": "profilePicture",
"targetType": "Photo",
"uid": 10503
},
{
"_type": "belongsTo",
"_type": "owner",
"targetType": "Person",
"uid": 3
},
@@ -4500,17 +4490,17 @@
"uid": 22001124924996
},
{
"_type": "trustOwner",
"_type": "trust",
"targetType": "CurrencyOwner",
"uid": 22001124924997
},
{
"_type": "hasTransfer",
"_type": "hasTransaction",
"targetType": "CryptoTransaction",
"uid": 22001124925002
},
{
"_type": "hasTransfer",
"_type": "hasTransaction",
"targetType": "CryptoTransaction",
"uid": 22001124925004
}
@@ -4519,15 +4509,10 @@
{
"_type": "CurrencyOwner",
"uid": 22001124924999,
"username": "bob",
"displayName": "bob",
"allEdges": [
{
"_type": "profilePicture",
"targetType": "Photo",
"uid": 10502
},
{
"_type": "belongsTo",
"_type": "owner",
"targetType": "Person",
"uid": 2
},
@@ -4537,12 +4522,12 @@
"uid": 22001124924996
},
{
"_type": "trustOwner",
"_type": "trust",
"targetType": "CurrencyOwner",
"uid": 22001124924997
},
{
"_type": "hasTransfer",
"_type": "hasTransaction",
"targetType": "CryptoTransaction",
"uid": 22001124925000
}
@@ -4630,16 +4615,11 @@
{
"_type": "CurrencyOwner",
"uid": 22001124925003,
"username": "0x123456",
"displayName": "0x123456",
"isOwner": true,
"allEdges": [
{
"_type": "profilePicture",
"targetType": "Photo",
"uid": 10501
},
{
"_type": "belongsTo",
"_type": "owner",
"targetType": "Person",
"uid": 1
},
assets/schema.json
+ 4
- 8
  • View file @ a0739de1

  • Edit in single-file editor

  • Open in Web IDE


@@ -336,7 +336,7 @@
"value_type": "bool"
},
{ "item_type": "CurrencyOwner",
"property": "username",
"property": "displayName",
"value_type": "string"
},
{ "item_type": "CurrencyOwner",
@@ -2161,11 +2161,7 @@
"target_type": "CurrencyOwner"
},
{ "source_type": "CurrencyOwner",
"edge": "profilePicture",
"target_type": "Photo"
},
{ "source_type": "CurrencyOwner",
"edge": "trustOwner",
"edge": "trust",
"target_type": "CurrencyOwner"
},
{ "source_type": "CurrencyOwner",
@@ -2173,11 +2169,11 @@
"target_type": "CryptoCurrency"
},
{ "source_type": "CurrencyOwner",
"edge": "belongsTo",
"edge": "owner",
"target_type": "Person"
},
{ "source_type": "CurrencyOwner",
"edge": "hasTransfer",
"edge": "hasTransaction",
"target_type": "CryptoTransaction"
},
{ "source_type": "CurrencySetting",
0 Assignees
None
Assign to
0 Reviewers
Request review from
Labels
0
None
0
None
    Assign labels
  • Manage project labels

Milestone
No milestone
None
None
Time tracking
Lock merge request
Unlocked
2
2 participants
Amirjanyan
Bijun Li
Reference:
Source branch: update-wallet-integration

Menu

Explore Projects Groups Snippets