Skip to content

Commit

Permalink
Enable currency settings and sticker pack synchronization
Browse files Browse the repository at this point in the history
  • Loading branch information
audriu committed May 3, 2022
1 parent f66ad3d commit 7857018
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 19 deletions.
8 changes: 0 additions & 8 deletions multiaccounts/settings/columns.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@ var (
Currency = SettingField{
reactFieldName: "currency",
dBColumnName: "currency",
// TODO resolve issue 6 https://github.com/status-im/status-react/pull/13053#issuecomment-1065179963
syncProtobufFactory: &SyncProtobufFactory{
inactive: true, // Remove after issue is resolved
fromInterface: currencyProtobufFactory,
fromStruct: currencyProtobufFactoryStruct,
valueFromProtobuf: StringFromSyncProtobuf,
Expand Down Expand Up @@ -307,9 +305,7 @@ var (
reactFieldName: "stickers/packs-installed",
dBColumnName: "stickers_packs_installed",
valueHandler: JSONBlobHandler,
// TODO resolve issue 8 https://github.com/status-im/status-react/pull/13053#issuecomment-1065179963
syncProtobufFactory: &SyncProtobufFactory{
inactive: true, // Remove after issue is resolved
fromInterface: stickersPacksInstalledProtobufFactory,
fromStruct: stickersPacksInstalledProtobufFactoryStruct,
valueFromProtobuf: BytesFromSyncProtobuf,
Expand All @@ -320,9 +316,7 @@ var (
reactFieldName: "stickers/packs-pending",
dBColumnName: "stickers_packs_pending",
valueHandler: JSONBlobHandler,
// TODO resolve issue 8 https://github.com/status-im/status-react/pull/13053#issuecomment-1065179963
syncProtobufFactory: &SyncProtobufFactory{
inactive: true, // Remove after issue is resolved
fromInterface: stickersPacksPendingProtobufFactory,
fromStruct: stickersPacksPendingProtobufFactoryStruct,
valueFromProtobuf: BytesFromSyncProtobuf,
Expand All @@ -333,9 +327,7 @@ var (
reactFieldName: "stickers/recent-stickers",
dBColumnName: "stickers_recent_stickers",
valueHandler: JSONBlobHandler,
// TODO resolve issue 8 https://github.com/status-im/status-react/pull/13053#issuecomment-1065179963
syncProtobufFactory: &SyncProtobufFactory{
inactive: true, // Remove after issue is resolved
fromInterface: stickersRecentStickersProtobufFactory,
fromStruct: stickersRecentStickersProtobufFactoryStruct,
valueFromProtobuf: BytesFromSyncProtobuf,
Expand Down
17 changes: 10 additions & 7 deletions multiaccounts/settings/database.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"encoding/json"
"fmt"
"sync"

"github.com/davecgh/go-spew/spew"
"github.com/status-im/status-go/appdatabase"
"github.com/status-im/status-go/eth-node/types"
"github.com/status-im/status-go/multiaccounts/errors"
Expand Down Expand Up @@ -180,12 +180,15 @@ func (db *Database) saveSetting(setting SettingField, value interface{}) error {
}

func (db *Database) parseSaveAndSyncSetting(sf SettingField, value interface{}) (err error) {
if sf.ValueHandler() != nil {
value, err = sf.ValueHandler()(value)
if err != nil {
return err
}
}
spew.Dump("parseSaveAndSyncSetting")
spew.Dump(sf, value)
if sf.ValueHandler() != nil {
value, err = sf.ValueHandler()(value)
if err != nil {
return err
}
}
spew.Dump(value)

// TODO(samyoul) this is ugly as hell need a more elegant solution
if NodeConfig.GetReactName() == sf.GetReactName() {
Expand Down
17 changes: 15 additions & 2 deletions multiaccounts/settings/value_handlers.go
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
package settings

import (
"fmt"
"encoding/json"

"github.com/davecgh/go-spew/spew"
"github.com/status-im/status-go/eth-node/types"
"github.com/status-im/status-go/multiaccounts/errors"
"github.com/status-im/status-go/params"
"github.com/status-im/status-go/protocol/protobuf"
"github.com/status-im/status-go/sqlite"
"go.uber.org/zap"
)

func StringFromSyncProtobuf(ss *protobuf.SyncSetting) interface{} {
Expand Down Expand Up @@ -36,7 +38,18 @@ func BoolHandler(value interface{}) (interface{}, error) {
}

func JSONBlobHandler(value interface{}) (interface{}, error) {
return &sqlite.JSONBlob{Data: value}, nil
spew.Dump("---------------------------")
spew.Dump(value)
d := &sqlite.JSONBlob{Data: value}
spew.Dump(d)
spew.Dump("---------------------------")
l := zap.L()
l.Info(spew.Sdump(value))
l.Info("---------------------------------hi")
///just trying to get some debug output to log files
fmt.Println("------------------------hello world")

return d, nil
}

func AddressHandler(value interface{}) (interface{}, error) {
Expand Down
2 changes: 2 additions & 0 deletions protocol/ens/verifier.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ func (v *Verifier) Subscribe() chan []*VerificationRecord {

func (v *Verifier) publish(records []*VerificationRecord) {
v.logger.Info("publishing records", zap.Any("records", records))
//just to test if logger will log anything at all...
v.logger.Info("------------------rttryutryuturtututrutyutryu-")
// Publish on channels, drop if buffer is full
for _, s := range v.subscriptions {
select {
Expand Down
1 change: 1 addition & 0 deletions protocol/messenger.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"sync"
"time"


"github.com/status-im/status-go/services/browsers"

"github.com/pkg/errors"
Expand Down
5 changes: 3 additions & 2 deletions protocol/messenger_sync_settings_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"errors"
"io/ioutil"
"testing"
//"messenger"

"github.com/google/uuid"
"github.com/stretchr/testify/suite"
Expand Down Expand Up @@ -78,7 +79,7 @@ type MessengerSyncSettingsSuite struct {
}

func (s *MessengerSyncSettingsSuite) SetupSuite() {
s.ignoreTests = true
//s.ignoreTests = true
}

func (s *MessengerSyncSettingsSuite) SetupTest() {
Expand Down Expand Up @@ -299,7 +300,7 @@ func (s *MessengerSyncSettingsSuite) TestSyncSettings() {

func (s *MessengerSyncSettingsSuite) TestSyncSettings_StickerPacks() {
if s.ignoreTests {
s.T().Skip("Currently sticker pack syncing has been deactivated, testing to resume after sticker packs works correctly")
//s.T().Skip("Currently sticker pack syncing has been deactivated, testing to resume after sticker packs works correctly")
return
}

Expand Down

0 comments on commit 7857018

Please sign in to comment.