Skip to content

Commit 8346bb2

Browse files
author
Jeff Yanta
committed
Merge branch 'develop'
2 parents 491cbd5 + 8194fec commit 8346bb2

552 files changed

Lines changed: 16089 additions & 7727 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

api/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1+
import java.util.Properties
2+
13
plugins {
24
id(Plugins.android_library)
35
id(Plugins.kotlin_android)
46
id(Plugins.kotlin_kapt)
7+
id(Plugins.kotlin_serialization)
58
}
69

710
android {
@@ -48,6 +51,8 @@ dependencies {
4851
implementation(Libs.rxjava)
4952
api(Libs.kotlinx_coroutines_core)
5053
implementation(Libs.kotlinx_coroutines_core)
54+
api(Libs.kotlinx_coroutines_rx3)
55+
implementation(Libs.kotlinx_serialization_json)
5156
implementation(Libs.inject)
5257

5358
implementation(Libs.grpc_okhttp)
Lines changed: 364 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,364 @@
1+
{
2+
"formatVersion": 1,
3+
"database": {
4+
"version": 7,
5+
"identityHash": "8fde6ca4b4b516c576d4a9740aef5742",
6+
"entities": [
7+
{
8+
"tableName": "HistoricalTransaction",
9+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uid` INTEGER PRIMARY KEY AUTOINCREMENT, `id` TEXT NOT NULL, `paymentType` TEXT NOT NULL, `date` INTEGER NOT NULL, `transactionRateFx` REAL, `transactionRateCurrency` TEXT, `transactionAmountQuarks` INTEGER NOT NULL, `nativeAmount` REAL NOT NULL, `isDeposit` INTEGER NOT NULL, `isWithdrawal` INTEGER NOT NULL, `isRemoteSend` INTEGER NOT NULL, `isReturned` INTEGER NOT NULL, `airdropType` TEXT)",
10+
"fields": [
11+
{
12+
"fieldPath": "uid",
13+
"columnName": "uid",
14+
"affinity": "INTEGER",
15+
"notNull": false
16+
},
17+
{
18+
"fieldPath": "id",
19+
"columnName": "id",
20+
"affinity": "TEXT",
21+
"notNull": true
22+
},
23+
{
24+
"fieldPath": "paymentType",
25+
"columnName": "paymentType",
26+
"affinity": "TEXT",
27+
"notNull": true
28+
},
29+
{
30+
"fieldPath": "date",
31+
"columnName": "date",
32+
"affinity": "INTEGER",
33+
"notNull": true
34+
},
35+
{
36+
"fieldPath": "transactionRateFx",
37+
"columnName": "transactionRateFx",
38+
"affinity": "REAL",
39+
"notNull": false
40+
},
41+
{
42+
"fieldPath": "transactionRateCurrency",
43+
"columnName": "transactionRateCurrency",
44+
"affinity": "TEXT",
45+
"notNull": false
46+
},
47+
{
48+
"fieldPath": "transactionAmountQuarks",
49+
"columnName": "transactionAmountQuarks",
50+
"affinity": "INTEGER",
51+
"notNull": true
52+
},
53+
{
54+
"fieldPath": "nativeAmount",
55+
"columnName": "nativeAmount",
56+
"affinity": "REAL",
57+
"notNull": true
58+
},
59+
{
60+
"fieldPath": "isDeposit",
61+
"columnName": "isDeposit",
62+
"affinity": "INTEGER",
63+
"notNull": true
64+
},
65+
{
66+
"fieldPath": "isWithdrawal",
67+
"columnName": "isWithdrawal",
68+
"affinity": "INTEGER",
69+
"notNull": true
70+
},
71+
{
72+
"fieldPath": "isRemoteSend",
73+
"columnName": "isRemoteSend",
74+
"affinity": "INTEGER",
75+
"notNull": true
76+
},
77+
{
78+
"fieldPath": "isReturned",
79+
"columnName": "isReturned",
80+
"affinity": "INTEGER",
81+
"notNull": true
82+
},
83+
{
84+
"fieldPath": "airdropType",
85+
"columnName": "airdropType",
86+
"affinity": "TEXT",
87+
"notNull": false
88+
}
89+
],
90+
"primaryKey": {
91+
"columnNames": [
92+
"uid"
93+
],
94+
"autoGenerate": true
95+
},
96+
"indices": [],
97+
"foreignKeys": []
98+
},
99+
{
100+
"tableName": "CurrencyRate",
101+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `rate` REAL NOT NULL, PRIMARY KEY(`id`))",
102+
"fields": [
103+
{
104+
"fieldPath": "id",
105+
"columnName": "id",
106+
"affinity": "TEXT",
107+
"notNull": true
108+
},
109+
{
110+
"fieldPath": "rate",
111+
"columnName": "rate",
112+
"affinity": "REAL",
113+
"notNull": true
114+
}
115+
],
116+
"primaryKey": {
117+
"columnNames": [
118+
"id"
119+
],
120+
"autoGenerate": false
121+
},
122+
"indices": [],
123+
"foreignKeys": []
124+
},
125+
{
126+
"tableName": "FaqItem",
127+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uid` INTEGER PRIMARY KEY AUTOINCREMENT, `question` TEXT NOT NULL, `answer` TEXT NOT NULL)",
128+
"fields": [
129+
{
130+
"fieldPath": "uid",
131+
"columnName": "uid",
132+
"affinity": "INTEGER",
133+
"notNull": false
134+
},
135+
{
136+
"fieldPath": "question",
137+
"columnName": "question",
138+
"affinity": "TEXT",
139+
"notNull": true
140+
},
141+
{
142+
"fieldPath": "answer",
143+
"columnName": "answer",
144+
"affinity": "TEXT",
145+
"notNull": true
146+
}
147+
],
148+
"primaryKey": {
149+
"columnNames": [
150+
"uid"
151+
],
152+
"autoGenerate": true
153+
},
154+
"indices": [],
155+
"foreignKeys": []
156+
},
157+
{
158+
"tableName": "PrefInt",
159+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, PRIMARY KEY(`key`))",
160+
"fields": [
161+
{
162+
"fieldPath": "key",
163+
"columnName": "key",
164+
"affinity": "TEXT",
165+
"notNull": true
166+
},
167+
{
168+
"fieldPath": "value",
169+
"columnName": "value",
170+
"affinity": "INTEGER",
171+
"notNull": true
172+
}
173+
],
174+
"primaryKey": {
175+
"columnNames": [
176+
"key"
177+
],
178+
"autoGenerate": false
179+
},
180+
"indices": [],
181+
"foreignKeys": []
182+
},
183+
{
184+
"tableName": "PrefString",
185+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` TEXT NOT NULL, PRIMARY KEY(`key`))",
186+
"fields": [
187+
{
188+
"fieldPath": "key",
189+
"columnName": "key",
190+
"affinity": "TEXT",
191+
"notNull": true
192+
},
193+
{
194+
"fieldPath": "value",
195+
"columnName": "value",
196+
"affinity": "TEXT",
197+
"notNull": true
198+
}
199+
],
200+
"primaryKey": {
201+
"columnNames": [
202+
"key"
203+
],
204+
"autoGenerate": false
205+
},
206+
"indices": [],
207+
"foreignKeys": []
208+
},
209+
{
210+
"tableName": "PrefBool",
211+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, PRIMARY KEY(`key`))",
212+
"fields": [
213+
{
214+
"fieldPath": "key",
215+
"columnName": "key",
216+
"affinity": "TEXT",
217+
"notNull": true
218+
},
219+
{
220+
"fieldPath": "value",
221+
"columnName": "value",
222+
"affinity": "INTEGER",
223+
"notNull": true
224+
}
225+
],
226+
"primaryKey": {
227+
"columnNames": [
228+
"key"
229+
],
230+
"autoGenerate": false
231+
},
232+
"indices": [],
233+
"foreignKeys": []
234+
},
235+
{
236+
"tableName": "PrefDouble",
237+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` REAL NOT NULL, PRIMARY KEY(`key`))",
238+
"fields": [
239+
{
240+
"fieldPath": "key",
241+
"columnName": "key",
242+
"affinity": "TEXT",
243+
"notNull": true
244+
},
245+
{
246+
"fieldPath": "value",
247+
"columnName": "value",
248+
"affinity": "REAL",
249+
"notNull": true
250+
}
251+
],
252+
"primaryKey": {
253+
"columnNames": [
254+
"key"
255+
],
256+
"autoGenerate": false
257+
},
258+
"indices": [],
259+
"foreignKeys": []
260+
},
261+
{
262+
"tableName": "SendLimit",
263+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `limit` REAL NOT NULL, PRIMARY KEY(`id`))",
264+
"fields": [
265+
{
266+
"fieldPath": "id",
267+
"columnName": "id",
268+
"affinity": "TEXT",
269+
"notNull": true
270+
},
271+
{
272+
"fieldPath": "limit",
273+
"columnName": "limit",
274+
"affinity": "REAL",
275+
"notNull": true
276+
}
277+
],
278+
"primaryKey": {
279+
"columnNames": [
280+
"id"
281+
],
282+
"autoGenerate": false
283+
},
284+
"indices": [],
285+
"foreignKeys": []
286+
},
287+
{
288+
"tableName": "GiftCard",
289+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `entropy` TEXT NOT NULL, `amount` INTEGER NOT NULL, `date` INTEGER NOT NULL, PRIMARY KEY(`key`))",
290+
"fields": [
291+
{
292+
"fieldPath": "key",
293+
"columnName": "key",
294+
"affinity": "TEXT",
295+
"notNull": true
296+
},
297+
{
298+
"fieldPath": "entropy",
299+
"columnName": "entropy",
300+
"affinity": "TEXT",
301+
"notNull": true
302+
},
303+
{
304+
"fieldPath": "amount",
305+
"columnName": "amount",
306+
"affinity": "INTEGER",
307+
"notNull": true
308+
},
309+
{
310+
"fieldPath": "date",
311+
"columnName": "date",
312+
"affinity": "INTEGER",
313+
"notNull": true
314+
}
315+
],
316+
"primaryKey": {
317+
"columnNames": [
318+
"key"
319+
],
320+
"autoGenerate": false
321+
},
322+
"indices": [],
323+
"foreignKeys": []
324+
},
325+
{
326+
"tableName": "exchangeData",
327+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`fiat` REAL NOT NULL, `currency` TEXT NOT NULL, `synced_at` INTEGER NOT NULL, PRIMARY KEY(`currency`))",
328+
"fields": [
329+
{
330+
"fieldPath": "fx",
331+
"columnName": "fiat",
332+
"affinity": "REAL",
333+
"notNull": true
334+
},
335+
{
336+
"fieldPath": "currency",
337+
"columnName": "currency",
338+
"affinity": "TEXT",
339+
"notNull": true
340+
},
341+
{
342+
"fieldPath": "synced",
343+
"columnName": "synced_at",
344+
"affinity": "INTEGER",
345+
"notNull": true
346+
}
347+
],
348+
"primaryKey": {
349+
"columnNames": [
350+
"currency"
351+
],
352+
"autoGenerate": false
353+
},
354+
"indices": [],
355+
"foreignKeys": []
356+
}
357+
],
358+
"views": [],
359+
"setupQueries": [
360+
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
361+
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '8fde6ca4b4b516c576d4a9740aef5742')"
362+
]
363+
}
364+
}

api/src/androidTest/java/com/getcode/models/intents/IntentDepositTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ class IntentDepositTest {
4141
)
4242

4343
val intent = IntentDeposit.newInstance(
44+
source = AccountType.Primary,
4445
organizer = organizer,
4546
amount = amount
4647
)

0 commit comments

Comments
 (0)