Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tikka
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
clients
python
Tikka
Commits
ef4bd32b
Commit
ef4bd32b
authored
1 month ago
by
Vincent Texier
Browse files
Options
Downloads
Plain Diff
Merge branch 'fix_v1_to_v2_conversion' into 'main'
Fix attribute name in v1 to v2 conversion See merge request
!5
parents
57be55cd
c77baab0
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!5
Fix attribute name in v1 to v2 conversion
Pipeline
#41552
waiting for manual action
Stage: checks
Stage: release
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
tests/slots/pyqt/windows/test_v1_account_import_wizard.py
+6
-2
6 additions, 2 deletions
tests/slots/pyqt/windows/test_v1_account_import_wizard.py
tikka/slots/pyqt/windows/v1_account_import_wizard.py
+1
-1
1 addition, 1 deletion
tikka/slots/pyqt/windows/v1_account_import_wizard.py
with
7 additions
and
3 deletions
tests/slots/pyqt/windows/test_v1_account_import_wizard.py
+
6
−
2
View file @
ef4bd32b
...
...
@@ -63,8 +63,9 @@ def test_v1_import_wizard_with_identity(
None
,
IdentityStatus
.
MEMBER
,
)
application
.
identities
.
add
(
source_identity
)
source_identity_name
=
"
identity_name
"
source_identity
.
name
=
source_identity_name
application
.
identities
.
add
(
source_identity
)
assert
source_account
is
not
None
assert
source_account
.
balance
==
1000
...
...
@@ -104,7 +105,10 @@ def test_v1_import_wizard_with_identity(
assert
window
.
sourceAddressValueLabel
.
text
()
==
source_account
.
address
assert
window
.
sourceBalanceValueLabel
.
text
()
==
"
ĞD10.00
"
assert
window
.
sourceErrorLabel
.
text
()
==
""
assert
window
.
sourceIdentityValueLabel
.
text
()
==
f
"
#
{
source_identity_index
}
"
assert
(
window
.
sourceIdentityValueLabel
.
text
()
==
f
"
{
source_identity_name
}
#
{
source_identity_index
}
"
)
assert
window
.
wizardPage2
.
isComplete
()
is
True
...
...
This diff is collapsed.
Click to expand it.
tikka/slots/pyqt/windows/v1_account_import_wizard.py
+
1
−
1
View file @
ef4bd32b
...
...
@@ -130,7 +130,7 @@ class V1AccountImportWizardWindow(QWizard, Ui_importAccountV1Wizard):
identity
=
self
.
application
.
identities
.
get_by_address
(
account
.
address
)
if
identity
is
not
None
and
identity
.
name
is
not
None
:
account_label
=
f
"
{
identity
.
name
0
}
#
{
identity
.
index
}
"
account_label
=
f
"
{
identity
.
name
}
#
{
identity
.
index
}
"
self
.
sourceV1AccountComboBox
.
addItem
(
account_label
,
userData
=
account
.
address
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment